OOP: Dotfile Creation

util/Input.py

@@ -1,5 +1,6 @@
 #!/bin/python3
 from util import Print
+import re
 
 
 def yes_no(question):
@@ -30,7 +31,7 @@ def multiple(question, options):
         options {list} -- list of possible options (strings)
 
     Returns:
-        str -- one of options
+        str -- one of options (without content in brackets in the end)
     '''
     def get_input_range(max):
         while True:
@@ -55,7 +56,14 @@ def multiple(question, options):
 
     answer = get_input_range(len(options))
     if answer != 0:
-        return options[answer - 1]
+        result = options[answer - 1]
+        result = re.sub(r'\(.*\)$', '',
+                        result)  # remove bracket content in the end
+        if result[
+                -1] == ' ':  # remove remaining space (might happen after removing brackets)
+            result = result[:-1]
+        return result
+
     else:
         return False
 

util/Path.py

@@ -4,8 +4,6 @@ import pathlib
 
 from util import Command, Print
 
-WORKING_FLODER = os.path.dirname(os.path.realpath(__file__))
-
 
 def check_dir_exists(paths):
     '''Check for directory/ies existence
@@ -111,7 +109,7 @@ def ensure_dirs(path, file_end=False, absolute_path=True):
     if check_file_exists(path) or file_end:
         path = get_parent(path)
 
-    if not check_dir_exists(path):
+    if not check_dir_exists(path)[0]:
         Command.execute(f'mkdir -p {path}')
         Print.comment(f'Creating directory {path}')
 
@@ -156,4 +154,7 @@ def join(*paths):
     Returns:
         str -- Joined paths
     '''
-    return os.path.join(paths)
+    return os.path.join(*paths)
+
+
+WORKING_FLODER = get_parent(os.path.dirname(os.path.realpath(__file__)))