Fix: directory separator symbol causes wrong folder creation on unix …

…systems
agmmnn · Sep 26, 2021 · 5a78b19 · 5a78b19
1 parent 3982bda
commit 5a78b19
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 21 deletions.
diff --git a/polydown/__main__.py b/polydown/__main__.py
@@ -2,7 +2,7 @@
 import datetime
 from .cli import polycli
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 
 ap = argparse.ArgumentParser()
 ap.add_argument(

diff --git a/polydown/cli.py b/polydown/cli.py
@@ -58,14 +58,11 @@ def polycli(args):
     #     exit()
 
     # ->🔒folder->
-    if os.path.exists(folder):
-        down_folder = folder + "\\" if folder[:-1] != "\\" else ""
-    else:
-        down_folder = os.getcwd() + "\\" + folder + "\\" if folder[:-1] != "\\" else ""
+    down_folder = os.path.abspath(folder) + ("/" if folder[-1:] != "/" else "")
+    if not os.path.exists(down_folder):
         try:
-            if os.path.exists(down_folder) == False:
-                os.mkdir(down_folder)
-                print("Folder not found, creating...")
+            os.mkdir(folder)
+            print(f'"{folder}" folder not found, creating...')
         except Exception as e:
             print("[red]Error: " + str(e))
             exit()

diff --git a/polydown/downloader.py b/polydown/downloader.py
@@ -33,22 +33,22 @@ def __init__(
         self.k = k
         self.b = b
 
-        asset_k_folder = f"{subfolder}\\{asset}_{k}"
-        textures_folder = f"{subfolder}\\{asset}_{k}\\textures"
+        asset_k_folder = f"{subfolder}/{asset}_{k}"
+        textures_folder = f"{subfolder}/{asset}_{k}/textures"
 
         if type == "hdris":
             self.folder = down_folder + filename
         elif type == "models":
             self.folder = (
-                f"{textures_folder}\\{self.filename}"
+                f"{textures_folder}/{self.filename}"
                 if not b
-                else f"{asset_k_folder}\\{self.filename}"
+                else f"{asset_k_folder}/{self.filename}"
             )
         else:
             self.folder = (
-                f"{textures_folder}\\{self.filename}"
+                f"{textures_folder}/{self.filename}"
                 if not self.b
-                else f"{asset_k_folder}\\{self.filename}"
+                else f"{asset_k_folder}/{self.filename}"
             )
 
         if type == "hdris":
@@ -127,9 +127,9 @@ def img(self):
         def save_file(url, filename):
             r = self.s.get(url)
             with open(
-                f"{self.subfolder}\\{filename}"
+                f"{self.subfolder}/{filename}"
                 if self.type != "hdris"
-                else f"{self.down_folder}\\{filename}",
+                else f"{self.down_folder}/{filename}",
                 "wb",
             ) as f:
                 f.write(r.content)

diff --git a/polydown/hash_check.py b/polydown/hash_check.py
@@ -15,9 +15,9 @@ def hash_check(
         file = down_folder + filename
     else:
         file = (
-            f"{subfolder}\\{asset}_{k}\\textures\\{filename}"
+            f"{subfolder}/{asset}_{k}/textures/{filename}"
             if not b
-            else f"{subfolder}\\{asset}_{k}\\{filename}"
+            else f"{subfolder}/{asset}_{k}/{filename}"
         )
 
     with open(file, "rb") as f:

diff --git a/polydown/poly.py b/polydown/poly.py
@@ -47,9 +47,9 @@ def create_subfolder(k):
                 self.subfolder = self.down_folder + asset
                 if not os.path.exists(self.subfolder):
                     os.mkdir(self.subfolder)
-                if not os.path.exists(self.subfolder + f"\\{asset}_{k}"):
-                    os.mkdir(self.subfolder + f"\\{asset}_{k}")
-                    os.mkdir(self.subfolder + f"\\{asset}_{k}\\textures")
+                if not os.path.exists(self.subfolder + f"/{asset}_{k}"):
+                    os.mkdir(self.subfolder + f"/{asset}_{k}")
+                    os.mkdir(self.subfolder + f"/{asset}_{k}/textures")
 
             print(
                 theme.t_atitle