Updated for flags

This commit is contained in:
Dimitris Zlatanidis 2023-01-12 20:27:12 +02:00
parent 4f173fc305
commit 792da416bb
4 changed files with 23 additions and 13 deletions

View file

@ -13,6 +13,7 @@ class Dependees:
def __init__(self, packages: list, flags: list):
self.packages = packages
self.flags = flags
self.flag_full_reverse = '--full-reverse'
self.configs = Configs
self.session = Session
self.ascii = Ascii()
@ -48,7 +49,7 @@ class Dependees:
else:
print(f'{sp}{self.cyan}{dep[0]}{self.endc}')
if '--full-reverse' in self.flags:
if self.flag_full_reverse in self.flags:
if i == len(dependees):
print(" " * 4 + f' {self.llc}{self.hl} {self.violet}{dep[1]}{self.endc}')
else:

View file

@ -33,6 +33,7 @@ class RemovePackages:
self.dependencies = []
self.utils = Utilities()
self.progress = ProgressBar()
self.flag_resolve_off = '--resolve-off'
self.output = 0
self.remove_pkg = None
self.stderr = None
@ -50,7 +51,7 @@ class RemovePackages:
start = time.time()
self.remove_packages()
if self.dependencies and '--resolve-off' not in self.flags:
if self.dependencies and self.flag_resolve_off not in self.flags:
self.delete_deps_logs()
self.delete_main_logs()

View file

@ -48,6 +48,10 @@ class Slackbuilds:
self.dependencies = []
self.sbos = {}
self.progress = ProgressBar()
self.flag_reinstall = '--reinstall'
self.flag_skip_installed = '--skip-installed'
self.flag_resolve_off = '--resolve-off'
self.flag_jobs = '--jobs'
self.process_message = None
self.output = 0
self.stderr = None
@ -57,7 +61,7 @@ class Slackbuilds:
""" Starting build or install the slackbuilds. """
self.creating_dictionary()
if '--resolve-off' not in self.flags:
if self.flag_resolve_off not in self.flags:
self.creating_dependencies_for_build()
self.creating_main_for_build()
@ -81,7 +85,7 @@ class Slackbuilds:
for dep in deps:
# Checks if the package was installed and skipped.
if ('--skip-installed' in self.flags and
if (self.flag_skip_installed in self.flags and
self.utils.is_installed(dep)):
continue
@ -158,7 +162,7 @@ class Slackbuilds:
if (self.mode == 'install' and LooseVersion(repo_ver) > LooseVersion(inst_ver) or
self.mode == 'upgrade' and package and LooseVersion(repo_ver) > LooseVersion(inst_ver) or
package and '--reinstall' in self.flags and self.mode == 'install' or self.mode == 'build'):
package and self.flag_reinstall in self.flags and self.mode == 'install' or self.mode == 'build'):
file = f'{sbo}{self.configs.sbo_tar_suffix}'
@ -185,7 +189,7 @@ class Slackbuilds:
pkg = self.creating_package_for_install(sbo)
self.install_package(pkg)
if '--resolve-off' not in self.flags:
if self.flag_resolve_off not in self.flags:
self.logging_installed_dependencies(sbo)
else:
version = self.utils.split_installed_pkg(package)[1]
@ -229,7 +233,7 @@ class Slackbuilds:
pkg = self.utils.split_installed_pkg(package)[0]
execute = self.configs.installpkg
if ('--reinstall' in self.flags and
if (self.flag_reinstall in self.flags and
self.utils.is_installed(pkg)):
execute = self.configs.reinstall
@ -266,7 +270,7 @@ class Slackbuilds:
for file in os.listdir(folder):
os.chown(f'{folder}{file}', 0, 0)
if '--jobs' in self.flags:
if self.flag_jobs in self.flags:
self.set_makeflags()
message = f'{self.red}Build{self.endc}'

View file

@ -21,6 +21,9 @@ class ViewMessage:
def __init__(self, flags: list):
self.flags = flags
self.flag_resolve_off = '--resolve-off'
self.flag_reinstall = '--reinstall'
self.flag_yes = '--yes'
self.session = Session
self.utils = Utilities()
self.black = Blacklist()
@ -157,7 +160,7 @@ class ViewMessage:
if requires:
dependencies += requires[0].split()
if dependencies and '--resolve-off' not in self.flags:
if dependencies and self.flag_resolve_off not in self.flags:
dependencies = self.choose_dependencies_for_remove(dependencies)
self.draw_title_box('The following packages will be removed:', 'Remove Packages')
@ -165,7 +168,7 @@ class ViewMessage:
for pkg in slackbuilds:
self._view_removed(pkg)
if dependencies and '--resolve-off' not in self.flags:
if dependencies and self.flag_resolve_off not in self.flags:
self.draw_middle_line()
self.draw_dependency_line()
@ -226,9 +229,10 @@ class ViewMessage:
if not installed:
install += 1
elif installed and '--reinstall' in self.flags:
elif installed and self.flag_reinstall in self.flags:
upgrade += 1
elif installed and LooseVersion(repo_ver) > LooseVersion(inst_ver) and '--reinstall' not in self.flags:
elif (installed and LooseVersion(repo_ver) > LooseVersion(inst_ver) and
self.flag_reinstall not in self.flags):
upgrade += 1
elif installed and option == 'remove':
remove += 1
@ -262,7 +266,7 @@ class ViewMessage:
def question(self):
""" Manage to proceed. """
if '--yes' not in self.flags:
if self.flag_yes not in self.flags:
answer = input('\nDo you want to continue? [y/N] ')
if answer not in ['Y', 'y']:
raise SystemExit()