From 4a16fa5fe51f1cd6cf99d645b41f0f24c61f29aa Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Wed, 4 Jan 2023 20:18:47 +0200 Subject: [PATCH] Updated for update repository --- slpkg/check_updates.py | 2 -- slpkg/main.py | 2 +- slpkg/update_repository.py | 47 ++++++++++++++++++++++++++++++++------ 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/slpkg/check_updates.py b/slpkg/check_updates.py index e4e5f1a4..3baec66c 100644 --- a/slpkg/check_updates.py +++ b/slpkg/check_updates.py @@ -24,7 +24,6 @@ class CheckUpdates: def check(self) -> bool: """ Checks the ChangeLogs and returns True or False. """ - print(end='\rChecking for news in the Changelog.txt file... ') local_date = 0 local_chg_txt = Path(self.configs.sbo_repo_path, @@ -63,7 +62,6 @@ class CheckUpdates: # Terminate process 2 if process 1 finished if not p1.is_alive(): - # print(f'{self.endc}{self.yellow} Done{self.endc}', end='') p2.terminate() # Wait until process 2 finish diff --git a/slpkg/main.py b/slpkg/main.py index 7a8a4b22..2c82f227 100644 --- a/slpkg/main.py +++ b/slpkg/main.py @@ -158,7 +158,7 @@ class Argparse: if len(self.args) == 1: update = UpdateRepository(self.flags) - update.sbo() + update.repository() raise SystemExit() self.usage.help(1) diff --git a/slpkg/update_repository.py b/slpkg/update_repository.py index e83dc337..2b677407 100644 --- a/slpkg/update_repository.py +++ b/slpkg/update_repository.py @@ -2,12 +2,14 @@ # -*- coding: utf-8 -*- from pathlib import Path +from multiprocessing import Process -from slpkg.downloader import Downloader from slpkg.configs import Configs +from slpkg.downloader import Downloader from slpkg.create_data import CreateData from slpkg.models.models import SBoTable from slpkg.views.views import ViewMessage +from slpkg.progress_bar import ProgressBar from slpkg.check_updates import CheckUpdates from slpkg.models.models import session as Session @@ -18,17 +20,15 @@ class UpdateRepository: def __init__(self, flags: list): self.flags = flags self.configs = Configs + self.colors = self.configs.colour + self.color = self.colors() + self.endc = self.color['endc'] self.session = Session + self.progress = ProgressBar() def sbo(self): """ Updated the sbo repository. """ view = ViewMessage(self.flags) - check_updates = CheckUpdates() - - if not check_updates.check(): - print('\n\nNo changes in ChangeLog.txt between your last update and now.') - else: - print('\n\nThere are new updates available!') view.question() @@ -49,6 +49,39 @@ class UpdateRepository: data = CreateData() data.insert_sbo_table() + def check(self): + check_updates = CheckUpdates() + if not check_updates.check(): + print(f'\n\n{self.endc}No changes in ChangeLog.txt between your last update and now.') + else: + print(f'\n\n{self.endc}There are new updates available!') + + def repository(self): + """ Starting multiprocessing download process. """ + message = f'Checking for news in the Changelog.txt file...' + + # Starting multiprocessing + p1 = Process(target=self.check) + p2 = Process(target=self.progress.bar, args=(message, '')) + + p1.start() + p2.start() + + # Wait until process 1 finish + p1.join() + + # Terminate process 2 if process 1 finished + if not p1.is_alive(): + p2.terminate() + + # Wait until process 2 finish + p2.join() + + # Restore the terminal cursor + print('\x1b[?25h', end='') + + self.sbo() + @staticmethod def delete_file(folder: str, txt_file: str): """ Delete the file. """