diff --git a/config/blacklist.json b/configs/blacklist.json similarity index 100% rename from config/blacklist.json rename to configs/blacklist.json diff --git a/config/slpkg.json b/configs/slpkg.json similarity index 100% rename from config/slpkg.json rename to configs/slpkg.json diff --git a/setup.py b/setup.py index 59844439..c298173e 100755 --- a/setup.py +++ b/setup.py @@ -21,8 +21,8 @@ setup( author='dslackw', url='https://dslackw.gitlab.io/slpkg/', package_data={'': ['LICENSE.txt', 'README.rst', 'ChangeLog.txt']}, - data_files=[('/etc/slpkg', ['config/slpkg.json']), - ('/etc/slpkg', ['config/blacklist.json']), + data_files=[('/etc/slpkg', ['configs/slpkg.json']), + ('/etc/slpkg', ['configs/blacklist.json']), ('/var/lib/slpkg/database', []), ('/var/lib/slpkg/repository', []), ('/tmp/slpkg/build', [])], diff --git a/slpkg/blacklist.py b/slpkg/blacklist.py index 2c8a74c3..d90156f6 100644 --- a/slpkg/blacklist.py +++ b/slpkg/blacklist.py @@ -5,12 +5,12 @@ import os import json from dataclasses import dataclass -from metadata import Metadata +from configs import Configs @dataclass class Blacklist: - etc_path: str = Metadata.etc_path + etc_path: str = Configs.etc_path def get(self): file = f'{self.etc_path}/blacklist.json' diff --git a/slpkg/checks.py b/slpkg/checks.py index e65b9b76..8ef14b07 100644 --- a/slpkg/checks.py +++ b/slpkg/checks.py @@ -4,15 +4,15 @@ import os from dataclasses import dataclass -from slpkg.metadata import Metadata +from slpkg.configs import Configs from slpkg.queries import SBoQueries from slpkg.blacklist import Blacklist @dataclass class Check: - log_packages: str = Metadata.log_packages - repo_tag: str = Metadata.repo_tag + log_packages: str = Configs.log_packages + repo_tag: str = Configs.repo_tag def exists(self, slackbuilds: list): ''' Checking if the slackbuild exists in the repository. ''' diff --git a/slpkg/checksum.py b/slpkg/checksum.py index 7d42b330..72f5bf1f 100644 --- a/slpkg/checksum.py +++ b/slpkg/checksum.py @@ -5,7 +5,7 @@ import hashlib from dataclasses import dataclass -from slpkg.metadata import Metadata +from slpkg.configs import Configs from slpkg.views.views import ViewMessage @@ -13,7 +13,7 @@ from slpkg.views.views import ViewMessage class Md5sum: ''' Checksum the sources. ''' flags: str - build_path: str = Metadata.build_path + build_path: str = Configs.build_path def check(self, source: str, checksum: str, name: str): path = f'{self.build_path}/{name}' diff --git a/slpkg/cli_menu.py b/slpkg/cli_menu.py index 11194301..d7740539 100644 --- a/slpkg/cli_menu.py +++ b/slpkg/cli_menu.py @@ -1,11 +1,11 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- -from slpkg.metadata import Metadata +from slpkg.configs import Configs def usage(status: int): - args = [f'Usage: {Metadata.prog_name} [OPTIONS] [packages]\n', + args = [f'Usage: {Configs.prog_name} [OPTIONS] [packages]\n', ' Packaging tool that interacts with the SBo repository.\n', 'Options:', ' update Update the data packages.', diff --git a/slpkg/metadata.py b/slpkg/configs.py similarity index 99% rename from slpkg/metadata.py rename to slpkg/configs.py index c469dae4..17ebef6a 100644 --- a/slpkg/metadata.py +++ b/slpkg/configs.py @@ -7,7 +7,7 @@ from dataclasses import dataclass @dataclass -class Metadata: +class Configs: # Programme name prog_name: str = 'slpkg' diff --git a/slpkg/create_data.py b/slpkg/create_data.py index 0478e88e..4b885705 100644 --- a/slpkg/create_data.py +++ b/slpkg/create_data.py @@ -4,7 +4,7 @@ from dataclasses import dataclass -from slpkg.metadata import Metadata +from slpkg.configs import Configs from slpkg.models.models import SBoTable from slpkg.models.models import session as Session @@ -12,9 +12,9 @@ from slpkg.models.models import session as Session @dataclass class CreateData: - db_path: str = Metadata.db_path - sbo_txt: str = Metadata.sbo_txt - sbo_repo_path: str = Metadata.sbo_repo_path + db_path: str = Configs.db_path + sbo_txt: str = Configs.sbo_txt + sbo_repo_path: str = Configs.sbo_repo_path session: str = Session def insert_sbo_table(self): diff --git a/slpkg/downloader.py b/slpkg/downloader.py index 177eab98..78b683eb 100644 --- a/slpkg/downloader.py +++ b/slpkg/downloader.py @@ -4,12 +4,12 @@ import subprocess from dataclasses import dataclass -from slpkg.metadata import Metadata +from slpkg.configs import Configs @dataclass class Wget: - wget_options: str = Metadata.wget_options + wget_options: str = Configs.wget_options def download(self, path: str, url: str): subprocess.call(f'wget {self.wget_options} --directory-prefix={path}' diff --git a/slpkg/main.py b/slpkg/main.py index e669c82b..7917412f 100644 --- a/slpkg/main.py +++ b/slpkg/main.py @@ -6,7 +6,7 @@ import sys from dataclasses import dataclass from slpkg.cli_menu import usage -from slpkg.metadata import Metadata +from slpkg.configs import Configs from slpkg.slackbuild import Slackbuilds from slpkg.remove_packages import RemovePackages from slpkg.update_repository import UpdateRepository @@ -50,7 +50,7 @@ class Argparse: usage(0) if self.args[0] in ['--version', '-v']: - print(f'{Metadata.prog_nama}: {Version.version}') + print(f'{Configs.name}: {Version.version}') raise SystemExit() if self.args[0] == 'clean-logs': diff --git a/slpkg/models/models.py b/slpkg/models/models.py index 3a7c91e6..b3727c0a 100644 --- a/slpkg/models/models.py +++ b/slpkg/models/models.py @@ -1,15 +1,15 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- -from slpkg.metadata import Metadata +from slpkg.configs import Configs from dataclasses import dataclass from sqlalchemy.orm import sessionmaker from sqlalchemy.ext.declarative import declarative_base from sqlalchemy import create_engine, Column, Integer, Text -db_path = Metadata.db_path -database = Metadata.database +db_path = Configs.db_path +database = Configs.database DATABASE_URI = f"sqlite:///{db_path}/{database}" engine = create_engine(DATABASE_URI) diff --git a/slpkg/queries.py b/slpkg/queries.py index 3eee9fc7..dbcf17b4 100644 --- a/slpkg/queries.py +++ b/slpkg/queries.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- -from slpkg.metadata import Metadata +from slpkg.configs import Configs from slpkg.models.models import SBoTable from slpkg.models.models import session as Session from dataclasses import dataclass @@ -14,7 +14,7 @@ class SBoQueries: ''' Queries class for the sbo repository. ''' name: str session: str = Session - os_arch: str = Metadata.os_arch + os_arch: str = Configs.os_arch def __post_init__(self): self.black = Blacklist() diff --git a/slpkg/remove_packages.py b/slpkg/remove_packages.py index 739fe76c..5fd0087c 100644 --- a/slpkg/remove_packages.py +++ b/slpkg/remove_packages.py @@ -4,7 +4,7 @@ import os import subprocess -from slpkg.metadata import Metadata +from slpkg.configs import Configs from dataclasses import dataclass from slpkg.blacklist import Blacklist @@ -20,10 +20,10 @@ class RemovePackages: flags: list session: str = Session black: list = Blacklist() - log_packages: str = Metadata.log_packages - repo_tag: str = Metadata.repo_tag - removepkg: str = Metadata.removepkg - color: str = Metadata.colour + log_packages: str = Configs.log_packages + repo_tag: str = Configs.repo_tag + removepkg: str = Configs.removepkg + color: str = Configs.colour def remove(self): ''' Remove package with dependencies. ''' diff --git a/slpkg/slackbuild.py b/slpkg/slackbuild.py index be1d0331..075a3916 100644 --- a/slpkg/slackbuild.py +++ b/slpkg/slackbuild.py @@ -9,7 +9,7 @@ from dataclasses import dataclass from slpkg.downloader import Wget from slpkg.checksum import Md5sum -from slpkg.metadata import Metadata +from slpkg.configs import Configs from slpkg.queries import SBoQueries from slpkg.utilities import Utilities from slpkg.dependencies import Requires @@ -26,17 +26,17 @@ class Slackbuilds: install: bool session: str = Session utils: str = Utilities() - build_path: str = Metadata.build_path - sbo_url: str = Metadata.sbo_url - build_path: str = Metadata.build_path - tmp_slpkg: str = Metadata.tmp_slpkg - tmp_path: str = Metadata.tmp_path - tar_suffix: str = Metadata.tar_suffix - os_arch: str = Metadata.os_arch - repo_tag: str = Metadata.repo_tag - pkg_suffix: str = Metadata.pkg_suffix - installpkg: str = Metadata.installpkg - reinstall: str = Metadata.reinstall + build_path: str = Configs.build_path + sbo_url: str = Configs.sbo_url + build_path: str = Configs.build_path + tmp_slpkg: str = Configs.tmp_slpkg + tmp_path: str = Configs.tmp_path + tar_suffix: str = Configs.tar_suffix + os_arch: str = Configs.os_arch + repo_tag: str = Configs.repo_tag + pkg_suffix: str = Configs.pkg_suffix + installpkg: str = Configs.installpkg + reinstall: str = Configs.reinstall def execute(self): ''' Starting build or install the slackbuilds. ''' diff --git a/slpkg/update_repository.py b/slpkg/update_repository.py index 43121b6e..d82fb3e5 100644 --- a/slpkg/update_repository.py +++ b/slpkg/update_repository.py @@ -6,7 +6,7 @@ import os from os import path from slpkg.create_data import CreateData from slpkg.downloader import Wget -from slpkg.metadata import Metadata +from slpkg.configs import Configs from slpkg.models.models import SBoTable from slpkg.models.models import session as Session from dataclasses import dataclass @@ -15,11 +15,11 @@ from dataclasses import dataclass @dataclass class UpdateRepository: ''' Deletes and install the data. ''' - sbo_repo_path: str = Metadata.sbo_repo_path - url: str = Metadata.sbo_url - sbo_txt: str = Metadata.sbo_txt - db_path: str = Metadata.db_path - database: str = Metadata.database + sbo_repo_path: str = Configs.sbo_repo_path + url: str = Configs.sbo_url + sbo_txt: str = Configs.sbo_txt + db_path: str = Configs.db_path + database: str = Configs.database session: str = Session def sbo(self): diff --git a/slpkg/utilities.py b/slpkg/utilities.py index d9503ac1..fabcc9d5 100644 --- a/slpkg/utilities.py +++ b/slpkg/utilities.py @@ -6,12 +6,12 @@ import os import re import tarfile from dataclasses import dataclass -from metadata import Metadata +from slpkg.configs import Configs @dataclass class Utilities: - log_packages: str = Metadata.log_packages + log_packages: str = Configs.log_packages def build_tag(self, path: str, name: str): ''' Opens the .SlackBuild file and reads the BUILD TAG. ''' diff --git a/slpkg/views/views.py b/slpkg/views/views.py index 0d0b61c1..178b8177 100644 --- a/slpkg/views/views.py +++ b/slpkg/views/views.py @@ -3,13 +3,13 @@ from dataclasses import dataclass from slpkg.queries import SBoQueries -from slpkg.metadata import Metadata +from slpkg.configs import Configs from utilities import Utilities @dataclass class ViewMessage: - colors: str = Metadata.colour + colors: str = Configs.colour utils: str = Utilities() def build_packages(self, slackbuilds: list, dependencies: list):