From a15eb3e5788567a501906f8abd431f78a0456992 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Wed, 17 May 2023 13:51:32 +0300 Subject: [PATCH] Updated for skipped --- slpkg/sbos/slackbuild.py | 2 +- slpkg/views/asciibox.py | 2 ++ slpkg/views/views.py | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/slpkg/sbos/slackbuild.py b/slpkg/sbos/slackbuild.py index 750c0d82..a30e875b 100644 --- a/slpkg/sbos/slackbuild.py +++ b/slpkg/sbos/slackbuild.py @@ -206,7 +206,7 @@ class Slackbuilds(Configs): else: installed_package: str = self.utils.is_package_installed(sbo) installed_version: str = self.utils.split_package(installed_package)['version'] - self.view_message.view_skipping_packages(sbo, installed_version) + self.view_message.view_skipping_packages(installed_package) def patch_slackbuild_tag(self, sbo: str) -> None: sbo_script: Path = Path(self.build_path, sbo, f'{sbo}.SlackBuild') diff --git a/slpkg/views/asciibox.py b/slpkg/views/asciibox.py index 49b4172c..8801134b 100644 --- a/slpkg/views/asciibox.py +++ b/slpkg/views/asciibox.py @@ -26,6 +26,7 @@ class AsciiBox(Configs): self.bullet: str = '-' self.done: str = 'Done' self.failed: str = 'Failed' + self.skipped: str = 'Skipped' self.vertical_line: str = '|' self.horizontal_line: str = '=' @@ -43,6 +44,7 @@ class AsciiBox(Configs): self.bullet: str = '•' self.done: str = '✔️' self.failed: str = 'X' + self.skipped: str = '↪' self.vertical_line: str = '│' self.horizontal_line: str = '─' self.horizontal_vertical: str = '┼' diff --git a/slpkg/views/views.py b/slpkg/views/views.py index c5ee0f46..f70f5932 100644 --- a/slpkg/views/views.py +++ b/slpkg/views/views.py @@ -231,8 +231,9 @@ class ViewMessage(Configs): version: str = self.utils.split_package(installed_package)['version'] return f'{package}-{version}' - def view_skipping_packages(self, package: str, version: str) -> None: - print(f'{self.yellow}Skipping{self.endc}: {package}-{version} {self.red}(already installed){self.endc}') + def view_skipping_packages(self, filename: str) -> None: + failed: str = f'{self.red}{self.ascii.skipped}{self.endc}' + print(f"\r{'':>2}{self.bred}{self.ascii.bullet}{self.endc} {filename} {failed}{' ' * 17}") def question(self) -> None: if not self.option_for_yes and self.ask_question: