From f139f62b684a65914673e412f6d1f6a97da625a5 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Thu, 11 Apr 2024 20:09:04 +0300 Subject: [PATCH] Updated for repositories.toml --- ChangeLog.txt | 6 +- configs/repositories.toml | 286 ++++++-------------------- slpkg/check_updates.py | 8 +- slpkg/install_data.py | 74 ++----- slpkg/repositories.py | 379 +++++------------------------------ slpkg/update_repositories.py | 294 +++++++-------------------- 6 files changed, 212 insertions(+), 835 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index af0d927f..38a24e3c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -6,14 +6,18 @@ * Added --pkg-version option in search command * Added display the file size with the command find +- Removed: + * Removed support for local repositories + - Updated: * Updated to exclude packages from slack_extra repository (Thanks to Marav) - * Fixed alignment in search command * Updated salixos mirrors + * Updated repositories.toml file - Fixed: * Fixed BrokenPipeError: [Errno 32] Broken pipe * Fixed for download path in download only + * Fixed alignment in search command ### 5.0.4 - 04/04/2024 - Updated: diff --git a/configs/repositories.toml b/configs/repositories.toml index a74f25e1..ab39392d 100644 --- a/configs/repositories.toml +++ b/configs/repositories.toml @@ -1,24 +1,9 @@ # This is the general repositories configuration file of slpkg: # /etc/slpkg/repositories.toml -# Updated: 10/04/2024, Version: 5.0.5 - -# Set 'true' to the variable {NAME}_REPO to enable a repository. - -# If you are going to use a local repository, set the repository: -# as the example bellow: -# ALIEN_REPO_LOCAL = ["file:///path/to/alien/repository/", -# "15.0/", "x86_64/"] -# A binary local repository will must contain the files: -# ChangeLog.txt, PACKAGES.TXT and CHECKSUMS.md5 -# A SlackBuilds repository will must contain the files: -# SLACKBUILDS.TXT and ChangeLog.txt -# After the mirror changed, you should update the database, run: -# slpkg update -# Note: Do not delete the mirror, it is using to synchronize -# with the local repo. +# Updated: 11/04/2024, Version: 5.0.5 # DO NOT CHANGE THE PATTERN OF THE MIRRORS, CHANGE ONLY WHAT YOU WANT. -# For alien and Slackware -current users should be: +# Example for alien repository and Slackware -current users should be: # ["https://slackware.nl/people/alien/sbrepos/", "current/", "x86_64/"] # and NOT: # ["https://slackware.nl/people/alien/sbrepos/current/x86_64/"] @@ -28,234 +13,85 @@ # if it is necessary. The mirror or every part of the mirror # should end with a slash '/'. -# If you are going to change the repository tag for sbo or -# ponce it is better after that to update the database. - -[REPOSITORIES] # This is the DEFAULT REPOSITORY. # You can change it with one that you see below. # Make sure you have enabled it before. -DEFAULT_REPOSITORY = "sbo" +[DEFAULT] +REPO = "sbo" -# SBo repository for Slackware 15.0 stable. -SBO_REPO = true -SBO_REPO_NAME = "sbo" -SBO_REPO_LOCAL = [""] -SBO_REPO_MIRROR = ["https://slackbuilds.org/slackbuilds/15.0/"] -SBO_REPO_SLACKBUILDS = "SLACKBUILDS.TXT" -SBO_REPO_CHANGELOG = "ChangeLog.txt" -SBO_REPO_TAG = "_SBo" -SBO_REPO_TAR_SUFFIX = ".tar.gz" +[SBO] +ENABLE = true +MIRROR = ["https://slackbuilds.org/slackbuilds/15.0/"] -# Ponce repository for Slackware -current. -PONCE_REPO = false -PONCE_REPO_NAME = "ponce" -PONCE_REPO_LOCAL = [""] -PONCE_REPO_MIRROR = ["https://cgit.ponce.cc/slackbuilds/plain/"] -PONCE_REPO_SLACKBUILDS = "SLACKBUILDS.TXT" -PONCE_REPO_CHANGELOG = "ChangeLog.txt" -PONCE_REPO_TAG = "_SBo" -PONCE_REPO_TAR_SUFFIX = ".tar.gz" +[PONCE] +ENABLE = false +MIRROR = ["https://cgit.ponce.cc/slackbuilds/plain/"] -# Official repository for Slackware x86_64 15.0 stable. -# Recommended using a mirror from /etc/slackpkg/mirrors file. -# Slackware x86_64 -current: -# ["https://slackware.uk/slackware/slackware64-current/"] -# SalixOs x86_64 15.0 stable: -# ["https://repo.greeklug.gr/data/pub/linux/salix/x86_64/slackware-15.0/"] -SLACK_REPO = false -SLACK_REPO_NAME = "slack" -SLACK_REPO_LOCAL = [""] -SLACK_REPO_MIRROR = ["https://slackware.uk/slackware/slackware64-15.0/"] -SLACK_REPO_PACKAGES = "PACKAGES.TXT" -SLACK_REPO_CHECKSUMS = "CHECKSUMS.md5" -SLACK_REPO_CHANGELOG = "ChangeLog.txt" -SLACK_REPO_TAG = "" +[SLACK] +ENABLE = false +MIRROR = ["https://slackware.uk/slackware/slackware64-15.0/"] -# Official repository for Slackware patches x86_64 15.0 stable. -# Recommended using a mirror from /etc/slackpkg/mirrors file. -# Slackware patches x86_64 -current: -# ["https://slackware.uk/slackware/slackware64-current/", "extra/"] -# SalixOs x86_64 15.0 stable: -# ["https://repo.greeklug.gr/data/pub/linux/salix/x86_64/slackware-15.0/", "extra/"] -SLACK_EXTRA_REPO = false -SLACK_EXTRA_REPO_NAME = "slack_extra" -SLACK_EXTRA_REPO_LOCAL = [""] -SLACK_EXTRA_REPO_MIRROR = ["https://slackware.uk/slackware/slackware64-15.0/", "extra/"] -SLACK_EXTRA_REPO_PACKAGES = "PACKAGES.TXT" -SLACK_EXTRA_REPO_CHECKSUMS = "CHECKSUMS.md5" -SLACK_EXTRA_REPO_CHANGELOG = "ChangeLog.txt" -SLACK_EXTRA_REPO_TAG = "" +[SLACK_EXTRA] +ENABLE = false +MIRROR = ["https://slackware.uk/slackware/slackware64-15.0/", "extra/"] -# Official repository for Slackware patches x86_64 15.0 stable. -# Recommended using a mirror from /etc/slackpkg/mirrors file. -# For Slackware patches x86_64 -current: -# ["https://slackware.uk/slackware/slackware64-current/", "patches/"] -# SalixOs x86_64 15.0 stable: -# ["https://repo.greeklug.gr/data/pub/linux/salix/x86_64/slackware-15.0/", "patches/"] -SLACK_PATCHES_REPO = false -SLACK_PATCHES_REPO_NAME = "slack_patches" -SLACK_PATCHES_REPO_LOCAL = [""] -SLACK_PATCHES_REPO_MIRROR = ["https://slackware.uk/slackware/slackware64-15.0/", "patches/"] -SLACK_PATCHES_REPO_PACKAGES = "PACKAGES.TXT" -SLACK_PATCHES_REPO_CHECKSUMS = "CHECKSUMS.md5" -SLACK_PATCHES_REPO_CHANGELOG = "ChangeLog.txt" -SLACK_PATCHES_REPO_TAG = "" +[SLACK_PATCHES] +ENABLE = false +MIRROR = ["https://slackware.uk/slackware/slackware64-15.0/", "patches/"] -# AlienBob repository for Slackware x86_64 15.0 stable. -# For Slackware x86_64 -current: -# ["http://slackware.uk/people/alien/sbrepos/", "current/", "x86_64/"] -ALIEN_REPO = false -ALIEN_REPO_NAME = "alien" -ALIEN_REPO_LOCAL = [""] -ALIEN_REPO_MIRROR = ["https://slackware.nl/people/alien/sbrepos/", "15.0/", "x86_64/"] -ALIEN_REPO_PACKAGES = "PACKAGES.TXT" -ALIEN_REPO_CHECKSUMS = "CHECKSUMS.md5" -ALIEN_REPO_CHANGELOG = "ChangeLog.txt" -ALIEN_REPO_TAG = "alien" +[ALIEN] +ENABLE = false +MIRROR = ["https://slackware.nl/people/alien/sbrepos/", "15.0/", "x86_64/"] -# Multilib repository for Slackware x86_64 15.0 stable. -# For Slackware x86_64 -current: -# ["https://slackware.nl/people/alien/multilib/", current/"] -MULTILIB_REPO = false -MULTILIB_REPO_NAME = "multilib" -MULTILIB_REPO_LOCAL = [""] -MULTILIB_REPO_MIRROR = ["https://slackware.nl/people/alien/multilib/", "15.0/"] -MULTILIB_REPO_PACKAGES = "PACKAGES.TXT" -MULTILIB_REPO_CHECKSUMS = "CHECKSUMS.md5" -MULTILIB_REPO_CHANGELOG = "ChangeLog.txt" -MULTILIB_REPO_TAG = "alien" +[MULTILIB] +ENABLE = false +MIRROR = ["https://slackware.nl/people/alien/multilib/", "15.0/"] -# Restricted repository for Slackware x86_64 15.0 stable. -# For Slackware x86_64 -current: -# ["https://slackware.nl/people/alien/restricted_sbrepos/", "current/", "x86_64/"] -RESTRICTED_REPO = false -RESTRICTED_REPO_NAME = "restricted" -RESTRICTED_REPO_LOCAL = [""] -RESTRICTED_REPO_MIRROR = ["https://slackware.nl/people/alien/restricted_sbrepos/", "15.0/", "x86_64/"] -RESTRICTED_REPO_PACKAGES = "PACKAGES.TXT" -RESTRICTED_REPO_CHECKSUMS = "CHECKSUMS.md5" -RESTRICTED_REPO_CHANGELOG = "ChangeLog.txt" -RESTRICTED_REPO_TAG = "alien" +[RESTRICTED] +ENABLE = false +MIRROR = ["https://slackware.nl/people/alien/restricted_sbrepos/", "15.0/", "x86_64/"] -# Gnome repository for Slackware x86_64 15.0 stable. -# For Slackware x86_64 -current: -# ["https://reddoglinux.ddns.net/linux/gnome/43.x/x86_64/"] -GNOME_REPO = false -GNOME_REPO_NAME = "gnome" -GNOME_REPO_LOCAL = [""] -GNOME_REPO_MIRROR = ["https://reddoglinux.ddns.net/linux/gnome/41.x/x86_64/"] -GNOME_REPO_PACKAGES = "PACKAGES.TXT" -GNOME_REPO_CHECKSUMS = "CHECKSUMS.md5" -GNOME_REPO_CHANGELOG = "ChangeLog.txt" -GNOME_REPO_TAG = "gfs" +[GNOME] +ENABLE = false +MIRROR = ["https://reddoglinux.ddns.net/linux/gnome/41.x/x86_64/"] -# MATE repository for Slackware x86_64 15.0 stable. -# For Slackware x86_64 -current: -# ["https://slackware.uk/msb/current/", "1.26/", "x86_64/"] -MSB_REPO = false -MSB_REPO_NAME = "msb" -MSB_REPO_LOCAL = [""] -MSB_REPO_MIRROR = ["https://slackware.uk/msb/", "15.0/", "1.28/", "x86_64/"] -MSB_REPO_PACKAGES = "PACKAGES.TXT" -MSB_REPO_CHECKSUMS = "CHECKSUMS.md5" -MSB_REPO_CHANGELOG = "ChangeLog.txt" -MSB_REPO_TAG = "msb" +[MSB] +ENABLE = false +MIRROR = ["https://slackware.uk/msb/", "15.0/", "1.28/", "x86_64/"] -# Cinnamon repository for Slackware x86_64 15.0 stable. -# For Slackware x86_64 -current: -# ["https://slackware.uk/csb/", "current/", "x86_64/"] -CSB_REPO = false -CSB_REPO_NAME = "csb" -CSB_REPO_LOCAL = [""] -CSB_REPO_MIRROR = ["https://slackware.uk/csb/", "15.0/", "x86_64/"] -CSB_REPO_PACKAGES = "PACKAGES.TXT" -CSB_REPO_CHECKSUMS = "CHECKSUMS.md5" -CSB_REPO_CHANGELOG = "ChangeLog.txt" -CSB_REPO_TAG = "csb" +[CSB] +ENABLE = false +MIRROR = ["https://slackware.uk/csb/", "15.0/", "x86_64/"] -# Conraid repository for Slackware x86_64 -current. -CONRAID_REPO = false -CONRAID_REPO_NAME = "conraid" -CONRAID_REPO_LOCAL = [""] -CONRAID_REPO_MIRROR = ["https://slackers.it/repository/slackware64-current/"] -CONRAID_REPO_PACKAGES = "PACKAGES.TXT" -CONRAID_REPO_CHECKSUMS = "CHECKSUMS.md5" -CONRAID_REPO_CHANGELOG = "ChangeLog.txt" -CONRAID_REPO_TAG = "cf" +[CONRAID] +ENABLE = false +MIRROR = ["https://slackers.it/repository/slackware64-current/"] -# Slackdce repository for Slackware x86_64 15.0 stable. -# Alternative mirror ["https://slackdce.radioclub.ar/slackdce/15.0/x86_64/"] -SLACKDCE_REPO = false -SLACKDCE_REPO_NAME = "slackdce" -SLACKDCE_REPO_LOCAL = [""] -SLACKDCE_REPO_MIRROR = ["https://slackware.uk/slackdce/15.0/x86_64/"] -SLACKDCE_REPO_PACKAGES = "PACKAGES.TXT" -SLACKDCE_REPO_CHECKSUMS = "CHECKSUMS.md5" -SLACKDCE_REPO_CHANGELOG = "ChangeLog.txt" -SLACKDCE_REPO_TAG = "dce" +[SLACKDCE] +ENABLE = false +MIRROR = ["https://slackware.uk/slackdce/15.0/x86_64/"] -# Slackonly repository for Slackware x86_64 15.0 stable. -# For Slackware x86_64 -current: -# ["https://packages.slackonly.com/pub/packages/current-x86_64/"] -SLACKONLY_REPO = false -SLACKONLY_REPO_NAME = "slackonly" -SLACKONLY_REPO_LOCAL = [""] -SLACKONLY_REPO_MIRROR = ["https://packages.slackonly.com/pub/packages/15.0-x86_64/"] -SLACKONLY_REPO_PACKAGES = "PACKAGES.TXT" -SLACKONLY_REPO_CHECKSUMS = "CHECKSUMS.md5" -SLACKONLY_REPO_CHANGELOG = "ChangeLog.txt" -SLACKONLY_REPO_TAG = "slonly" +[SLACKONLY] +ENABLE = false +MIRROR = ["https://packages.slackonly.com/pub/packages/15.0-x86_64/"] -# Repository for Salix OS x86_64 15.0 stable. -SALIX_REPO = false -SALIX_REPO_NAME = "salix" -SALIX_REPO_LOCAL = [""] -SALIX_REPO_MIRROR = ["https://repo.greeklug.gr/data/pub/linux/salix/x86_64/15.0/"] -SALIX_REPO_PACKAGES = "PACKAGES.TXT" -SALIX_REPO_CHECKSUMS = "CHECKSUMS.md5" -SALIX_REPO_CHANGELOG = "ChangeLog.txt" -SALIX_REPO_TAG = "" +[SALIX] +ENABLE = false +MIRROR = ["https://repo.greeklug.gr/data/pub/linux/salix/x86_64/15.0/"] -# Repository for Salix OS x86_64 15.0 stable. -SALIX_EXTRA_REPO = false -SALIX_EXTRA_REPO_NAME = "salix_extra" -SALIX_EXTRA_REPO_LOCAL = [""] -SALIX_EXTRA_REPO_MIRROR = ["https://repo.greeklug.gr/data/pub/linux/salix/x86_64/extra-15.0/"] -SALIX_EXTRA_REPO_PACKAGES = "PACKAGES.TXT" -SALIX_EXTRA_REPO_CHECKSUMS = "CHECKSUMS.md5" -SALIX_EXTRA_REPO_CHANGELOG = "ChangeLog.txt" -SALIX_EXTRA_REPO_TAG = "" +[SALIX_EXTRA] +ENABLE = false +MIRROR = ["https://repo.greeklug.gr/data/pub/linux/salix/x86_64/extra-15.0/"] -# Repository for Slackel OS x86_64 -current. -SLACKEL_REPO = false -SLACKEL_REPO_NAME = "slackel" -SLACKEL_REPO_LOCAL = [""] -SLACKEL_REPO_MIRROR = ["http://www.slackel.gr/repo/x86_64/current/"] -SLACKEL_REPO_PACKAGES = "PACKAGES.TXT" -SLACKEL_REPO_CHECKSUMS = "CHECKSUMS.md5" -SLACKEL_REPO_CHANGELOG = "ChangeLog.txt" -SLACKEL_REPO_TAG = "dj" +[SLACKEL] +ENABLE = false +MIRROR = ["http://www.slackel.gr/repo/x86_64/current/"] -# Slint repository for Slackware x86_64 15.0 stable. -SLINT_REPO = false -SLINT_REPO_NAME = "slint" -SLINT_REPO_LOCAL = [""] -SLINT_REPO_MIRROR = ["https://slackware.uk/slint/x86_64/slint-15.0/"] -SLINT_REPO_PACKAGES = "PACKAGES.TXT" -SLINT_REPO_CHECKSUMS = "CHECKSUMS.md5" -SLINT_REPO_CHANGELOG = "ChangeLog.txt" -SLINT_REPO_TAG = "slint" +[SLINT] +ENABLE = false +MIRROR = ["https://slackware.uk/slint/x86_64/slint-15.0/"] -# Pprkut repository for Slackware x86_64 15.0 stable. -# For Slackware x86_64 -current: -# ["https://repo.liwjatan.org/pprkut/current/x86_64/"] -PPRKUT_REPO = false -PPRKUT_REPO_NAME = "pprkut" -PPRKUT_REPO_LOCAL = [""] -PPRKUT_REPO_MIRROR = ["https://repo.liwjatan.org/pprkut/15.0/x86_64/"] -PPRKUT_REPO_PACKAGES = "PACKAGES.TXT" -PPRKUT_REPO_CHECKSUMS = "CHECKSUMS.md5" -PPRKUT_REPO_CHANGELOG = "ChangeLog.txt" -PPRKUT_REPO_TAG = "pprkut" +[PPRKUT] +ENABLE = false +MIRROR = ["https://repo.liwjatan.org/pprkut/15.0/x86_64/"] diff --git a/slpkg/check_updates.py b/slpkg/check_updates.py index 2fe62ae8..54cdf06b 100644 --- a/slpkg/check_updates.py +++ b/slpkg/check_updates.py @@ -59,14 +59,12 @@ class CheckUpdates(Configs): self.repositories(repo) def repositories(self, repo: str) -> None: - local_chg_txt: Path = Path(self.repos.repositories[repo]['path'], - self.repos.repositories[repo]['changelog_txt']) - repo_chg_txt: str = (f"{self.repos.repositories[repo]['mirror'][0]}" - f"{self.repos.repositories[repo]['changelog_txt']}") + local_chg_txt: Path = Path(self.repos.repositories[repo]['path'], self.repos.repositories[repo]['changelog_txt']) + repo_chg_txt: str = f"{self.repos.repositories[repo]['mirror'][0]}{self.repos.repositories[repo]['changelog_txt']}" repo_data_file: Path = Path(self.repos.repositories[repo]['path'], self.repos.data_json) if not repo_data_file.is_file(): - self.compare[repo]: dict = True + self.compare[repo] = True else: self.compare[repo] = self.compare_the_changelogs(local_chg_txt, repo_chg_txt) diff --git a/slpkg/install_data.py b/slpkg/install_data.py index 8f3b4428..bf8aaac7 100644 --- a/slpkg/install_data.py +++ b/slpkg/install_data.py @@ -38,7 +38,7 @@ class InstallData(Configs): last_date: str = line.replace('\n', '') break - last_update_json[repo]: dict = last_date + last_update_json[repo] = last_date if self.repos.last_update_json.is_file(): last_update_json: dict = self.utils.read_json_file(self.repos.last_update_json) last_update_json[repo] = last_date @@ -90,7 +90,7 @@ class InstallData(Configs): location: str = cache[1].split('/')[1] requires: list = cache[8].replace('%README%', '').split() - data[name]: dict = { + data[name] = { 'location': location, 'files': cache[2].split(), 'version': version, @@ -171,7 +171,7 @@ class InstallData(Configs): location: str = cache[1].split('/')[1] requires: list = [item for item in cache[8].split() if item in names] - data[name]: dict = { + data[name] = { 'location': location, 'files': cache[2].split(), 'version': version, @@ -214,8 +214,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = self.repos.slack_repo_mirror[0] - if self.repos.slack_repo_local[0].startswith('file'): - mirror: str = self.repos.slack_repo_local[0] self._import_GPG_KEY(mirror=mirror) @@ -278,7 +276,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 9: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.slack_repo_name, 'version': cache[1], 'package': cache[2], @@ -311,8 +309,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = self.repos.slack_extra_repo_mirror[0] - if self.repos.slack_extra_repo_local[0].startswith('file'): - mirror: str = self.repos.slack_extra_repo_local[0] self._import_GPG_KEY(mirror=mirror) @@ -375,7 +371,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 9: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.slack_extra_repo_name, 'version': cache[1], 'package': cache[2], @@ -408,8 +404,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = self.repos.slack_patches_repo_mirror[0] - if self.repos.slack_patches_repo_local[0].startswith('file'): - mirror: str = self.repos.slack_patches_repo_local[0] self._import_GPG_KEY(mirror=mirror) @@ -472,7 +466,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 9: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.slack_patches_repo_name, 'version': cache[1], 'package': cache[2], @@ -505,8 +499,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = ''.join(self.repos.alien_repo_mirror) - if self.repos.alien_repo_local[0].startswith('file'): - mirror: str = ''.join(self.repos.alien_repo_local) self._import_GPG_KEY(mirror=mirror) @@ -574,7 +566,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 10: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.alien_repo_name, 'version': cache[1], 'package': cache[2], @@ -607,8 +599,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = ''.join(self.repos.multilib_repo_mirror) - if self.repos.multilib_repo_local[0].startswith('file'): - mirror: str = ''.join(self.repos.multilib_repo_local) self._import_GPG_KEY(mirror=mirror) @@ -671,7 +661,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 9: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.multilib_repo_name, 'version': cache[1], 'package': cache[2], @@ -704,8 +694,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = ''.join(self.repos.restricted_repo_mirror) - if self.repos.restricted_repo_local[0].startswith('file'): - mirror: str = ''.join(self.repos.restricted_repo_local) self._import_GPG_KEY(mirror=mirror) @@ -768,7 +756,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 9: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.restricted_repo_name, 'version': cache[1], 'package': cache[2], @@ -801,8 +789,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = self.repos.gnome_repo_mirror[0] - if self.repos.gnome_repo_local[0].startswith('file'): - mirror: str = self.repos.gnome_repo_local[0] self._import_GPG_KEY(mirror=mirror) @@ -866,7 +852,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 9: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.gnome_repo_name, 'version': cache[1], 'package': cache[2], @@ -899,8 +885,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = ''.join(self.repos.msb_repo_mirror) - if self.repos.msb_repo_local[0].startswith('file'): - mirror: str = ''.join(self.repos.msb_repo_local) self._import_GPG_KEY(mirror=mirror) @@ -963,7 +947,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 9: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.msb_repo_name, 'version': cache[1], 'package': cache[2], @@ -996,8 +980,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = ''.join(self.repos.csb_repo_mirror) - if self.repos.csb_repo_local[0].startswith('file'): - mirror: str = ''.join(self.repos.csb_repo_local) self._import_GPG_KEY(mirror=mirror) @@ -1060,7 +1042,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 9: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.csb_repo_name, 'version': cache[1], 'package': cache[2], @@ -1093,8 +1075,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = self.repos.conraid_repo_mirror[0] - if self.repos.conraid_repo_local[0].startswith('file'): - mirror: str = self.repos.conraid_repo_local[0] self._import_GPG_KEY(mirror=mirror) @@ -1158,7 +1138,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 9: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.conraid_repo_name, 'version': cache[1], 'package': cache[2], @@ -1191,8 +1171,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = self.repos.slackdce_repo_mirror[0] - if self.repos.slackdce_repo_local[0].startswith('file'): - mirror: str = self.repos.slackdce_repo_local[0] self._import_GPG_KEY(mirror=mirror) @@ -1260,7 +1238,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 10: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.slackdce_repo_name, 'version': cache[1], 'package': cache[2], @@ -1293,8 +1271,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = self.repos.slackonly_repo_mirror[0] - if self.repos.slackonly_repo_local[0].startswith('file'): - mirror: str = self.repos.slackonly_repo_local[0] self._import_GPG_KEY(mirror=mirror) @@ -1362,7 +1338,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 10: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.slackonly_repo_name, 'version': cache[1], 'package': cache[2], @@ -1395,8 +1371,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = self.repos.salix_repo_mirror[0] - if self.repos.salix_repo_local[0].startswith('file'): - mirror: str = self.repos.salix_repo_local[0] self._import_GPG_KEY(mirror=mirror) @@ -1472,7 +1446,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 10: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.salix_repo_name, 'version': cache[1], 'package': cache[2], @@ -1505,8 +1479,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = self.repos.salix_extra_repo_mirror[0] - if self.repos.salix_extra_repo_local[0].startswith('file'): - mirror: str = self.repos.salix_extra_repo_local[0] self._import_GPG_KEY(mirror=mirror) @@ -1582,7 +1554,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 10: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.salix_extra_repo_name, 'version': cache[1], 'package': cache[2], @@ -1615,8 +1587,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = self.repos.slackel_repo_mirror[0] - if self.repos.slackel_repo_local[0].startswith('file'): - mirror: str = self.repos.slackel_repo_local[0] self._import_GPG_KEY(mirror=mirror) @@ -1692,7 +1662,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 10: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.slackel_repo_name, 'version': cache[1], 'package': cache[2], @@ -1725,8 +1695,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = self.repos.slint_repo_mirror[0] - if self.repos.slint_repo_local[0].startswith('file'): - mirror: str = self.repos.slint_repo_local[0] self._import_GPG_KEY(mirror=mirror) @@ -1802,7 +1770,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 10: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.slint_repo_name, 'version': cache[1], 'package': cache[2], @@ -1835,8 +1803,6 @@ class InstallData(Configs): end='', flush=True) mirror: str = ''.join(self.repos.pprkut_repo_mirror) - if self.repos.pprkut_repo_local[0].startswith('file'): - mirror: str = ''.join(self.repos.pprkut_repo_local) self._import_GPG_KEY(mirror=mirror) @@ -1899,7 +1865,7 @@ class InstallData(Configs): cache.append(package_description) if len(cache) == 9: - data[cache[0]]: dict = { + data[cache[0]] = { 'repo': self.repos.pprkut_repo_name, 'version': cache[1], 'package': cache[2], diff --git a/slpkg/repositories.py b/slpkg/repositories.py index e9b21839..9b22c4e4 100644 --- a/slpkg/repositories.py +++ b/slpkg/repositories.py @@ -31,7 +31,6 @@ class Repositories: sbo_repo: bool = True sbo_repo_name: str = 'sbo' sbo_repo_path: Path = Path(repositories_path, sbo_repo_name) - sbo_repo_local = [''] sbo_repo_mirror = ['https://slackbuilds.org/slackbuilds/15.0/'] sbo_repo_slackbuilds: str = 'SLACKBUILDS.TXT' sbo_repo_changelog: str = 'ChangeLog.txt' @@ -41,7 +40,6 @@ class Repositories: ponce_repo: bool = False ponce_repo_name: str = 'ponce' ponce_repo_path: Path = Path(repositories_path, ponce_repo_name) - ponce_repo_local = [''] ponce_repo_mirror = ['https://cgit.ponce.cc/slackbuilds/plain/'] ponce_repo_slackbuilds: str = 'SLACKBUILDS.TXT' ponce_repo_changelog: str = 'ChangeLog.txt' @@ -51,7 +49,6 @@ class Repositories: slack_repo: bool = False slack_repo_name: str = 'slack' slack_repo_path: Path = Path(repositories_path, slack_repo_name) - slack_repo_local = [''] slack_repo_mirror = ['https://slackware.uk/slackware/slackware64-15.0/'] slack_repo_packages: str = 'PACKAGES.TXT' slack_repo_checksums: str = 'CHECKSUMS.md5' @@ -61,8 +58,7 @@ class Repositories: slack_extra_repo: bool = False slack_extra_repo_name: str = 'slack_extra' slack_extra_repo_path: Path = Path(repositories_path, slack_extra_repo_name) - slack_extra_repo_local = [''] - slack_extra_repo_mirror = ['https://slackware.uk/slackware/slackware64-15.0/', "extra/"] + slack_extra_repo_mirror = ["https://slackware.uk/slackware/slackware64-15.0/", "extra/"] slack_extra_repo_packages: str = 'PACKAGES.TXT' slack_extra_repo_checksums: str = 'CHECKSUMS.md5' slack_extra_repo_changelog: str = 'ChangeLog.txt' @@ -71,8 +67,7 @@ class Repositories: slack_patches_repo: bool = False slack_patches_repo_name: str = 'slack_patches' slack_patches_repo_path: Path = Path(repositories_path, slack_patches_repo_name) - slack_patches_repo_local = [''] - slack_patches_repo_mirror = ['https://slackware.uk/slackware/slackware64-15.0/', 'patches/'] + slack_patches_repo_mirror = ["https://slackware.uk/slackware/slackware64-15.0/", "patches/"] slack_patches_repo_packages: str = 'PACKAGES.TXT' slack_patches_repo_checksums: str = 'CHECKSUMS.md5' slack_patches_repo_changelog: str = 'ChangeLog.txt' @@ -81,8 +76,7 @@ class Repositories: alien_repo: bool = False alien_repo_name: str = 'alien' alien_repo_path: Path = Path(repositories_path, alien_repo_name) - alien_repo_local = [''] - alien_repo_mirror = ['https://slackware.nl/people/alien/sbrepos/', '15.0/', 'x86_64/'] + alien_repo_mirror = ["https://slackware.nl/people/alien/sbrepos/", "15.0/", "x86_64/"] alien_repo_packages: str = 'PACKAGES.TXT' alien_repo_checksums: str = 'CHECKSUMS.md5' alien_repo_changelog: str = 'ChangeLog.txt' @@ -91,8 +85,7 @@ class Repositories: multilib_repo: bool = False multilib_repo_name: str = 'multilib' multilib_repo_path: Path = Path(repositories_path, multilib_repo_name) - multilib_repo_local = [''] - multilib_repo_mirror = ['https://slackware.nl/people/alien/multilib/', '15.0/'] + multilib_repo_mirror = ["https://slackware.nl/people/alien/multilib/", "15.0/"] multilib_repo_packages: str = 'PACKAGES.TXT' multilib_repo_checksums: str = 'CHECKSUMS.md5' multilib_repo_changelog: str = 'ChangeLog.txt' @@ -101,8 +94,7 @@ class Repositories: restricted_repo: bool = False restricted_repo_name: str = 'restricted' restricted_repo_path: Path = Path(repositories_path, restricted_repo_name) - restricted_repo_local = [''] - restricted_repo_mirror = ['https://slackware.nl/people/alien/restricted_sbrepos/', '15.0/', 'x86_64/'] + restricted_repo_mirror = ["https://slackware.nl/people/alien/restricted_sbrepos/", "15.0/", "x86_64/"] restricted_repo_packages: str = 'PACKAGES.TXT' restricted_repo_checksums: str = 'CHECKSUMS.md5' restricted_repo_changelog: str = 'ChangeLog.txt' @@ -111,7 +103,6 @@ class Repositories: gnome_repo: bool = False gnome_repo_name: str = 'gnome' gnome_repo_path: Path = Path(repositories_path, gnome_repo_name) - gnome_repo_local = [''] gnome_repo_mirror = ['https://reddoglinux.ddns.net/linux/gnome/43.x/x86_64/'] gnome_repo_packages: str = 'PACKAGES.TXT' gnome_repo_checksums: str = 'CHECKSUMS.md5' @@ -121,8 +112,7 @@ class Repositories: msb_repo: bool = False msb_repo_name: str = 'msb' msb_repo_path: Path = Path(repositories_path, msb_repo_name) - msb_repo_local = [''] - msb_repo_mirror = ['https://slackware.uk/msb/', '15.0/', '1.28/', 'x86_64/'] + msb_repo_mirror = ["https://slackware.uk/msb/", "15.0/", "1.28/", "x86_64/"] msb_repo_packages: str = 'PACKAGES.TXT' msb_repo_checksums: str = 'CHECKSUMS.md5' msb_repo_changelog: str = 'ChangeLog.txt' @@ -131,8 +121,7 @@ class Repositories: csb_repo: bool = False csb_repo_name: str = 'csb' csb_repo_path: Path = Path(repositories_path, csb_repo_name) - csb_repo_local = [''] - csb_repo_mirror = ['https://slackware.uk/csb/', '15.0/', 'x86_64/'] + csb_repo_mirror = ["https://slackware.uk/csb/", "15.0/", "x86_64/"] csb_repo_packages: str = 'PACKAGES.TXT' csb_repo_checksums: str = 'CHECKSUMS.md5' csb_repo_changelog: str = 'ChangeLog.txt' @@ -141,7 +130,6 @@ class Repositories: conraid_repo: bool = False conraid_repo_name: str = 'conraid' conraid_repo_path: Path = Path(repositories_path, conraid_repo_name) - conraid_repo_local = [''] conraid_repo_mirror = ['https://slackers.it/repository/slackware64-current/'] conraid_repo_packages: str = 'PACKAGES.TXT' conraid_repo_checksums: str = 'CHECKSUMS.md5' @@ -151,7 +139,6 @@ class Repositories: slackdce_repo: bool = False slackdce_repo_name: str = 'slackdce' slackdce_repo_path: Path = Path(repositories_path, slackdce_repo_name) - slackdce_repo_local = [''] slackdce_repo_mirror = ['https://slackware.uk/slackdce/15.0/x86_64/'] slackdce_repo_packages: str = 'PACKAGES.TXT' slackdce_repo_checksums: str = 'CHECKSUMS.md5' @@ -161,7 +148,6 @@ class Repositories: slackonly_repo: bool = False slackonly_repo_name: str = 'slackonly' slackonly_repo_path: Path = Path(repositories_path, slackonly_repo_name) - slackonly_repo_local = [''] slackonly_repo_mirror = ['https://packages.slackonly.com/pub/packages/15.0-x86_64/'] slackonly_repo_packages: str = 'PACKAGES.TXT' slackonly_repo_checksums: str = 'CHECKSUMS.md5' @@ -171,7 +157,6 @@ class Repositories: salix_repo: bool = False salix_repo_name: str = 'salix' salix_repo_path: Path = Path(repositories_path, salix_repo_name) - salix_repo_local = [''] salix_repo_mirror = ['https://repo.greeklug.gr/data/pub/linux/salix/x86_64/15.0/'] salix_repo_packages: str = 'PACKAGES.TXT' salix_repo_checksums: str = 'CHECKSUMS.md5' @@ -181,7 +166,6 @@ class Repositories: salix_extra_repo: bool = False salix_extra_repo_name: str = 'salix_extra' salix_extra_repo_path: Path = Path(repositories_path, salix_extra_repo_name) - salix_extra_repo_local = [''] salix_extra_repo_mirror = ['https://repo.greeklug.gr/data/pub/linux/salix/x86_64/extra-15.0/'] salix_extra_repo_packages: str = 'PACKAGES.TXT' salix_extra_repo_checksums: str = 'CHECKSUMS.md5' @@ -191,7 +175,6 @@ class Repositories: slackel_repo: bool = False slackel_repo_name: str = 'slackel' slackel_repo_path: Path = Path(repositories_path, slackel_repo_name) - slackel_repo_local = [''] slackel_repo_mirror = ['http://www.slackel.gr/repo/x86_64/current/'] slackel_repo_packages: str = 'PACKAGES.TXT' slackel_repo_checksums: str = 'CHECKSUMS.md5' @@ -201,7 +184,6 @@ class Repositories: slint_repo: bool = False slint_repo_name: str = 'slint' slint_repo_path: Path = Path(repositories_path, slint_repo_name) - slint_repo_local = [''] slint_repo_mirror = ['https://slackware.uk/slint/x86_64/slint-15.0/'] slint_repo_packages: str = 'PACKAGES.TXT' slint_repo_checksums: str = 'CHECKSUMS.md5' @@ -211,7 +193,6 @@ class Repositories: pprkut_repo: bool = False pprkut_repo_name: str = 'pprkut' pprkut_repo_path: Path = Path(repositories_path, pprkut_repo_name) - pprkut_repo_local = [''] pprkut_repo_mirror = ['https://repo.liwjatan.org/pprkut/15.0/x86_64/'] pprkut_repo_packages: str = 'PACKAGES.TXT' pprkut_repo_checksums: str = 'CHECKSUMS.md5' @@ -221,332 +202,66 @@ class Repositories: try: if repositories_toml_file.is_file(): with open(repositories_toml_file, 'rb') as repo: - repos_config = tomli.load(repo)['REPOSITORIES'] + repos_config = tomli.load(repo) - default_repository: str = repos_config['DEFAULT_REPOSITORY'] + default_repository: str = repos_config['DEFAULT']['REPO'] - sbo_repo: bool = repos_config['SBO_REPO'] - sbo_repo_name: str = repos_config['SBO_REPO_NAME'] - sbo_repo_path: Path = Path(repositories_path, sbo_repo_name) - sbo_repo_local = repos_config['SBO_REPO_LOCAL'] - sbo_repo_mirror = repos_config['SBO_REPO_MIRROR'] - sbo_repo_slackbuilds: str = repos_config['SBO_REPO_SLACKBUILDS'] - sbo_repo_changelog: str = repos_config['SBO_REPO_CHANGELOG'] - sbo_repo_tag: str = repos_config['SBO_REPO_TAG'] - sbo_repo_tar_suffix: str = repos_config['SBO_REPO_TAR_SUFFIX'] - try: - if sbo_repo_local[0].startswith('file'): - sbo_repo_path: Path = Path( - ''.join(sbo_repo_local).replace('file:', '') - ) - except IndexError: - sbo_repo_local = [''] + sbo_repo: bool = repos_config['SBO']['ENABLE'] + sbo_repo_mirror = repos_config['SBO']['MIRROR'] - ponce_repo: bool = repos_config['PONCE_REPO'] - ponce_repo_name: str = repos_config['PONCE_REPO_NAME'] - ponce_repo_path: Path = Path(repositories_path, ponce_repo_name) - ponce_repo_local = repos_config['PONCE_REPO_LOCAL'] - ponce_repo_mirror = repos_config['PONCE_REPO_MIRROR'] - ponce_repo_slackbuilds: str = repos_config['PONCE_REPO_SLACKBUILDS'] - ponce_repo_changelog: str = repos_config['PONCE_REPO_CHANGELOG'] - ponce_repo_tag: str = repos_config['PONCE_REPO_TAG'] - ponce_repo_tar_suffix: str = repos_config['PONCE_REPO_TAR_SUFFIX'] - try: - if ponce_repo_local[0].startswith('file'): - ponce_repo_path: Path = Path( - ''.join(ponce_repo_local).replace('file:', '') - ) - except IndexError: - ponce_repo_local = [''] + ponce_repo: bool = repos_config['PONCE']['ENABLE'] + ponce_repo_mirror = repos_config['PONCE']['MIRROR'] - slack_repo: bool = repos_config['SLACK_REPO'] - slack_repo_name: str = repos_config['SLACK_REPO_NAME'] - slack_repo_path: Path = Path(repositories_path, slack_repo_name) - slack_repo_local = repos_config['SLACK_REPO_LOCAL'] - slack_repo_mirror = repos_config['SLACK_REPO_MIRROR'] - slack_repo_packages: str = repos_config['SLACK_REPO_PACKAGES'] - slack_repo_checksums: str = repos_config['SLACK_REPO_CHECKSUMS'] - slack_repo_changelog: str = repos_config['SLACK_REPO_CHANGELOG'] - slack_repo_tag: str = repos_config['SLACK_REPO_TAG'] - try: - if slack_repo_local[0].startswith('file'): - slack_repo_path: Path = Path( - ''.join(slack_repo_local).replace('file:', '') - ) - except IndexError: - slack_repo_local = [''] + slack_repo: bool = repos_config['SLACK']['ENABLE'] + slack_repo_mirror = repos_config['SLACK']['MIRROR'] - slack_extra_repo: bool = repos_config['SLACK_EXTRA_REPO'] - slack_extra_repo_name: str = repos_config['SLACK_EXTRA_REPO_NAME'] - slack_extra_repo_path: Path = Path(repositories_path, slack_extra_repo_name) - slack_extra_repo_local = repos_config['SLACK_EXTRA_REPO_LOCAL'] - slack_extra_repo_mirror = repos_config['SLACK_EXTRA_REPO_MIRROR'] - slack_extra_repo_packages: str = repos_config['SLACK_EXTRA_REPO_PACKAGES'] - slack_extra_repo_checksums: str = repos_config['SLACK_EXTRA_REPO_CHECKSUMS'] - slack_extra_repo_changelog: str = repos_config['SLACK_EXTRA_REPO_CHANGELOG'] - slack_extra_repo_tag: str = repos_config['SLACK_EXTRA_REPO_TAG'] - try: - if slack_extra_repo_local[0].startswith('file'): - slack_extra_repo_path: Path = Path( - ''.join(slack_extra_repo_local).replace('file:', '') - ) - except IndexError: - slack_extra_repo_local = [''] + slack_extra_repo: bool = repos_config['SLACK_EXTRA']['ENABLE'] + slack_extra_repo_mirror = repos_config['SLACK_EXTRA']['MIRROR'] - slack_patches_repo: bool = repos_config['SLACK_PATCHES_REPO'] - slack_patches_repo_name: str = repos_config['SLACK_PATCHES_REPO_NAME'] - slack_patches_repo_path: Path = Path(repositories_path, slack_patches_repo_name) - slack_patches_repo_local = repos_config['SLACK_PATCHES_REPO_LOCAL'] - slack_patches_repo_mirror = repos_config['SLACK_PATCHES_REPO_MIRROR'] - slack_patches_repo_packages: str = repos_config['SLACK_PATCHES_REPO_PACKAGES'] - slack_patches_repo_checksums: str = repos_config['SLACK_PATCHES_REPO_CHECKSUMS'] - slack_patches_repo_changelog: str = repos_config['SLACK_PATCHES_REPO_CHANGELOG'] - slack_patches_repo_tag: str = repos_config['SLACK_PATCHES_REPO_TAG'] - try: - if slack_patches_repo_local[0].startswith('file'): - slack_patches_repo_path: Path = Path( - ''.join(slack_patches_repo_local).replace('file:', '') - ) - except IndexError: - slack_patches_repo_local = [''] + slack_patches_repo: bool = repos_config['SLACK_PATCHES']['ENABLE'] + slack_patches_repo_mirror = repos_config['SLACK_PATCHES']['MIRROR'] - alien_repo: bool = repos_config['ALIEN_REPO'] - alien_repo_name: str = repos_config['ALIEN_REPO_NAME'] - alien_repo_path: Path = Path(repositories_path, alien_repo_name) - alien_repo_local = repos_config['ALIEN_REPO_LOCAL'] - alien_repo_mirror = repos_config['ALIEN_REPO_MIRROR'] - alien_repo_packages: str = repos_config['ALIEN_REPO_PACKAGES'] - alien_repo_checksums: str = repos_config['ALIEN_REPO_CHECKSUMS'] - alien_repo_changelog: str = repos_config['ALIEN_REPO_CHANGELOG'] - alien_repo_tag: str = repos_config['ALIEN_REPO_TAG'] - try: - if alien_repo_local[0].startswith('file'): - alien_repo_path: Path = Path( - ''.join(alien_repo_local).replace('file:', '') - ) - except IndexError: - alien_repo_local = [''] + alien_repo: bool = repos_config['ALIEN']['ENABLE'] + alien_repo_mirror = repos_config['ALIEN']['MIRROR'] - multilib_repo: bool = repos_config['MULTILIB_REPO'] - multilib_repo_name: str = repos_config['MULTILIB_REPO_NAME'] - multilib_repo_path: Path = Path(repositories_path, multilib_repo_name) - multilib_repo_local = repos_config['MULTILIB_REPO_LOCAL'] - multilib_repo_mirror = repos_config['MULTILIB_REPO_MIRROR'] - multilib_repo_packages: str = repos_config['MULTILIB_REPO_PACKAGES'] - multilib_repo_checksums: str = repos_config['MULTILIB_REPO_CHECKSUMS'] - multilib_repo_changelog: str = repos_config['MULTILIB_REPO_CHANGELOG'] - multilib_repo_tag: str = repos_config['MULTILIB_REPO_TAG'] - try: - if multilib_repo_local[0].startswith('file'): - multilib_repo_path: Path = Path( - ''.join(multilib_repo_local).replace('file:', '') - ) - except IndexError: - multilib_repo_local = [''] + multilib_repo: bool = repos_config['MULTILIB']['ENABLE'] + multilib_repo_mirror = repos_config['MULTILIB']['MIRROR'] - restricted_repo: bool = repos_config['RESTRICTED_REPO'] - restricted_repo_name: str = repos_config['RESTRICTED_REPO_NAME'] - restricted_repo_path: Path = Path(repositories_path, restricted_repo_name) - restricted_repo_local = repos_config['RESTRICTED_REPO_LOCAL'] - restricted_repo_mirror = repos_config['RESTRICTED_REPO_MIRROR'] - restricted_repo_packages: str = repos_config['RESTRICTED_REPO_PACKAGES'] - restricted_repo_checksums: str = repos_config['RESTRICTED_REPO_CHECKSUMS'] - restricted_repo_changelog: str = repos_config['RESTRICTED_REPO_CHANGELOG'] - restricted_repo_tag: str = repos_config['RESTRICTED_REPO_TAG'] - try: - if restricted_repo_local[0].startswith('file'): - restricted_repo_path: Path = Path( - ''.join(restricted_repo_local).replace('file:', '') - ) - except IndexError: - restricted_repo_local = [''] + restricted_repo: bool = repos_config['RESTRICTED']['ENABLE'] + restricted_repo_mirror = repos_config['RESTRICTED']['MIRROR'] - gnome_repo: bool = repos_config['GNOME_REPO'] - gnome_repo_name: str = repos_config['GNOME_REPO_NAME'] - gnome_repo_path: Path = Path(repositories_path, gnome_repo_name) - gnome_repo_local = repos_config['GNOME_REPO_LOCAL'] - gnome_repo_mirror = repos_config['GNOME_REPO_MIRROR'] - gnome_repo_packages: str = repos_config['GNOME_REPO_PACKAGES'] - gnome_repo_checksums: str = repos_config['GNOME_REPO_CHECKSUMS'] - gnome_repo_changelog: str = repos_config['GNOME_REPO_CHANGELOG'] - gnome_repo_tag: str = repos_config['GNOME_REPO_TAG'] - try: - if gnome_repo_local[0].startswith('file'): - gnome_repo_path: Path = Path( - ''.join(gnome_repo_local).replace('file:', '') - ) - except IndexError: - gnome_repo_local = [''] + gnome_repo: bool = repos_config['GNOME']['ENABLE'] + gnome_repo_mirror = repos_config['GNOME']['MIRROR'] - msb_repo: bool = repos_config['MSB_REPO'] - msb_repo_name: str = repos_config['MSB_REPO_NAME'] - msb_repo_path: Path = Path(repositories_path, msb_repo_name) - msb_repo_local = repos_config['MSB_REPO_LOCAL'] - msb_repo_mirror = repos_config['MSB_REPO_MIRROR'] - msb_repo_packages: str = repos_config['MSB_REPO_PACKAGES'] - msb_repo_checksums: str = repos_config['MSB_REPO_CHECKSUMS'] - msb_repo_changelog: str = repos_config['MSB_REPO_CHANGELOG'] - msb_repo_tag: str = repos_config['MSB_REPO_TAG'] - try: - if msb_repo_local[0].startswith('file'): - msb_repo_path: Path = Path( - ''.join(msb_repo_local).replace('file:', '') - ) - except IndexError: - msb_repo_local = [''] + msb_repo: bool = repos_config['MSB']['ENABLE'] + msb_repo_mirror = repos_config['MSB']['MIRROR'] - csb_repo: bool = repos_config['CSB_REPO'] - csb_repo_name: str = repos_config['CSB_REPO_NAME'] - csb_repo_path: Path = Path(repositories_path, csb_repo_name) - csb_repo_local = repos_config['CSB_REPO_LOCAL'] - csb_repo_mirror = repos_config['CSB_REPO_MIRROR'] - csb_repo_packages: str = repos_config['CSB_REPO_PACKAGES'] - csb_repo_checksums: str = repos_config['CSB_REPO_CHECKSUMS'] - csb_repo_changelog: str = repos_config['CSB_REPO_CHANGELOG'] - csb_repo_tag: str = repos_config['CSB_REPO_TAG'] - try: - if csb_repo_local[0].startswith('file'): - csb_repo_path: Path = Path( - ''.join(csb_repo_local).replace('file:', '') - ) - except IndexError: - csb_repo_local = [''] + csb_repo: bool = repos_config['CSB']['ENABLE'] + csb_repo_mirror = repos_config['CSB']['MIRROR'] - conraid_repo: bool = repos_config['CONRAID_REPO'] - conraid_repo_name: str = repos_config['CONRAID_REPO_NAME'] - conraid_repo_path: Path = Path(repositories_path, conraid_repo_name) - conraid_repo_local = repos_config['CONRAID_REPO_LOCAL'] - conraid_repo_mirror = repos_config['CONRAID_REPO_MIRROR'] - conraid_repo_packages: str = repos_config['CONRAID_REPO_PACKAGES'] - conraid_repo_checksums: str = repos_config['CONRAID_REPO_CHECKSUMS'] - conraid_repo_changelog: str = repos_config['CONRAID_REPO_CHANGELOG'] - conraid_repo_tag: str = repos_config['CONRAID_REPO_TAG'] - try: - if conraid_repo_local[0].startswith('file'): - conraid_repo_path: Path = Path( - ''.join(conraid_repo_local).replace('file:', '') - ) - except IndexError: - conraid_repo_local = [''] + conraid_repo: bool = repos_config['CONRAID']['ENABLE'] + conraid_repo_mirror = repos_config['CONRAID']['MIRROR'] - slackdce_repo: bool = repos_config['SLACKDCE_REPO'] - slackdce_repo_name: str = repos_config['SLACKDCE_REPO_NAME'] - slackdce_repo_path: Path = Path(repositories_path, slackdce_repo_name) - slackdce_repo_local = repos_config['SLACKDCE_REPO_LOCAL'] - slackdce_repo_mirror = repos_config['SLACKDCE_REPO_MIRROR'] - slackdce_repo_packages: str = repos_config['SLACKDCE_REPO_PACKAGES'] - slackdce_repo_checksums: str = repos_config['SLACKDCE_REPO_CHECKSUMS'] - slackdce_repo_changelog: str = repos_config['SLACKDCE_REPO_CHANGELOG'] - slackdce_repo_tag: str = repos_config['SLACKDCE_REPO_TAG'] - try: - if slackdce_repo_local[0].startswith('file'): - slackdce_repo_path: Path = Path( - ''.join(slackdce_repo_local).replace('file:', '') - ) - except IndexError: - slackdce_repo_local = [''] + slackdce_repo: bool = repos_config['SLACKDCE']['ENABLE'] + slackdce_repo_mirror = repos_config['SLACKDCE']['MIRROR'] - slackonly_repo: bool = repos_config['SLACKONLY_REPO'] - slackonly_repo_name: str = repos_config['SLACKONLY_REPO_NAME'] - slackonly_repo_path: Path = Path(repositories_path, slackonly_repo_name) - slackonly_repo_local = repos_config['SLACKONLY_REPO_LOCAL'] - slackonly_repo_mirror = repos_config['SLACKONLY_REPO_MIRROR'] - slackonly_repo_packages: str = repos_config['SLACKONLY_REPO_PACKAGES'] - slackonly_repo_checksums: str = repos_config['SLACKONLY_REPO_CHECKSUMS'] - slackonly_repo_changelog: str = repos_config['SLACKONLY_REPO_CHANGELOG'] - slackonly_repo_tag: str = repos_config['SLACKONLY_REPO_TAG'] - try: - if slackonly_repo_local[0].startswith('file'): - slackonly_repo_path: Path = Path( - ''.join(slackonly_repo_local).replace('file:', '') - ) - except IndexError: - slackonly_repo_local = [''] + slackonly_repo: bool = repos_config['SLACKONLY']['ENABLE'] + slackonly_repo_mirror = repos_config['SLACKONLY']['MIRROR'] - salix_repo: bool = repos_config['SALIX_REPO'] - salix_repo_name: str = repos_config['SALIX_REPO_NAME'] - salix_repo_path: Path = Path(repositories_path, salix_repo_name) - salix_repo_local = repos_config['SALIX_REPO_LOCAL'] - salix_repo_mirror = repos_config['SALIX_REPO_MIRROR'] - salix_repo_packages: str = repos_config['SALIX_REPO_PACKAGES'] - salix_repo_checksums: str = repos_config['SALIX_REPO_CHECKSUMS'] - salix_repo_changelog: str = repos_config['SALIX_REPO_CHANGELOG'] - salix_repo_tag: str = repos_config['SALIX_REPO_TAG'] - try: - if salix_repo_local[0].startswith('file'): - salix_repo_path: Path = Path( - ''.join(salix_repo_local).replace('file:', '') - ) - except IndexError: - salix_repo_local = [''] + salix_repo: bool = repos_config['SALIX']['ENABLE'] + salix_repo_mirror = repos_config['SALIX']['MIRROR'] - salix_extra_repo: bool = repos_config['SALIX_EXTRA_REPO'] - salix_extra_repo_name: str = repos_config['SALIX_EXTRA_REPO_NAME'] - salix_extra_repo_path: Path = Path(repositories_path, salix_extra_repo_name) - salix_extra_repo_local = repos_config['SALIX_EXTRA_REPO_LOCAL'] - salix_extra_repo_mirror = repos_config['SALIX_EXTRA_REPO_MIRROR'] - salix_extra_repo_packages: str = repos_config['SALIX_EXTRA_REPO_PACKAGES'] - salix_extra_repo_checksums: str = repos_config['SALIX_EXTRA_REPO_CHECKSUMS'] - salix_extra_repo_changelog: str = repos_config['SALIX_EXTRA_REPO_CHANGELOG'] - salix_extra_repo_tag: str = repos_config['SALIX_EXTRA_REPO_TAG'] - try: - if salix_extra_repo_local[0].startswith('file'): - salix_extra_repo_path: Path = Path( - ''.join(salix_extra_repo_local).replace('file:', '') - ) - except IndexError: - salix_extra_repo_local = [''] + salix_extra_repo: bool = repos_config['SALIX_EXTRA']['ENABLE'] + salix_extra_repo_mirror = repos_config['SALIX_EXTRA']['MIRROR'] - slackel_repo: bool = repos_config['SLACKEL_REPO'] - slackel_repo_name: str = repos_config['SLACKEL_REPO_NAME'] - slackel_repo_path: Path = Path(repositories_path, slackel_repo_name) - slackel_repo_local = repos_config['SLACKEL_REPO_LOCAL'] - slackel_repo_mirror = repos_config['SLACKEL_REPO_MIRROR'] - slackel_repo_packages: str = repos_config['SLACKEL_REPO_PACKAGES'] - slackel_repo_checksums: str = repos_config['SLACKEL_REPO_CHECKSUMS'] - slackel_repo_changelog: str = repos_config['SLACKEL_REPO_CHANGELOG'] - slackel_repo_tag: str = repos_config['SLACKEL_REPO_TAG'] - try: - if slackel_repo_local[0].startswith('file'): - slackel_repo_path: Path = Path( - ''.join(slackel_repo_local).replace('file:', '') - ) - except IndexError: - slackel_repo_local = [''] + slackel_repo: bool = repos_config['SLACKEL']['ENABLE'] + slackel_repo_mirror = repos_config['SLACKEL']['MIRROR'] - slint_repo: bool = repos_config['SLINT_REPO'] - slint_repo_name: str = repos_config['SLINT_REPO_NAME'] - slint_repo_path: Path = Path(repositories_path, slint_repo_name) - slint_repo_local = repos_config['SLINT_REPO_LOCAL'] - slint_repo_mirror = repos_config['SLINT_REPO_MIRROR'] - slint_repo_packages: str = repos_config['SLINT_REPO_PACKAGES'] - slint_repo_checksums: str = repos_config['SLINT_REPO_CHECKSUMS'] - slint_repo_changelog: str = repos_config['SLINT_REPO_CHANGELOG'] - slint_repo_tag: str = repos_config['SLINT_REPO_TAG'] - try: - if slint_repo_local[0].startswith('file'): - slint_repo_path: Path = Path( - ''.join(slint_repo_local).replace('file:', '') - ) - except IndexError: - slint_repo_local = [''] + slint_repo: bool = repos_config['SLINT']['ENABLE'] + slint_repo_mirror = repos_config['SLINT']['MIRROR'] - pprkut_repo: bool = repos_config['PPRKUT_REPO'] - pprkut_repo_name: str = repos_config['PPRKUT_REPO_NAME'] - pprkut_repo_path: Path = Path(repositories_path, pprkut_repo_name) - pprkut_repo_local = repos_config['PPRKUT_REPO_LOCAL'] - pprkut_repo_mirror = repos_config['PPRKUT_REPO_MIRROR'] - pprkut_repo_packages: str = repos_config['PPRKUT_REPO_PACKAGES'] - pprkut_repo_checksums: str = repos_config['PPRKUT_REPO_CHECKSUMS'] - pprkut_repo_changelog: str = repos_config['PPRKUT_REPO_CHANGELOG'] - pprkut_repo_tag: str = repos_config['PPRKUT_REPO_TAG'] - try: - if pprkut_repo_local[0].startswith('file'): - pprkut_repo_path: Path = Path( - ''.join(pprkut_repo_local).replace('file:', '') - ) - except IndexError: - pprkut_repo_local = [''] + pprkut_repo: bool = repos_config['PPRKUT']['ENABLE'] + pprkut_repo_mirror = repos_config['PPRKUT']['MIRROR'] except (tomli.TOMLDecodeError, KeyError) as error: toml_errors.raise_toml_error_message(error, repositories_toml_file) diff --git a/slpkg/update_repositories.py b/slpkg/update_repositories.py index 32bcceeb..51286489 100644 --- a/slpkg/update_repositories.py +++ b/slpkg/update_repositories.py @@ -98,20 +98,13 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.slack_repo_path, self.repos.slack_repo_changelog) self.utils.remove_file_if_exists(self.repos.slack_repo_path, self.repos.slack_repo_checksums) - if self.repos.slack_repo_local[0].startswith('file'): - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}{self.repos.slack_repo_mirror[0]} ' - f'{self.repos.slack_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - changelog: str = f'{self.repos.slack_repo_mirror[0]}{self.repos.slack_repo_changelog}' - packages: str = f'{self.repos.slack_repo_mirror[0]}{self.repos.slack_repo_packages}' - checksums: str = f'{self.repos.slack_repo_mirror[0]}{self.repos.slack_repo_checksums}' + changelog: str = f'{self.repos.slack_repo_mirror[0]}{self.repos.slack_repo_changelog}' + packages: str = f'{self.repos.slack_repo_mirror[0]}{self.repos.slack_repo_packages}' + checksums: str = f'{self.repos.slack_repo_mirror[0]}{self.repos.slack_repo_checksums}' - urls[self.repos.slack_repo_name] = ((changelog, packages, checksums), self.repos.slack_repo_path) + urls[self.repos.slack_repo_name] = ((changelog, packages, checksums), self.repos.slack_repo_path) - self.download.download(urls) + self.download.download(urls) self.data.install_slack_data() @@ -124,19 +117,10 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.slack_extra_repo_path, self.repos.slack_extra_repo_checksums) changelog: str = f'{self.repos.slack_extra_repo_mirror[0]}{self.repos.slack_extra_repo_changelog}' - - if self.repos.slack_extra_repo_local[0].startswith('file'): - urls[self.repos.slack_extra_repo_name] = ((changelog,), self.repos.slack_extra_repo_path) - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}' - f'{"".join(self.repos.slack_extra_repo_mirror)} {self.repos.slack_extra_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - packages: str = f'{"".join(self.repos.slack_extra_repo_mirror)}{self.repos.slack_extra_repo_packages}' - checksums: str = f'{"".join(self.repos.slack_extra_repo_mirror)}{self.repos.slack_extra_repo_checksums}' - urls[self.repos.slack_extra_repo_name] = ((changelog, packages, checksums), - self.repos.slack_extra_repo_path) + packages: str = f'{"".join(self.repos.slack_extra_repo_mirror)}{self.repos.slack_extra_repo_packages}' + checksums: str = f'{"".join(self.repos.slack_extra_repo_mirror)}{self.repos.slack_extra_repo_checksums}' + + urls[self.repos.slack_extra_repo_name] = ((changelog, packages, checksums), self.repos.slack_extra_repo_path) self.download.download(urls) @@ -146,30 +130,15 @@ class UpdateRepositories(Configs): urls: dict = {} self.utils.create_directory(self.repos.slack_patches_repo_path) - self.utils.remove_file_if_exists(self.repos.slack_patches_repo_path, - self.repos.slack_patches_repo_changelog) - self.utils.remove_file_if_exists(self.repos.slack_patches_repo_path, - self.repos.slack_patches_repo_packages) - self.utils.remove_file_if_exists(self.repos.slack_patches_repo_path, - self.repos.slack_patches_repo_checksums) + self.utils.remove_file_if_exists(self.repos.slack_patches_repo_path, self.repos.slack_patches_repo_changelog) + self.utils.remove_file_if_exists(self.repos.slack_patches_repo_path, self.repos.slack_patches_repo_packages) + self.utils.remove_file_if_exists(self.repos.slack_patches_repo_path, self.repos.slack_patches_repo_checksums) changelog: str = f'{self.repos.slack_patches_repo_mirror[0]}{self.repos.slack_patches_repo_changelog}' + packages: str = f'{"".join(self.repos.slack_patches_repo_mirror)}{self.repos.slack_patches_repo_packages}' + checksums: str = f'{"".join(self.repos.slack_patches_repo_mirror)}{self.repos.slack_patches_repo_checksums}' - if self.repos.slack_patches_repo_local[0].startswith('file'): - urls[self.repos.slack_patches_repo_name] = ((changelog,), self.repos.slack_patches_repo_path) - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}' - f'{"".join(self.repos.slack_patches_repo_mirror)} {self.repos.slack_patches_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - packages: str = (f'{"".join(self.repos.slack_patches_repo_mirror)}' - f'{self.repos.slack_patches_repo_packages}') - checksums: str = (f'{"".join(self.repos.slack_patches_repo_mirror)}' - f'{self.repos.slack_patches_repo_checksums}') - - urls[self.repos.slack_patches_repo_name] = ((changelog, packages, checksums), - self.repos.slack_patches_repo_path) + urls[self.repos.slack_patches_repo_name] = ((changelog, packages, checksums), self.repos.slack_patches_repo_path) self.download.download(urls) @@ -184,20 +153,10 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.alien_repo_path, self.repos.alien_repo_checksums) changelog: str = f'{self.repos.alien_repo_mirror[0]}{self.repos.alien_repo_changelog}' + packages: str = f'{"".join(self.repos.alien_repo_mirror)}{self.repos.alien_repo_packages}' + checksums: str = f'{"".join(self.repos.alien_repo_mirror)}{self.repos.alien_repo_checksums}' - if self.repos.alien_repo_local[0].startswith('file'): - urls[self.repos.alien_repo_name] = ((changelog,), self.repos.alien_repo_path) - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}{"".join(self.repos.alien_repo_mirror)} ' - f'{self.repos.alien_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - packages: str = f'{"".join(self.repos.alien_repo_mirror)}{self.repos.alien_repo_packages}' - checksums: str = f'{"".join(self.repos.alien_repo_mirror)}{self.repos.alien_repo_checksums}' - - urls[self.repos.alien_repo_name] = ((changelog, packages, checksums), - self.repos.alien_repo_path) + urls[self.repos.alien_repo_name] = ((changelog, packages, checksums), self.repos.alien_repo_path) self.download.download(urls) @@ -212,20 +171,10 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.multilib_repo_path, self.repos.multilib_repo_checksums) changelog: str = f'{self.repos.multilib_repo_mirror[0]}{self.repos.multilib_repo_changelog}' + packages: str = f'{"".join(self.repos.multilib_repo_mirror)}{self.repos.multilib_repo_packages}' + checksums: str = f'{"".join(self.repos.multilib_repo_mirror)}{self.repos.multilib_repo_checksums}' - if self.repos.multilib_repo_local[0].startswith('file'): - urls[self.repos.multilib_repo_name] = ((changelog,), self.repos.multilib_repo_path) - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}{"".join(self.repos.multilib_repo_mirror)} ' - f'{self.repos.multilib_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - packages: str = f'{"".join(self.repos.multilib_repo_mirror)}{self.repos.multilib_repo_packages}' - checksums: str = f'{"".join(self.repos.multilib_repo_mirror)}{self.repos.multilib_repo_checksums}' - - urls[self.repos.multilib_repo_name] = ((changelog, packages, checksums), - self.repos.multilib_repo_path) + urls[self.repos.multilib_repo_name] = ((changelog, packages, checksums), self.repos.multilib_repo_path) self.download.download(urls) @@ -240,20 +189,10 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.restricted_repo_path, self.repos.restricted_repo_checksums) changelog: str = f'{self.repos.restricted_repo_mirror[0]}{self.repos.restricted_repo_changelog}' + packages: str = f'{"".join(self.repos.restricted_repo_mirror)}{self.repos.restricted_repo_packages}' + checksums: str = f'{"".join(self.repos.restricted_repo_mirror)}{self.repos.restricted_repo_checksums}' - if self.repos.restricted_repo_local[0].startswith('file'): - urls[self.repos.restricted_repo_name] = ((changelog,), self.repos.restricted_repo_path) - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}' - f'{"".join(self.repos.restricted_repo_mirror)} {self.repos.restricted_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - packages: str = f'{"".join(self.repos.restricted_repo_mirror)}{self.repos.restricted_repo_packages}' - checksums: str = f'{"".join(self.repos.restricted_repo_mirror)}{self.repos.restricted_repo_checksums}' - - urls[self.repos.restricted_repo_name] = ((changelog, packages, checksums), - self.repos.restricted_repo_path) + urls[self.repos.restricted_repo_name] = ((changelog, packages, checksums), self.repos.restricted_repo_path) self.download.download(urls) @@ -267,20 +206,13 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.gnome_repo_path, self.repos.gnome_repo_packages) self.utils.remove_file_if_exists(self.repos.gnome_repo_path, self.repos.gnome_repo_checksums) - if self.repos.gnome_repo_local[0].startswith('file'): - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}{self.repos.gnome_repo_mirror[0]} ' - f'{self.repos.gnome_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - changelog: str = f'{self.repos.gnome_repo_mirror[0]}{self.repos.gnome_repo_changelog}' - packages: str = f'{self.repos.gnome_repo_mirror[0]}{self.repos.gnome_repo_packages}' - checksums: str = f'{self.repos.gnome_repo_mirror[0]}{self.repos.gnome_repo_checksums}' + changelog: str = f'{self.repos.gnome_repo_mirror[0]}{self.repos.gnome_repo_changelog}' + packages: str = f'{self.repos.gnome_repo_mirror[0]}{self.repos.gnome_repo_packages}' + checksums: str = f'{self.repos.gnome_repo_mirror[0]}{self.repos.gnome_repo_checksums}' - urls[self.repos.gnome_repo_name] = ((changelog, packages, checksums), self.repos.gnome_repo_path) + urls[self.repos.gnome_repo_name] = ((changelog, packages, checksums), self.repos.gnome_repo_path) - self.download.download(urls) + self.download.download(urls) self.data.install_gnome_data() @@ -293,19 +225,10 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.msb_repo_path, self.repos.msb_repo_checksums) changelog: str = f'{self.repos.msb_repo_mirror[0]}{self.repos.msb_repo_changelog}' + packages: str = f'{"".join(self.repos.msb_repo_mirror)}{self.repos.msb_repo_packages}' + checksums: str = f'{"".join(self.repos.msb_repo_mirror)}{self.repos.msb_repo_checksums}' - if self.repos.msb_repo_local[0].startswith('file'): - urls[self.repos.msb_repo_name] = ((changelog,), self.repos.msb_repo_path) - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}{"".join(self.repos.msb_repo_mirror)} ' - f'{self.repos.msb_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - packages: str = f'{"".join(self.repos.msb_repo_mirror)}{self.repos.msb_repo_packages}' - checksums: str = f'{"".join(self.repos.msb_repo_mirror)}{self.repos.msb_repo_checksums}' - - urls[self.repos.msb_repo_name] = ((changelog, packages, checksums), self.repos.msb_repo_path) + urls[self.repos.msb_repo_name] = ((changelog, packages, checksums), self.repos.msb_repo_path) self.download.download(urls) @@ -319,20 +242,13 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.csb_repo_path, self.repos.csb_repo_changelog) self.utils.remove_file_if_exists(self.repos.csb_repo_path, self.repos.csb_repo_checksums) - if self.repos.csb_repo_local[0].startswith('file'): - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}{"".join(self.repos.csb_repo_mirror)} ' - f'{self.repos.csb_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - changelog: str = f'{"".join(self.repos.csb_repo_mirror)}{self.repos.csb_repo_changelog}' - packages: str = f'{"".join(self.repos.csb_repo_mirror)}{self.repos.csb_repo_packages}' - checksums: str = f'{"".join(self.repos.csb_repo_mirror)}{self.repos.csb_repo_checksums}' + changelog: str = f'{"".join(self.repos.csb_repo_mirror)}{self.repos.csb_repo_changelog}' + packages: str = f'{"".join(self.repos.csb_repo_mirror)}{self.repos.csb_repo_packages}' + checksums: str = f'{"".join(self.repos.csb_repo_mirror)}{self.repos.csb_repo_checksums}' - urls[self.repos.csb_repo_name] = ((changelog, packages, checksums), self.repos.csb_repo_path) + urls[self.repos.csb_repo_name] = ((changelog, packages, checksums), self.repos.csb_repo_path) - self.download.download(urls) + self.download.download(urls) self.data.install_csb_data() @@ -344,20 +260,13 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.conraid_repo_path, self.repos.conraid_repo_packages) self.utils.remove_file_if_exists(self.repos.conraid_repo_path, self.repos.conraid_repo_checksums) - if self.repos.conraid_repo_local[0].startswith('file'): - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}{self.repos.conraid_repo_mirror[0]} ' - f'{self.repos.conraid_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - changelog: str = f'{self.repos.conraid_repo_mirror[0]}{self.repos.conraid_repo_changelog}' - packages: str = f'{self.repos.conraid_repo_mirror[0]}{self.repos.conraid_repo_packages}' - checksums: str = f'{self.repos.conraid_repo_mirror[0]}{self.repos.conraid_repo_checksums}' + changelog: str = f'{self.repos.conraid_repo_mirror[0]}{self.repos.conraid_repo_changelog}' + packages: str = f'{self.repos.conraid_repo_mirror[0]}{self.repos.conraid_repo_packages}' + checksums: str = f'{self.repos.conraid_repo_mirror[0]}{self.repos.conraid_repo_checksums}' - urls[self.repos.conraid_repo_name] = ((changelog, packages, checksums), self.repos.conraid_repo_path) + urls[self.repos.conraid_repo_name] = ((changelog, packages, checksums), self.repos.conraid_repo_path) - self.download.download(urls) + self.download.download(urls) self.data.install_conraid_data() @@ -369,20 +278,13 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.slackdce_repo_path, self.repos.slackdce_repo_packages) self.utils.remove_file_if_exists(self.repos.slackdce_repo_path, self.repos.slackdce_repo_checksums) - if self.repos.slackdce_repo_local[0].startswith('file'): - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}{self.repos.slackdce_repo_mirror[0]} ' - f'{self.repos.slackdce_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - changelog: str = f'{self.repos.slackdce_repo_mirror[0]}{self.repos.slackdce_repo_changelog}' - packages: str = f'{self.repos.slackdce_repo_mirror[0]}{self.repos.slackdce_repo_packages}' - checksums: str = f'{self.repos.slackdce_repo_mirror[0]}{self.repos.slackdce_repo_checksums}' + changelog: str = f'{self.repos.slackdce_repo_mirror[0]}{self.repos.slackdce_repo_changelog}' + packages: str = f'{self.repos.slackdce_repo_mirror[0]}{self.repos.slackdce_repo_packages}' + checksums: str = f'{self.repos.slackdce_repo_mirror[0]}{self.repos.slackdce_repo_checksums}' - urls[self.repos.slackdce_repo_name] = ((changelog, packages, checksums), self.repos.slackdce_repo_path) + urls[self.repos.slackdce_repo_name] = ((changelog, packages, checksums), self.repos.slackdce_repo_path) - self.download.download(urls) + self.download.download(urls) self.data.install_slackdce_data() @@ -394,21 +296,13 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.slackonly_repo_path, self.repos.slackonly_repo_packages) self.utils.remove_file_if_exists(self.repos.slackonly_repo_path, self.repos.slackonly_repo_checksums) - if self.repos.slackonly_repo_local[0].startswith('file'): - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}{self.repos.slackonly_repo_mirror[0]} ' - f'{self.repos.slackonly_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - changelog: str = f'{self.repos.slackonly_repo_mirror[0]}{self.repos.slackonly_repo_changelog}' - packages: str = f'{self.repos.slackonly_repo_mirror[0]}{self.repos.slackonly_repo_packages}' - checksums: str = f'{self.repos.slackonly_repo_mirror[0]}{self.repos.slackonly_repo_checksums}' + changelog: str = f'{self.repos.slackonly_repo_mirror[0]}{self.repos.slackonly_repo_changelog}' + packages: str = f'{self.repos.slackonly_repo_mirror[0]}{self.repos.slackonly_repo_packages}' + checksums: str = f'{self.repos.slackonly_repo_mirror[0]}{self.repos.slackonly_repo_checksums}' - urls[self.repos.slackonly_repo_name] = ((changelog, packages, checksums), - self.repos.slackonly_repo_path) + urls[self.repos.slackonly_repo_name] = ((changelog, packages, checksums), self.repos.slackonly_repo_path) - self.download.download(urls) + self.download.download(urls) self.data.install_slackonly_data() @@ -420,20 +314,13 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.salix_repo_path, self.repos.salix_repo_packages) self.utils.remove_file_if_exists(self.repos.salix_repo_path, self.repos.salix_repo_checksums) - if self.repos.salix_repo_local[0].startswith('file'): - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}{self.repos.salix_repo_mirror[0]} ' - f'{self.repos.salix_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - changelog: str = f'{self.repos.salix_repo_mirror[0]}{self.repos.salix_repo_changelog}' - packages: str = f'{self.repos.salix_repo_mirror[0]}{self.repos.salix_repo_packages}' - checksums: str = f'{self.repos.salix_repo_mirror[0]}{self.repos.salix_repo_checksums}' + changelog: str = f'{self.repos.salix_repo_mirror[0]}{self.repos.salix_repo_changelog}' + packages: str = f'{self.repos.salix_repo_mirror[0]}{self.repos.salix_repo_packages}' + checksums: str = f'{self.repos.salix_repo_mirror[0]}{self.repos.salix_repo_checksums}' - urls[self.repos.salix_repo_name] = ((changelog, packages, checksums), self.repos.salix_repo_path) + urls[self.repos.salix_repo_name] = ((changelog, packages, checksums), self.repos.salix_repo_path) - self.download.download(urls) + self.download.download(urls) self.data.install_salix_data() @@ -445,19 +332,11 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.salix_extra_repo_path, self.repos.salix_extra_repo_packages) self.utils.remove_file_if_exists(self.repos.salix_extra_repo_path, self.repos.salix_extra_repo_checksums) - if self.repos.salix_extra_repo_local[0].startswith('file'): - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}' - f'{self.repos.salix_extra_repo_mirror[0]} {self.repos.salix_extra_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - changelog: str = f'{self.repos.salix_extra_repo_mirror[0]}{self.repos.salix_extra_repo_changelog}' - packages: str = f'{self.repos.salix_extra_repo_mirror[0]}{self.repos.salix_extra_repo_packages}' - checksums: str = f'{self.repos.salix_extra_repo_mirror[0]}{self.repos.salix_extra_repo_checksums}' + changelog: str = f'{self.repos.salix_extra_repo_mirror[0]}{self.repos.salix_extra_repo_changelog}' + packages: str = f'{self.repos.salix_extra_repo_mirror[0]}{self.repos.salix_extra_repo_packages}' + checksums: str = f'{self.repos.salix_extra_repo_mirror[0]}{self.repos.salix_extra_repo_checksums}' - urls[self.repos.salix_extra_repo_name] = ((changelog, packages, checksums), - self.repos.salix_extra_repo_path) + urls[self.repos.salix_extra_repo_name] = ((changelog, packages, checksums), self.repos.salix_extra_repo_path) self.download.download(urls) @@ -471,20 +350,13 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.slackel_repo_path, self.repos.slackel_repo_packages) self.utils.remove_file_if_exists(self.repos.slackel_repo_path, self.repos.slackel_repo_checksums) - if self.repos.slackel_repo_local[0].startswith('file'): - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}{self.repos.slackel_repo_mirror[0]} ' - f'{self.repos.slackel_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - changelog: str = f'{self.repos.slackel_repo_mirror[0]}{self.repos.slackel_repo_changelog}' - packages: str = f'{self.repos.slackel_repo_mirror[0]}{self.repos.slackel_repo_packages}' - checksums: str = f'{self.repos.slackel_repo_mirror[0]}{self.repos.slackel_repo_checksums}' + changelog: str = f'{self.repos.slackel_repo_mirror[0]}{self.repos.slackel_repo_changelog}' + packages: str = f'{self.repos.slackel_repo_mirror[0]}{self.repos.slackel_repo_packages}' + checksums: str = f'{self.repos.slackel_repo_mirror[0]}{self.repos.slackel_repo_checksums}' - urls[self.repos.slackel_repo_name] = ((changelog, packages, checksums), self.repos.slackel_repo_path) + urls[self.repos.slackel_repo_name] = ((changelog, packages, checksums), self.repos.slackel_repo_path) - self.download.download(urls) + self.download.download(urls) self.data.install_slackel_data() @@ -496,20 +368,13 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.slint_repo_path, self.repos.slint_repo_packages) self.utils.remove_file_if_exists(self.repos.slint_repo_path, self.repos.slint_repo_checksums) - if self.repos.slint_repo_local[0].startswith('file'): - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}{self.repos.slint_repo_mirror[0]} ' - f'{self.repos.slint_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - changelog: str = f'{self.repos.slint_repo_mirror[0]}{self.repos.slint_repo_changelog}' - packages: str = f'{self.repos.slint_repo_mirror[0]}{self.repos.slint_repo_packages}' - checksums: str = f'{self.repos.slint_repo_mirror[0]}{self.repos.slint_repo_checksums}' + changelog: str = f'{self.repos.slint_repo_mirror[0]}{self.repos.slint_repo_changelog}' + packages: str = f'{self.repos.slint_repo_mirror[0]}{self.repos.slint_repo_packages}' + checksums: str = f'{self.repos.slint_repo_mirror[0]}{self.repos.slint_repo_checksums}' - urls[self.repos.slint_repo_name] = ((changelog, packages, checksums), self.repos.slint_repo_path) + urls[self.repos.slint_repo_name] = ((changelog, packages, checksums), self.repos.slint_repo_path) - self.download.download(urls) + self.download.download(urls) self.data.install_slint_data() @@ -521,20 +386,13 @@ class UpdateRepositories(Configs): self.utils.remove_file_if_exists(self.repos.pprkut_repo_path, self.repos.pprkut_repo_packages) self.utils.remove_file_if_exists(self.repos.pprkut_repo_path, self.repos.pprkut_repo_checksums) - if self.repos.pprkut_repo_local[0].startswith('file'): - lftp_command: str = ( - f'lftp {self.lftp_mirror_options}{self.lftp_extra_options}{self.repos.pprkut_repo_mirror[0]} ' - f'{self.repos.pprkut_repo_path}' - ) - self.multi_process.process(lftp_command) - else: - changelog: str = f'{self.repos.pprkut_repo_mirror[0]}{self.repos.pprkut_repo_changelog}' - packages: str = f'{self.repos.pprkut_repo_mirror[0]}{self.repos.pprkut_repo_packages}' - checksums: str = f'{self.repos.pprkut_repo_mirror[0]}{self.repos.pprkut_repo_checksums}' + changelog: str = f'{self.repos.pprkut_repo_mirror[0]}{self.repos.pprkut_repo_changelog}' + packages: str = f'{self.repos.pprkut_repo_mirror[0]}{self.repos.pprkut_repo_packages}' + checksums: str = f'{self.repos.pprkut_repo_mirror[0]}{self.repos.pprkut_repo_checksums}' - urls[self.repos.pprkut_repo_name] = ((changelog, packages, checksums), self.repos.pprkut_repo_path) + urls[self.repos.pprkut_repo_name] = ((changelog, packages, checksums), self.repos.pprkut_repo_path) - self.download.download(urls) + self.download.download(urls) self.data.install_pprkut_data()