From 721ac3ec755069d61970ceab12c7c7936640767f Mon Sep 17 00:00:00 2001 From: koumakpet Date: Sat, 14 Mar 2020 11:51:21 +0100 Subject: [PATCH] improved intendation on Input.multiple --- lib.py | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/lib.py b/lib.py index 734f21a..b6135b6 100644 --- a/lib.py +++ b/lib.py @@ -102,7 +102,7 @@ class Print: Arguments: options {str} -- options to print ''' - print(f'{Color.GREEN} # {options}{Color.RESET}') + print(f'{Color.GREEN} # {options}{Color.RESET}') def action(action): '''Print syntax for actions @@ -169,7 +169,7 @@ class Input: ''' def get_input_range(max): while True: - inp = input(' ->') + inp = input(' ->') try: inp = int(inp) for n in range(0, max + 1): @@ -177,9 +177,9 @@ class Input: return inp break else: - Print.err(f'Invalid input, range: 1-{max}') + Print.err(f'Invalid input, range: 0-{max}') except ValueError: - Print.err(f'Invalid input (must be number: 1-{max})') + Print.err(f'Invalid input (must be number: 0-{max})') continue Print.question(question) @@ -240,7 +240,7 @@ class Install: raise TypeError( 'check_not_installed() only takes string or list parameters') if package_name == ['base-devel']: - # Check dependenceis for base-devel (group packages are not detected directly) + # Check dependencies for base-devel (group packages are not detected directly) return Install.check_not_installed( 'guile libmpc autoconf automake binutils bison fakeroot file findutils flex gawk gcc gettext grep groff gzip libtool m4 make pacman patch pkgconf sed sudo texinfo which') for package in package_name: @@ -250,6 +250,24 @@ class Install: else: return True + def check_dir_exists(paths): + '''Check for directory/ies existence + + Arguments: + paths {str} -- single path or multiple paths separated by spaces (absolute paths) + + Returns: + bool -- One of dirs exists/Single dir exists + ''' + paths = paths.split(' ') + for dir_path in paths: + dir_path = os.path.expanduser(dir_path) + if os.path.isdir(dir_path): + return True + break + else: + return False + def git_aur(repository, install_text='default', force=False): '''Install package directly from AUR using only git and makepkg @@ -269,7 +287,7 @@ class Install: f'Unable to install AUR repository: {repository}, git is not installed') return False - # Base-devel group includes (requered for makepkg) + # Base-devel group includes (required for makepkg) if Install.check_not_installed('base-devel'): Print.warning( f'Unable to install AUR repository: {repository}, base-devel is not installed')