Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2024-12-27 09:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated for summary message

Browse source 
Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
This commit is contained in:
Dimitris Zlatanidis 2024-05-11 22:17:46 +03:00
parent 6423b17ec1
commit 6421b4b772
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
slpkg/views/views.py
View file

@ -42,6 +42,7 @@ class View(Configs): # pylint: disable=[R0902]
self.download_only = None self.download_only = None
self.summary_message: str = '' self.summary_message: str = ''
self.mode = None
self.option_for_reinstall: bool = self.utils.is_option( self.option_for_reinstall: bool = self.utils.is_option(
('-r', '--reinstall'), flags) ('-r', '--reinstall'), flags)
@ -56,13 +57,13 @@ class View(Configs): # pylint: disable=[R0902]
slackbuilds (list): Slackbuilds for build. slackbuilds (list): Slackbuilds for build.
dependencies (list): Dependencies for build. dependencies (list): Dependencies for build.
""" """
mode: str = 'build' self.mode: str = 'build'
self.ascii.draw_package_title('The following packages will be build:', self.ascii.draw_package_title('The following packages will be build:',
'slpkg build packages') 'slpkg build packages')
for slackbuild in slackbuilds: for slackbuild in slackbuilds:
self.draw_build_package(slackbuild) self.draw_build_package(slackbuild)
self.summary(slackbuild, mode) self.summary(slackbuild)
if dependencies: if dependencies:
self.ascii.draw_middle_line() self.ascii.draw_middle_line()
@ -70,7 +71,7 @@ class View(Configs): # pylint: disable=[R0902]
for dependency in dependencies: for dependency in dependencies:
self.draw_build_package(dependency) self.draw_build_package(dependency)
self.summary(dependency, mode) self.summary(dependency)
self.ascii.draw_bottom_line() self.ascii.draw_bottom_line()
self.set_summary_for_build(slackbuilds + dependencies) self.set_summary_for_build(slackbuilds + dependencies)
@ -84,6 +85,7 @@ class View(Configs): # pylint: disable=[R0902]
dependencies (list): Dependencies for install. dependencies (list): Dependencies for install.
mode (str): Type of mode. mode (str): Type of mode.
""" """
self.mode: str = mode
title: str = 'slpkg install packages' title: str = 'slpkg install packages'
if mode == 'upgrade': if mode == 'upgrade':
title: str = 'slpkg upgrade packages' title: str = 'slpkg upgrade packages'
@ -91,7 +93,7 @@ class View(Configs): # pylint: disable=[R0902]
for package in packages: for package in packages:
self.draw_install_upgrade_package(package) self.draw_install_upgrade_package(package)
self.summary(package, mode) self.summary(package)
if dependencies: if dependencies:
self.ascii.draw_middle_line() self.ascii.draw_middle_line()
@ -99,17 +101,12 @@ class View(Configs): # pylint: disable=[R0902]
for dependency in dependencies: for dependency in dependencies:
self.draw_install_upgrade_package(dependency) self.draw_install_upgrade_package(dependency)
self.summary(dependency, mode) self.summary(dependency)
self.ascii.draw_bottom_line() self.ascii.draw_bottom_line()
self.set_summary_for_install_and_upgrade(self.sum_install, self.sum_upgrade, self.set_summary_for_install_and_upgrade(self.sum_install, self.sum_upgrade,
self.sum_size_comp, self.sum_size_uncomp) self.sum_size_comp, self.sum_size_uncomp)
print(self.summary_message) print(self.summary_message)
if mode == 'upgrade':
print(f'{self.grey}Note: Packages with custom versions may not be recognized.{self.endc}')
if self.upgrade_log_file.is_file():
print(f'{self.red}{self.ascii.failed} Some packages failed, '
f'check the /var/log/slpkg/upgrade.log file.{self.endc}')
def download_packages(self, packages: list, directory: Path) -> None: def download_packages(self, packages: list, directory: Path) -> None:
""" View packages for download method. """ View packages for download method.
@ -118,14 +115,14 @@ class View(Configs): # pylint: disable=[R0902]
packages (list): Packages name for download. packages (list): Packages name for download.
directory (Path): Path to download. directory (Path): Path to download.
""" """
mode: str = 'download' self.mode: str = 'download'
self.download_only: Path = directory self.download_only: Path = directory
self.ascii.draw_package_title('The following packages will be downloaded:', self.ascii.draw_package_title('The following packages will be downloaded:',
'slpkg download packages') 'slpkg download packages')
for package in packages: for package in packages:
self.draw_download_package(package) self.draw_download_package(package)
self.summary(package, mode) self.summary(package)
self.ascii.draw_bottom_line() self.ascii.draw_bottom_line()
self.set_summary_for_download(packages, self.sum_size_comp) self.set_summary_for_download(packages, self.sum_size_comp)
@ -138,12 +135,12 @@ class View(Configs): # pylint: disable=[R0902]
packages (list): List of packages. packages (list): List of packages.
dependencies (list): List of dependencies. dependencies (list): List of dependencies.
""" """
mode: str = 'remove' self.mode: str = 'remove'
self.ascii.draw_package_title('The following packages will be removed:', self.ascii.draw_package_title('The following packages will be removed:',
'slpkg remove packages') 'slpkg remove packages')
for package in packages: for package in packages:
self.draw_remove_package(package) self.draw_remove_package(package)
self.summary(package, mode) self.summary(package)
if dependencies: if dependencies:
self.ascii.draw_middle_line() self.ascii.draw_middle_line()
@ -151,7 +148,7 @@ class View(Configs): # pylint: disable=[R0902]
for dependency in dependencies: for dependency in dependencies:
self.draw_remove_package(dependency) self.draw_remove_package(dependency)
self.summary(dependency, mode) self.summary(dependency)
self.ascii.draw_bottom_line() self.ascii.draw_bottom_line()
self.set_summary_for_remove(self.sum_remove, self.sum_size_remove) self.set_summary_for_remove(self.sum_remove, self.sum_size_remove)
@ -229,7 +226,7 @@ class View(Configs): # pylint: disable=[R0902]
self.ascii.draw_package_line(package, version, size, self.red, repository) self.ascii.draw_package_line(package, version, size, self.red, repository)
def summary(self, package: str, method: str) -> None: def summary(self, package: str) -> None:
""" Counts packages per method. """ Counts packages per method.
Args: Args:
@ -242,11 +239,11 @@ class View(Configs): # pylint: disable=[R0902]
self.sum_size_comp += float(self.data[package]['size_comp']) * 1024 self.sum_size_comp += float(self.data[package]['size_comp']) * 1024
self.sum_size_uncomp += float(self.data[package]['size_uncomp']) * 1024 self.sum_size_uncomp += float(self.data[package]['size_uncomp']) * 1024
if installed and method == 'remove': if installed and self.mode == 'remove':
self.sum_size_remove += self.utils.count_file_size(package) self.sum_size_remove += self.utils.count_file_size(package)
upgradeable: bool = False upgradeable: bool = False
if method != 'remove': if self.mode != 'remove':
upgradeable: bool = self.upgrade.is_package_upgradeable(installed) upgradeable: bool = self.upgrade.is_package_upgradeable(installed)
if not installed: if not installed:
@ -255,7 +252,7 @@ class View(Configs): # pylint: disable=[R0902]
self.sum_upgrade += 1 self.sum_upgrade += 1
elif upgradeable: elif upgradeable:
self.sum_upgrade += 1 self.sum_upgrade += 1
elif installed and method == 'remove': elif installed and self.mode == 'remove':
self.sum_remove += 1 self.sum_remove += 1
def set_summary_for_build(self, packages: list) -> None: def set_summary_for_build(self, packages: list) -> None:
@ -277,6 +274,8 @@ class View(Configs): # pylint: disable=[R0902]
size_comp (int): Counts of compressed sizes. size_comp (int): Counts of compressed sizes.
size_uncomp (int): Counts of uncompressed sizes. size_uncomp (int): Counts of uncompressed sizes.
""" """
custom_message: str = ''
upgrade_message: str = ''
split_message: str = '\n' split_message: str = '\n'
if self.columns > 80: if self.columns > 80:
split_message: str = '' split_message: str = ''
@ -284,7 +283,12 @@ class View(Configs): # pylint: disable=[R0902]
f'will be upgraded, while a total ') f'will be upgraded, while a total ')
total_sizes: str = (f'{self.utils.convert_file_sizes(size_comp)} will be downloaded and ' total_sizes: str = (f'{self.utils.convert_file_sizes(size_comp)} will be downloaded and '
f'{self.utils.convert_file_sizes(size_uncomp)} will be installed.{self.endc}') f'{self.utils.convert_file_sizes(size_uncomp)} will be installed.{self.endc}')
self.summary_message: str = f'{total_packages}{split_message}{total_sizes}' if self.mode == 'upgrade':
custom_message: str = f'\n{self.grey}Note: Packages with custom versions may not be recognized.{self.endc}'
if self.upgrade_log_file.is_file():
upgrade_message: str = (f'\n{self.red}{self.ascii.failed} Some versions failed, '
f'check the /var/log/slpkg/upgrade.log file.{self.endc}')
self.summary_message: str = f'{total_packages}{split_message}{total_sizes}{custom_message}{upgrade_message}'
def set_summary_for_remove(self, remove: int, size_rmv: int) -> None: def set_summary_for_remove(self, remove: int, size_rmv: int) -> None:
""" Sets summary for removes. """ Sets summary for removes.