Upload utils.py

utils.py

@@ -130,22 +130,21 @@ def download_thing(directory, url, civitai_api_key="", progress=gr.Progress(trac
         if "drive.google.com" in url:
             original_dir = os.getcwd()
             os.chdir(directory)
-            os.system(f"gdown --fuzzy {url}")
+            subprocess.run(f"gdown --fuzzy '{url}'", shell=True)
             os.chdir(original_dir)
         elif "huggingface.co" in url:
             url = url.replace("?download=true", "")
             if "/blob/" in url: url = url.replace("/blob/", "/resolve/")
             download_hf_file(directory, url)
         elif "civitai.com" in url:
-            if "?" in url:
-                url = url.split("?")[0]
             if civitai_api_key:
-                url = url + f"?token={civitai_api_key}"
-                os.system(f"aria2c --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 -d {directory} {url}")
+                url = url + f"&token={civitai_api_key}" if "?" in url else url + f"?token={civitai_api_key}"
+                print(f"Downloading {url}")
+                subprocess.run(f"aria2c --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 -d {directory} '{url}'", shell=True)
             else:
                 print("You need an API key to download Civitai models.")
         else:
-            os.system(f"aria2c --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 -d {directory} {url}")
+            os.system(f"aria2c --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 -d {directory} '{url}'")
     except Exception as e:
         print(f"Failed to download: {e}")
 
@@ -181,8 +180,8 @@ def get_download_file(temp_dir, url, civitai_key, progress=gr.Progress(track_tqd
             return ""
         print(f"Download completed: {url}")
         return new_file
-    except Exception:
-        print(f"Download failed: {url}")
+    except Exception as e:
+        print(f"Download failed: {url} {e}")
         return ""