diff --git a/slpkg/update_repository.py b/slpkg/update_repository.py index a22ee295..59ea8c47 100644 --- a/slpkg/update_repository.py +++ b/slpkg/update_repository.py @@ -89,7 +89,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.slack_repo_name}{self.endc}" f"' repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.slack_repo_name) + self.utils.create_directory(self.repos.slack_repo_path) urls.append(f'{self.repos.slack_repo_mirror[0]}{self.repos.slack_repo_packages}') urls.append(f'{self.repos.slack_repo_mirror[0]}{self.repos.slack_repo_changelog}') @@ -113,7 +113,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.slack_extra_repo_name}{self.endc}" f"' repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.slack_extra_repo_name) + self.utils.create_directory(self.repos.slack_extra_repo_path) urls.append(f'{"".join(self.repos.slack_extra_repo_mirror)}{self.repos.slack_extra_repo_packages}') urls.append(f'{self.repos.slack_extra_repo_mirror[0]}{self.repos.slack_extra_repo_changelog}') @@ -140,7 +140,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.slack_patches_repo_name}{self.endc}" f"' repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.slack_patches_repo_name) + self.utils.create_directory(self.repos.slack_patches_repo_path) urls.append(f'{"".join(self.repos.slack_patches_repo_mirror)}{self.repos.slack_patches_repo_packages}') urls.append(f'{self.repos.slack_patches_repo_mirror[0]}{self.repos.slack_patches_repo_changelog}') @@ -167,7 +167,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.alien_repo_name}{self.endc}' " f"repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.alien_repo_name) + self.utils.create_directory(self.repos.alien_repo_path) urls.append(f'{"".join(self.repos.alien_repo_mirror)}{self.repos.alien_repo_packages}') urls.append(f'{self.repos.alien_repo_mirror[0]}{self.repos.alien_repo_changelog}') @@ -191,7 +191,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.multilib_repo_name}{self.endc}' " f"repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.multilib_repo_name) + self.utils.create_directory(self.repos.multilib_repo_path) urls.append(f'{"".join(self.repos.multilib_repo_mirror)}{self.repos.multilib_repo_packages}') urls.append(f'{self.repos.multilib_repo_mirror[0]}{self.repos.multilib_repo_changelog}') @@ -215,7 +215,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.restricted_repo_name}{self.endc}' " f"repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.restricted_repo_name) + self.utils.create_directory(self.repos.restricted_repo_path) urls.append(f'{"".join(self.repos.restricted_repo_mirror)}{self.repos.restricted_repo_packages}') urls.append(f'{self.repos.restricted_repo_mirror[0]}{self.repos.restricted_repo_changelog}') @@ -239,7 +239,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.gnome_repo_name}{self.endc}' " f"repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.gnome_repo_name) + self.utils.create_directory(self.repos.gnome_repo_path) urls.append(f'{self.repos.gnome_repo_mirror[0]}{self.repos.gnome_repo_packages}') urls.append(f'{self.repos.gnome_repo_mirror[0]}{self.repos.gnome_repo_changelog}') @@ -263,7 +263,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.msb_repo_name}{self.endc}' " f"repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.msb_repo_name) + self.utils.create_directory(self.repos.msb_repo_path) urls.append(f'{"".join(self.repos.msb_repo_mirror)}{self.repos.msb_repo_packages}') urls.append(f'{self.repos.msb_repo_mirror[0]}{self.repos.msb_repo_changelog}') @@ -290,7 +290,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.csb_repo_name}{self.endc}' " f"repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.csb_repo_name) + self.utils.create_directory(self.repos.csb_repo_path) urls.append(f'{"".join(self.repos.csb_repo_mirror)}{self.repos.csb_repo_packages}') urls.append(f'{self.repos.csb_repo_mirror[0]}{self.repos.csb_repo_changelog}') @@ -317,7 +317,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.conraid_repo_name}{self.endc}' " f"repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.conraid_repo_name) + self.utils.create_directory(self.repos.conraid_repo_path) urls.append(f'{self.repos.conraid_repo_mirror[0]}{self.repos.conraid_repo_packages}') urls.append(f'{self.repos.conraid_repo_mirror[0]}{self.repos.conraid_repo_changelog}') @@ -341,7 +341,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.slackonly_repo_name}{self.endc}' " f"repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.slackonly_repo_name) + self.utils.create_directory(self.repos.slackonly_repo_path) urls.append(f'{self.repos.slackonly_repo_mirror[0]}{self.repos.slackonly_repo_packages}') urls.append(f'{self.repos.slackonly_repo_mirror[0]}{self.repos.slackonly_repo_changelog}') @@ -365,7 +365,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.salixos_repo_name}{self.endc}' " f"repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.salixos_repo_name) + self.utils.create_directory(self.repos.salixos_repo_path) urls.append(f'{self.repos.salixos_repo_mirror[0]}{self.repos.salixos_repo_packages}') urls.append(f'{self.repos.salixos_repo_mirror[0]}{self.repos.salixos_repo_changelog}') @@ -389,7 +389,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.salixos_extra_repo_name}{self.endc}' " f"repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.salixos_extra_repo_name) + self.utils.create_directory(self.repos.salixos_extra_repo_path) urls.append(f'{"".join(self.repos.salixos_extra_repo_mirror)}{self.repos.salixos_extra_repo_packages}') urls.append(f'{self.repos.salixos_extra_repo_mirror[0]}{self.repos.salixos_extra_repo_changelog}') @@ -416,7 +416,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.salixos_patches_repo_name}{self.endc}' " f"repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.salixos_patches_repo_name) + self.utils.create_directory(self.repos.slack_patches_repo_path) urls.append(f'{"".join(self.repos.salixos_patches_repo_mirror)}' f'{self.repos.salixos_patches_repo_packages}') @@ -444,7 +444,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.slackel_repo_name}{self.endc}' " f"repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.slackel_repo_name) + self.utils.create_directory(self.repos.slackel_repo_path) urls.append(f'{self.repos.slackel_repo_mirror[0]}{self.repos.slackel_repo_packages}') urls.append(f'{self.repos.slackel_repo_mirror[0]}{self.repos.slackel_repo_changelog}') @@ -468,7 +468,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.slint_repo_name}{self.endc}' " f"repository, please wait...\n") urls: list = [] - self.utils.create_directory(self.repos.repositories_path, self.repos.slint_repo_name) + self.utils.create_directory(self.repos.slint_repo_path) urls.append(f'{self.repos.slint_repo_mirror[0]}{self.repos.slint_repo_packages}') urls.append(f'{self.repos.slint_repo_mirror[0]}{self.repos.slint_repo_changelog}') @@ -495,7 +495,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.ponce_repo_name}" f"{self.endc}' repository, please wait...\n") - self.utils.create_directory(self.repos.repositories_path, self.repos.gnome_repo_name) + self.utils.create_directory(self.repos.ponce_repo_path) self.utils.remove_file_if_exists(self.repos.ponce_repo_path, self.repos.ponce_repo_slackbuilds) lftp_command: str = (f'lftp {self.lftp_mirror_options} {self.repos.ponce_repo_mirror[0]} ' @@ -520,7 +520,7 @@ class UpdateRepository(Configs): print(f"Downloading the '{self.green}{self.repos.sbo_repo_name}{self.endc}' " f"repository, please wait...\n") - self.utils.create_directory(self.repos.repositories_path, self.repos.sbo_repo_name) + self.utils.create_directory(self.repos.sbo_repo_path) self.utils.remove_file_if_exists(self.repos.sbo_repo_path, self.repos.sbo_repo_slackbuilds) self.utils.remove_file_if_exists(self.repos.sbo_repo_path, self.repos.sbo_repo_changelog) diff --git a/slpkg/utilities.py b/slpkg/utilities.py index 506197e3..eb1a561b 100644 --- a/slpkg/utilities.py +++ b/slpkg/utilities.py @@ -60,9 +60,8 @@ class Utilities(Configs): shutil.rmtree(folder) @staticmethod - def create_directory(directory: Path, folder='') -> None: + def create_directory(directory: Path) -> None: """ Creates folder like mkdir -p. """ - directory: Path = Path(directory, folder) if not directory.is_dir(): directory.mkdir(parents=True, exist_ok=True)