From 27d42fca6d907da044f324a06256b09952f6cfe0 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Tue, 19 Mar 2024 20:59:40 +0200 Subject: [PATCH] Fix for view --- slpkg/install_data.py | 42 ++++++++++++++++++------------------ slpkg/update_repositories.py | 18 ---------------- 2 files changed, 21 insertions(+), 39 deletions(-) diff --git a/slpkg/install_data.py b/slpkg/install_data.py index dd793f93..5ed4cc05 100644 --- a/slpkg/install_data.py +++ b/slpkg/install_data.py @@ -38,7 +38,7 @@ class InstallData(Configs): self.repos.last_update_json.write_text(json.dumps(last_update_json, indent=4)) def view_done_message(self) -> None: - print(f'{self.yellow}{self.ascii.done}{self.endc}') + print(f'{self.yellow}{self.ascii.done}{self.endc}\n') def install_sbo_data(self) -> None: """ @@ -46,7 +46,7 @@ class InstallData(Configs): Returns: None. """ - print(f"Updating the database for '{self.cyan}{self.repos.sbo_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.sbo_repo_name}{self.endc}'... ", end='', flush=True) data: dict = {} cache: list = [] @@ -122,7 +122,7 @@ class InstallData(Configs): Returns: None. """ - print(f"Updating the database for '{self.cyan}{self.repos.ponce_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.ponce_repo_name}{self.endc}'... ", end='', flush=True) data: dict = {} cache: list = [] @@ -199,7 +199,7 @@ class InstallData(Configs): def install_slack_data(self) -> None: """ Install the data for slackware repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.slack_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.slack_repo_name}{self.endc}'... ", end='', flush=True) data: dict = {} @@ -294,7 +294,7 @@ class InstallData(Configs): def install_slack_extra_data(self) -> None: """ Install the data for slackware extra repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.slack_extra_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.slack_extra_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -389,7 +389,7 @@ class InstallData(Configs): def install_slack_patches_data(self) -> None: """ Install the data for slackware patches repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.slack_patches_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.slack_patches_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -484,7 +484,7 @@ class InstallData(Configs): def install_alien_data(self) -> None: """ Install the data for alien repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.alien_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.alien_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -584,7 +584,7 @@ class InstallData(Configs): def install_multilib_data(self) -> None: """ Install the data for multilib repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.multilib_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.multilib_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -679,7 +679,7 @@ class InstallData(Configs): def install_restricted_data(self) -> None: """ Install the data for multilib repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.restricted_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.restricted_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -774,7 +774,7 @@ class InstallData(Configs): def install_gnome_data(self) -> None: """ Install the data for gnome repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.gnome_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.gnome_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -870,7 +870,7 @@ class InstallData(Configs): def install_msb_data(self) -> None: """ Install the data for msb repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.msb_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.msb_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -965,7 +965,7 @@ class InstallData(Configs): def install_csb_data(self) -> None: """ Install the data for csb repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.csb_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.csb_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -1060,7 +1060,7 @@ class InstallData(Configs): def install_conraid_data(self) -> None: """ Install the data for conraid repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.conraid_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.conraid_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -1156,7 +1156,7 @@ class InstallData(Configs): def install_slackdce_data(self) -> None: """ Install the data for slackdce repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.slackdce_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.slackdce_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -1256,7 +1256,7 @@ class InstallData(Configs): def install_slackonly_data(self) -> None: """ Install the data for slackonly repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.slackonly_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.slackonly_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -1356,7 +1356,7 @@ class InstallData(Configs): def install_salixos_data(self) -> None: """ Install the data for salixos repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.salixos_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.salixos_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -1464,7 +1464,7 @@ class InstallData(Configs): def install_salixos_extra_data(self) -> None: """ Install the data for salixos_extra repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.salixos_extra_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.salixos_extra_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -1572,7 +1572,7 @@ class InstallData(Configs): def install_salixos_patches_data(self) -> None: """ Install the data for salixos_patches repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.salixos_patches_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.salixos_patches_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -1683,7 +1683,7 @@ class InstallData(Configs): def install_slackel_data(self) -> None: """ Install the data for slackel repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.slackel_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.slackel_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -1791,7 +1791,7 @@ class InstallData(Configs): def install_slint_data(self) -> None: """ Install the data for slint repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.slint_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.slint_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} @@ -1899,7 +1899,7 @@ class InstallData(Configs): def install_pprkut_data(self) -> None: """ Install the data for pprkut repository. """ - print(f"Updating the database for '{self.cyan}{self.repos.pprkut_repo_name}{self.endc}'... ", + print(f"\nUpdating the database for '{self.cyan}{self.repos.pprkut_repo_name}{self.endc}'... ", end='', flush=True) checksums_dict: dict = {} diff --git a/slpkg/update_repositories.py b/slpkg/update_repositories.py index d8066433..757d0e1a 100644 --- a/slpkg/update_repositories.py +++ b/slpkg/update_repositories.py @@ -107,7 +107,6 @@ class UpdateRepositories(Configs): urls[self.repos.slack_repo_name] = ((changelog, packages, checksums), self.repos.slack_repo_path) self.download.download(urls) - print() self.data.install_slack_data() @@ -135,7 +134,6 @@ class UpdateRepositories(Configs): self.repos.slack_extra_repo_path) self.download.download(urls) - print() self.data.install_slack_extra_data() @@ -169,7 +167,6 @@ class UpdateRepositories(Configs): self.repos.slack_patches_repo_path) self.download.download(urls) - print() self.data.install_slack_patches_data() @@ -198,7 +195,6 @@ class UpdateRepositories(Configs): self.repos.alien_repo_path) self.download.download(urls) - print() self.data.install_alien_data() @@ -227,7 +223,6 @@ class UpdateRepositories(Configs): self.repos.multilib_repo_path) self.download.download(urls) - print() self.data.install_multilib_data() @@ -256,7 +251,6 @@ class UpdateRepositories(Configs): self.repos.restricted_repo_path) self.download.download(urls) - print() self.data.install_restricted_data() @@ -282,7 +276,6 @@ class UpdateRepositories(Configs): urls[self.repos.gnome_repo_name] = ((changelog, packages, checksums), self.repos.gnome_repo_path) self.download.download(urls) - print() self.data.install_gnome_data() @@ -310,7 +303,6 @@ class UpdateRepositories(Configs): urls[self.repos.msb_repo_name] = ((changelog, packages, checksums), self.repos.msb_repo_path) self.download.download(urls) - print() self.data.install_msb_data() @@ -336,7 +328,6 @@ class UpdateRepositories(Configs): urls[self.repos.csb_repo_name] = ((changelog, packages, checksums), self.repos.csb_repo_path) self.download.download(urls) - print() self.data.install_csb_data() @@ -362,7 +353,6 @@ class UpdateRepositories(Configs): urls[self.repos.conraid_repo_name] = ((changelog, packages, checksums), self.repos.conraid_repo_path) self.download.download(urls) - print() self.data.install_conraid_data() @@ -388,7 +378,6 @@ class UpdateRepositories(Configs): urls[self.repos.slackdce_repo_name] = ((changelog, packages, checksums), self.repos.slackdce_repo_path) self.download.download(urls) - print() self.data.install_slackdce_data() @@ -415,7 +404,6 @@ class UpdateRepositories(Configs): self.repos.slackonly_repo_path) self.download.download(urls) - print() self.data.install_slackonly_data() @@ -441,7 +429,6 @@ class UpdateRepositories(Configs): urls[self.repos.salixos_repo_name] = ((changelog, packages, checksums), self.repos.salixos_repo_path) self.download.download(urls) - print() self.data.install_salixos_data() @@ -475,7 +462,6 @@ class UpdateRepositories(Configs): self.repos.salixos_extra_repo_path) self.download.download(urls) - print() self.data.install_salixos_extra_data() @@ -509,7 +495,6 @@ class UpdateRepositories(Configs): self.repos.salixos_patches_repo_path) self.download.download(urls) - print() self.data.install_salixos_patches_data() @@ -535,7 +520,6 @@ class UpdateRepositories(Configs): urls[self.repos.slackel_repo_name] = ((changelog, packages, checksums), self.repos.slackel_repo_path) self.download.download(urls) - print() self.data.install_slackel_data() @@ -561,7 +545,6 @@ class UpdateRepositories(Configs): urls[self.repos.slint_repo_name] = ((changelog, packages, checksums), self.repos.slint_repo_path) self.download.download(urls) - print() self.data.install_slint_data() @@ -587,7 +570,6 @@ class UpdateRepositories(Configs): urls[self.repos.pprkut_repo_name] = ((changelog, packages, checksums), self.repos.pprkut_repo_path) self.download.download(urls) - print() self.data.install_pprkut_data()