diff --git a/slpkg/check_updates.py b/slpkg/check_updates.py index f293043a..5fdd4e4d 100644 --- a/slpkg/check_updates.py +++ b/slpkg/check_updates.py @@ -59,15 +59,15 @@ class CheckUpdates(Configs): def save_the_compares(self, repo: str) -> None: local_chg_txt: Path = Path( - self.repos.repositories[repo]['path'], # type: ignore[arg-type] - self.repos.repositories[repo]['changelog_txt'] # type: ignore[arg-type] + self.repos.repositories[repo]['path'], + self.repos.repositories[repo]['changelog_txt'] ) repo_chg_txt: str = ( f"{self.repos.repositories[repo]['mirror_changelog']}" f"{self.repos.repositories[repo]['changelog_txt']}" ) - repo_data_file: Path = Path(self.repos.repositories[repo]['path'], # type: ignore[arg-type] + repo_data_file: Path = Path(self.repos.repositories[repo]['path'], self.repos.data_json) if not repo_data_file.is_file(): diff --git a/slpkg/download_only.py b/slpkg/download_only.py index 462dbc71..4417ed03 100644 --- a/slpkg/download_only.py +++ b/slpkg/download_only.py @@ -95,7 +95,7 @@ class DownloadOnly(Configs): self.asc_files.append(asc_file) def copy_slackbuild_scripts(self, name: str) -> None: - repo_path_package: Path = Path(self.repos.repositories[self.repository]['path'], self.data[name]['location'], name) # type: ignore[arg-type] + repo_path_package: Path = Path(self.repos.repositories[self.repository]['path'], self.data[name]['location'], name) if not Path(self.directory, name).is_dir(): shutil.copytree(repo_path_package, Path(self.directory, name)) diff --git a/slpkg/multi_process.py b/slpkg/multi_process.py index d27aff98..12b410d7 100644 --- a/slpkg/multi_process.py +++ b/slpkg/multi_process.py @@ -116,10 +116,10 @@ class MultiProcess(Configs): self._error_process() raise SystemExit(process.returncode) - def _error_process(self): + def _error_process(self) -> None: """ Prints error message for a process. """ if not self.progress_bar_conf and not self.option_for_progress_bar: - message: str = 'Error occurred with process. Please check the log file.' # type: ignore[annotation-unchecked] + message: str = 'Error occurred with process. Please check the log file.' print() print(len(message) * '=') print(f'{self.bred}{message}{self.endc}') diff --git a/slpkg/repositories.py b/slpkg/repositories.py index a0945dfd..df9814aa 100644 --- a/slpkg/repositories.py +++ b/slpkg/repositories.py @@ -16,6 +16,10 @@ from slpkg.utilities import Utilities from slpkg.toml_errors import TomlErrors +def default_repositories(): + return {} + + @dataclass class Repositories: toml_errors = TomlErrors() @@ -240,7 +244,7 @@ class Repositories: toml_errors.raise_toml_error_message(error, repositories_toml_file) # Dictionary configurations of repositories. - repositories = { + repositories: dict[str, str] = { sbo_repo_name: { 'enable': sbo_repo, 'path': sbo_repo_path, diff --git a/slpkg/update_repositories.py b/slpkg/update_repositories.py index ce032b62..a069ea1e 100644 --- a/slpkg/update_repositories.py +++ b/slpkg/update_repositories.py @@ -62,13 +62,13 @@ class UpdateRepositories(Configs): """ Updates the binary repositories. """ urls: dict = {} - self.utils.create_directory(self.repos.repositories[repo]['path']) # type: ignore[arg-type] - self.utils.remove_file_if_exists(self.repos.repositories[repo]['path'], # type: ignore[arg-type] - self.repos.repositories[repo]['changelog_txt']) # type: ignore[arg-type] - self.utils.remove_file_if_exists(self.repos.repositories[repo]['path'], # type: ignore[arg-type] - self.repos.repositories[repo]['packages_txt']) # type: ignore[arg-type] - self.utils.remove_file_if_exists(self.repos.repositories[repo]['path'], # type: ignore[arg-type] - self.repos.repositories[repo]['checksums_md5']) # type: ignore[arg-type] + self.utils.create_directory(self.repos.repositories[repo]['path']) + self.utils.remove_file_if_exists(self.repos.repositories[repo]['path'], + self.repos.repositories[repo]['changelog_txt']) + self.utils.remove_file_if_exists(self.repos.repositories[repo]['path'], + self.repos.repositories[repo]['packages_txt']) + self.utils.remove_file_if_exists(self.repos.repositories[repo]['path'], + self.repos.repositories[repo]['checksums_md5']) changelog: str = (f"{self.repos.repositories[repo]['mirror_changelog']}" f"{self.repos.repositories[repo]['changelog_txt']}") @@ -85,11 +85,11 @@ class UpdateRepositories(Configs): def update_slackbuild_repos(self, repo: str) -> None: """ Updates the slackbuild repositories. """ - self.utils.create_directory(self.repos.repositories[repo]['path']) # type: ignore[arg-type] - self.utils.remove_file_if_exists(self.repos.repositories[repo]['path'], # type: ignore[arg-type] - self.repos.repositories[repo]['slackbuilds_txt']) # type: ignore[arg-type] - self.utils.remove_file_if_exists(self.repos.repositories[repo]['path'], # type: ignore[arg-type] - self.repos.repositories[repo]['changelog_txt']) # type: ignore[arg-type] + self.utils.create_directory(self.repos.repositories[repo]['path']) + self.utils.remove_file_if_exists(self.repos.repositories[repo]['path'], + self.repos.repositories[repo]['slackbuilds_txt']) + self.utils.remove_file_if_exists(self.repos.repositories[repo]['path'], + self.repos.repositories[repo]['changelog_txt']) lftp_command: str = (f"lftp {self.lftp_mirror_options} {self.repos.repositories[repo]['mirror_packages']} " f"{self.repos.repositories[repo]['path']}") @@ -97,9 +97,9 @@ class UpdateRepositories(Configs): self.multi_process.process(lftp_command) # It checks if there is a SLACKBUILDS.TXT file, otherwise it's going to create one. - if not Path(self.repos.repositories[repo]['path'], # type: ignore[arg-type] - self.repos.repositories[repo]['slackbuilds_txt']).is_file(): # type: ignore[arg-type] - self.generate.slackbuild_file(self.repos.repositories[repo]['path'], # type: ignore[arg-type] - self.repos.repositories[repo]['slackbuilds_txt']) # type: ignore[arg-type] + if not Path(self.repos.repositories[repo]['path'], + self.repos.repositories[repo]['slackbuilds_txt']).is_file(): + self.generate.slackbuild_file(self.repos.repositories[repo]['path'], + self.repos.repositories[repo]['slackbuilds_txt']) self.data.install_sbo_data(repo) diff --git a/slpkg/upgrade.py b/slpkg/upgrade.py index 09fce51d..c9068350 100644 --- a/slpkg/upgrade.py +++ b/slpkg/upgrade.py @@ -41,7 +41,7 @@ class Upgrade(Configs): if repository == self.repos.slack_repo_name: extra_repo: dict = {} - extra_data_file: Path = Path(self.repos.repositories[self.repos.slack_extra_repo_name]['path'], # type: ignore[arg-type] + extra_data_file: Path = Path(self.repos.repositories[self.repos.slack_extra_repo_name]['path'], self.repos.data_json) if self.repos.repositories[self.repos.slack_extra_repo_name]['enable'] and extra_data_file.is_file(): @@ -61,7 +61,7 @@ class Upgrade(Configs): self.installed_packages.append(Path(package)) self.installed_names.append(name) else: - repo_tag: str = self.repos.repositories[repository]['repo_tag'] # type: ignore[assignment] + repo_tag: str = self.repos.repositories[repository]['repo_tag'] self.installed_packages: list = list(self.log_packages.glob(f'*{repo_tag}')) def packages(self) -> Generator: diff --git a/slpkg/views/view_package.py b/slpkg/views/view_package.py index f6551b08..aac11ae6 100644 --- a/slpkg/views/view_package.py +++ b/slpkg/views/view_package.py @@ -1,6 +1,8 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- +# mypy: disable-error-code="no-redef" + from pathlib import Path from slpkg.configs import Configs