libjam 0.0.9__py3-none-any.whl → 0.0.10__py3-none-any.whl

libjam/drawer.py

@@ -10,14 +10,6 @@ PLATFORM = platform.system()
 
 # Internal functions
 joinpath = os.path.join
-def realpath(path: str or list):
-  if type(path) == str:
-    return os.path.normpath(path)
-  elif type(path) == list:
-    result_list = []
-    for item in path:
-      result_list.append(os.path.normpath(item))
-    return result_list
 
 def outpath(path: str or list):
   if type(path) == str:
@@ -28,12 +20,30 @@ def outpath(path: str or list):
       result_list.append(item.replace(os.sep, '/'))
     return result_list
 
+HOME = str(pathlib.Path.home())
+
+def realpath(path: str):
+  path_prefixes = ['/', '~']
+  first_char = path[0]
+  if first_char in path_prefixes:
+    path = path.replace('~', HOME)
+    return os.path.normpath(path)
+  else:
+    return path
+
+def realpaths(path: list):
+  result_list = []
+  for item in path:
+    result_list.append(realpath(item))
+  return result_list
 
 # Deals with files
 class Drawer:
 
   # Returns True if give a path to folder
   def is_folder(self, path: str):
+    if path == '':
+      return False
     path = realpath(path)
     return os.path.isdir(path)
 
@@ -147,13 +157,14 @@ class Drawer:
 
   # Sends given file(s)/folder(s) to trash
   def trash(self, path: str or list):
-    path = realpath(path)
     if type(path) == str:
+      path = realpath(path)
       try:
         send2trash.send2trash(path)
       except FileNotFoundError:
         print(f"File '{path}' wasn't found, skipping sending it to trash.")
     elif type(path) == list:
+      path = realpaths(path)
       for item in path:
         try:
           send2trash.send2trash(item)
@@ -166,11 +177,12 @@ class Drawer:
 
   # Deletes a given file (using trash_file() instead is recommended)
   def delete_file(self, path: str or list):
-    path = realpath(path)
     if type(path) == str:
+      path = realpath(path)
       if self.is_file(path):
         os.remove(path)
     elif type(path) == list:
+      path = realpaths(path)
       for item in path:
         if self.is_file(path):
           os.remove(item)
@@ -195,13 +207,14 @@ class Drawer:
 
   # Returns the parent folder of given file/folder
   def get_parent(self, path: str or list):
-    path = realpath(path)
     if type(path) == str:
+      path = realpath(path)
       basename = self.basename(path)
       parent = path.removesuffix(basename)
       parent = parent.removesuffix(os.sep)
       return outpath(parent)
     elif type(path) == list:
+      path = realpaths(path)
       result_list = []
       for file in path:
         basename = self.basename(file)
@@ -218,14 +231,15 @@ class Drawer:
     return depth
 
   def basename(self, path: str or list):
-    path = realpath(path)
     if type(path) == str:
+      path = realpath(path)
       if self.is_folder(path):
         path = os.path.basename(os.path.normpath(path))
       else:
         path = path.rsplit(os.sep,1)[-1]
       return outpath(path)
     elif type(path) == list:
+      path = realpaths(path)
       return_list = []
       for file in path:
         if self.is_file(file):
@@ -237,7 +251,7 @@ class Drawer:
 
   # Searches for string in list of basenames
   def search_for_files(self, search_term: str, path: list):
-    path = realpath(path)
+    path = realpaths(path)
     result_list = []
     files = self.get_files_recursive(path)
     for file in files:
@@ -247,15 +261,16 @@ class Drawer:
     return outpath(result_list)
 
   def search_for_folder(self, search_term: str, path: str or list):
-    path = realpath(path)
     result_list = []
     if type(path) == str:
+      path = realpath(path)
       subfolders = self.get_folders(path)
       for item in subfolders:
         basename = self.basename(item)
         if basename == search_term:
           result_list.append(item)
     elif type(path) == list:
+      path = realpaths(path)
       for subfolder in path:
         subfolders = self.get_folders(subfolder)
         for item in subfolders:
@@ -265,7 +280,6 @@ class Drawer:
     return outpath(result_list)
 
   def search_for_folders(self, search_term: str, path: str or list):
-    path = realpath(path)
     result_list = []
     def search(search_term: str, path: str):
       folders = self.get_folders_recursive(path)
@@ -274,8 +288,10 @@ class Drawer:
         if search_term.lower() in basename.lower():
           result_list.append(folder)
     if type(path) == str:
+      path = realpath(path)
       search(search_term, path)
     elif type(path) == list:
+      path = realpaths(path)
       for subfolder in path:
         search(search_term, subfolder)
     return outpath(result_list)
@@ -302,6 +318,8 @@ class Drawer:
       return False
 
   # Extracts a given archive
+  # progress_function is called every time a file is extracted from archive, and
+  # it passes number of extracted files and number of files that need to be extracted (done, total)
   def extract_archive(self, archive: str, extract_location: str, progress_function=None):
     archive = realpath(archive)
     extract_location = realpath(extract_location)
@@ -338,8 +356,7 @@ class Drawer:
 
   # Returns the home folder
   def get_home(self):
-    home = str(pathlib.Path.home())
-    return outpath(home)
+    return outpath(HOME)
 
   # Returns the temporary folder
   def get_temp(self):
@@ -361,17 +378,17 @@ class Drawer:
       typewriter.print('Program aborted while gathering size of files.')
       sys.exit(1)
 
-  def open_path(self, path: str):
+  def open(self, path: str):
     path = realpath(path)
     if PLATFORM == 'Linux':
-      subprocess.run(['xdg-open', path])
+      command = 'xdg-open'
     elif PLATFORM == 'Windows':
-      subprocess.run(['start', path])
+      command = 'start'
     elif PLATFORM == 'Darwin':
-      subprocess.run(['open', path])
+      command = 'open'
     else:
       return 1
-    return 0
+    return subprocess.run([command, path])
 
   def get_platform(self):
     return PLATFORM

{libjam-0.0.9.dist-info → libjam-0.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libjam
-Version: 0.0.9
+Version: 0.0.10
 Summary: A library jam for Python.
 Project-URL: Homepage, https://github.com/philippkosarev/libjam
 Project-URL: Issues, https://github.com/philippkosarev/libjam/issues

{libjam-0.0.9.dist-info → libjam-0.0.10.dist-info}/RECORD

@@ -1,11 +1,11 @@
 libjam/__init__.py,sha256=iLE2y9r0Sfe3oIeoFHKwFIyLL6d_KcLP7fINd7pPAlY,145
 libjam/captain.py,sha256=igx-ecKJBI_vBN-pW7KmSEnmYMIHQEb9tFzpy5qHmI8,5636
 libjam/clipboard.py,sha256=5HxlO8ztLJPlnSCq4PncGvY4JGc9C4J2uHcepjC6zmg,3496
-libjam/drawer.py,sha256=gy887B5heBbzqT0R_36U3vaGiiR4avsZ4b52Uabhz2I,11491
+libjam/drawer.py,sha256=ZK0baCuLqgmgwABgmig935HQVbQP05UXjd3P0drSSKQ,11975
 libjam/flashcard.py,sha256=ulV4KPC3BRWLxwkQ87vsY0aM38nYpzOjUOISxTIRVDg,437
 libjam/notebook.py,sha256=4aLVRVTefiHMip44TERLJAXv88U8G6mYLqc1UvWsEfs,3108
 libjam/typewriter.py,sha256=waKY1sDxGzI2ZT5dSzFmLGbaNTIpEM5Zhg_OlPFUAng,3730
-libjam-0.0.9.dist-info/METADATA,sha256=PDUnOoV4F7RduZA4OJYTL95W-E7tx4eBqWcFJCGE7mo,2140
-libjam-0.0.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-libjam-0.0.9.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-libjam-0.0.9.dist-info/RECORD,,
+libjam-0.0.10.dist-info/METADATA,sha256=Ql6PwuKRwtHaf01ad0sqxZwtjLmwwTxsMrrE7YFO0Zg,2141
+libjam-0.0.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+libjam-0.0.10.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+libjam-0.0.10.dist-info/RECORD,,