Update utils.py

utils.py

@@ -275,11 +275,11 @@ def civ_redirect_down(url, dir_, civitai_api_key, romanize, alternative_name):
     elif os.path.exists(os.path.join(dir_, filename_base)):
         return os.path.join(dir_, filename_base), filename_base
 
-    aria2_command = (
-        f'aria2c --console-log-level=error --summary-interval=10 -c -x 16 '
-        f'-k 1M -s 16 -d "{dir_}" -o "{filename_base}" "{redirect_url}"'
+    wget_command = (
+        f'wget -c -nv '
+        f'-O "{os.path.join(dir_, filename_base)}" "{redirect_url}"'
     )
-    r_code = os.system(aria2_command)  # noqa
+    r_code = os.system(wget_command)  # noqa
 
     # if r_code != 0:
     #     raise RuntimeError(f"Failed to download file: {filename_base}. Error code: {r_code}")
@@ -293,27 +293,32 @@ def civ_redirect_down(url, dir_, civitai_api_key, romanize, alternative_name):
 
 def civ_api_down(url, dir_, civitai_api_key, civ_filename):
     """
-    This method is susceptible to being blocked because it generates a lot of temp redirect links with aria2c.
-    If an API key limit is reached, generating a new API key and using it can fix the issue.
+    This method is susceptible to being blocked because it generates a lot of temp redirect links with wget.
+    If an API key limit is reached, generating a new API key and using it can fix the issue. no
     """
     output_path = None
-
+    
     url_dl = url + f"?token={civitai_api_key}"
+    
     if not civ_filename:
-        aria2_command = f'aria2c -c -x 1 -s 1 -d "{dir_}" "{url_dl}"'
-        os.system(aria2_command)
+        wget_command = (
+            f'wget -c -nv '
+            f'-P "{dir_}" "{url_dl}"'
+        )
+        os.system(wget_command)
+    
     else:
         output_path = os.path.join(dir_, civ_filename)
+    
         if not os.path.exists(output_path):
-            aria2_command = (
-                f'aria2c --console-log-level=error --summary-interval=10 -c -x 16 '
-                f'-k 1M -s 16 -d "{dir_}" -o "{civ_filename}" "{url_dl}"'
+            wget_command = (
+                f'wget -c -nv '
+                f'-O "{output_path}" "{url_dl}"'
             )
-            os.system(aria2_command)
-
+            os.system(wget_command)
+    
     return output_path
 
-
 def drive_down(url, dir_):
     import gdown
 
@@ -354,10 +359,16 @@ def hf_down(url, dir_, hf_token, romanize):
         url = url.replace("/blob/", "/resolve/")
 
     if hf_token:
-        user_header = f'"Authorization: Bearer {hf_token}"'
-        os.system(f"aria2c --console-log-level=error --summary-interval=10 --header={user_header} -c -x 16 -k 1M -s 16 {url} -d {dir_}  -o {filename}")
+        os.system(
+            f'wget -c -nv '
+            f'--header="Authorization: Bearer {hf_token}" '
+            f'-O "{os.path.join(dir_, filename)}" "{url}"'
+        )
     else:
-        os.system(f"aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 {url} -d {dir_}  -o {filename}")
+        os.system(
+            f'wget -c -nv '
+            f'-O "{os.path.join(dir_, filename)}" "{url}"'
+        )
 
     return output_path
 
@@ -370,7 +381,8 @@ def download_things(directory, url, hf_token="", civitai_api_key="", romanize=Fa
         downloaded_file_path = drive_down(url, directory)
     elif "huggingface.co" in url:
         downloaded_file_path = hf_down(url, directory, hf_token, romanize)
-    elif "civitai.com" in url:
+    elif "civitai." in url:
+        url = url.replace("civitai.red", "civitai.com")
         if not civitai_api_key:
             msg = "You need an API key to download Civitai models."
             print(f"\033[91m{msg}\033[0m")
@@ -393,7 +405,10 @@ def download_things(directory, url, hf_token="", civitai_api_key="", romanize=Fa
             gr.Warning(msg)
             downloaded_file_path = civ_api_down(url, directory, civitai_api_key, civ_filename)
     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'wget -c -nv '
+            f'-P "{directory}" "{url}"'
+        )
 
     return downloaded_file_path