~

files_cells/notebooks/en/downloading_en.ipynb

@@ -344,6 +344,7 @@
         "    \"adetailer\": adetailer_dir\n",
         "}\n",
         "\n",
+        "aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'\n",
         "# !mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}\n",
         "directories = [value for key, value in prefixes.items()] # for unpucking zip files\n",
         "!mkdir -p {\" \".join(directories)}\n",
@@ -375,15 +376,6 @@
         "    image_url = images[0].get('url', None) # get preview: first image\n",
         "    return model_name, image_url\n",
         "\n",
-        "def modify_image_url(image_url):\n",
-        "    parts = image_url.split('/')\n",
-        "    for i, part in enumerate(parts):\n",
-        "        if part.startswith('width='):\n",
-        "            width_value = int(part.split('=')[1])\n",
-        "            parts[i] = f'width={width_value * 2}' # resize for quality image\n",
-        "            break\n",
-        "    return '/'.join(parts)\n",
-        "\n",
         "def generate_preview_filename(model_name, image_url):\n",
         "    file_parts = model_name.split('.')\n",
         "    image_format = image_url.split('.')[-1].split('?')[0]\n",
@@ -407,6 +399,7 @@
         "                extension_repo.append((url, file_name))\n",
         "\n",
         "def manual_download(url, dst_dir, file_name):\n",
+        "    global aria2_args\n",
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    header_option = f\"--header={user_header}\"\n",
         "\n",
@@ -423,11 +416,10 @@
         "        if data:\n",
         "            model_name, image_url = extract_file_and_image_info(data)\n",
         "            if model_name and image_url:\n",
-        "                new_image_url = modify_image_url(image_url)\n",
-        "                image_file_name = generate_preview_filename(model_name if not file_name else file_name, new_image_url)\n",
-        "                save_img_path = f\"{dst_dir}/{image_file_name}\"\n",
-        "                !wget -O {save_img_path} {new_image_url} # download image\n",
-        "                # print(f\"\\n\\n\\n{save_img_path, new_image_url}\\n\\n\\n\")\n",
+        "                image_file_name = generate_preview_filename(model_name if not file_name else file_name, image_url)\n",
+        "                with capture.capture_output() as cap: # clear shit\n",
+        "                    !aria2c {aria2_args} -d {dst_dir} -o {image_file_name} {image_url}\n",
+        "                del cap\n",
         "            else:\n",
         "                print(\"File name or image URL missing.\")\n",
         "        else:\n",
@@ -442,22 +434,24 @@
         "               !gdown \"{url}\" -O {dst_dir}/{file_name} --fuzzy -c\n",
         "            else:\n",
         "               !gdown \"{url}\" -O {dst_dir} --fuzzy -c\n",
-        "    # -- Huggin Face --\n",
+        "\n",
+        "    # -- Hugging Face --\n",
         "    elif 'huggingface' in url:\n",
         "        if '/blob/' in url:\n",
         "            url = url.replace('/blob/', '/resolve/')\n",
         "        if file_name:\n",
-        "            !aria2c {header_option} --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -c -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {basename} {url}\n",
+        "            !aria2c {header_option} {aria2_args} {dst_dir} -o {basename} {url}\n",
         "        else:\n",
         "            parsed_link = f'\\n{url}\\n\\tout={unquote(url.split(\"/\")[-1])}'\n",
-        "            !echo -e \"{parsed_link}\" | aria2c {header_option} --console-log-level=error --summary-interval=10 -i- -j5 -x16 -s16 -k1M -c -d \"{dst_dir}\" -o {basename}\n",
+        "            !echo -e \"{parsed_link}\" | aria2c {header_option} {aria2_args} -d \"{dst_dir}\" -o {basename}\n",
+        "\n",
         "    # -- Other --\n",
         "    elif 'http' in url or 'magnet' in url:\n",
         "        if file_name:\n",
-        "            !aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {file_name} {url}\n",
+        "            !aria2c {aria2_args} -d {dst_dir} -o {file_name} {url}\n",
         "        else:\n",
         "            parsed_link = '\"{}\"'.format(url)\n",
-        "            !aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -Z {parsed_link}\n",
+        "            !aria2c {aria2_args} -d {dst_dir} -Z {parsed_link}\n",
         "\n",
         "def download(url):\n",
         "    links_and_paths = url.split(',')\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -344,6 +344,7 @@
         "    \"adetailer\": adetailer_dir\n",
         "}\n",
         "\n",
+        "aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'\n",
         "# !mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}\n",
         "directories = [value for key, value in prefixes.items()] # for unpucking zip files\n",
         "!mkdir -p {\" \".join(directories)}\n",
@@ -375,15 +376,6 @@
         "    image_url = images[0].get('url', None) # get preview: first image\n",
         "    return model_name, image_url\n",
         "\n",
-        "def modify_image_url(image_url):\n",
-        "    parts = image_url.split('/')\n",
-        "    for i, part in enumerate(parts):\n",
-        "        if part.startswith('width='):\n",
-        "            width_value = int(part.split('=')[1])\n",
-        "            parts[i] = f'width={width_value * 2}' # resize for quality image\n",
-        "            break\n",
-        "    return '/'.join(parts)\n",
-        "\n",
         "def generate_preview_filename(model_name, image_url):\n",
         "    file_parts = model_name.split('.')\n",
         "    image_format = image_url.split('.')[-1].split('?')[0]\n",
@@ -407,6 +399,7 @@
         "                extension_repo.append((url, file_name))\n",
         "\n",
         "def manual_download(url, dst_dir, file_name):\n",
+        "    global aria2_args\n",
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    header_option = f\"--header={user_header}\"\n",
         "\n",
@@ -423,11 +416,10 @@
         "        if data:\n",
         "            model_name, image_url = extract_file_and_image_info(data)\n",
         "            if model_name and image_url:\n",
-        "                new_image_url = modify_image_url(image_url)\n",
-        "                image_file_name = generate_preview_filename(model_name if not file_name else file_name, new_image_url)\n",
-        "                save_img_path = f\"{dst_dir}/{image_file_name}\"\n",
-        "                !wget -O {save_img_path} {new_image_url} # download image\n",
-        "                # print(f\"\\n\\n\\n{save_img_path, new_image_url}\\n\\n\\n\")\n",
+        "                image_file_name = generate_preview_filename(model_name if not file_name else file_name, image_url)\n",
+        "                with capture.capture_output() as cap: # clear shit\n",
+        "                    !aria2c {aria2_args} -d {dst_dir} -o {image_file_name} {image_url}\n",
+        "                del cap\n",
         "            else:\n",
         "                print(\"File name or image URL missing.\")\n",
         "        else:\n",
@@ -442,22 +434,24 @@
         "               !gdown \"{url}\" -O {dst_dir}/{file_name} --fuzzy -c\n",
         "            else:\n",
         "               !gdown \"{url}\" -O {dst_dir} --fuzzy -c\n",
+        "\n",
         "    # -- Hugging Face --\n",
         "    elif 'huggingface' in url:\n",
         "        if '/blob/' in url:\n",
         "            url = url.replace('/blob/', '/resolve/')\n",
         "        if file_name:\n",
-        "            !aria2c {header_option} --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -c -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {basename} {url}\n",
+        "            !aria2c {header_option} {aria2_args} {dst_dir} -o {basename} {url}\n",
         "        else:\n",
         "            parsed_link = f'\\n{url}\\n\\tout={unquote(url.split(\"/\")[-1])}'\n",
-        "            !echo -e \"{parsed_link}\" | aria2c {header_option} --console-log-level=error --summary-interval=10 -i- -j5 -x16 -s16 -k1M -c -d \"{dst_dir}\" -o {basename}\n",
+        "            !echo -e \"{parsed_link}\" | aria2c {header_option} {aria2_args} -d \"{dst_dir}\" -o {basename}\n",
+        "\n",
         "    # -- Other --\n",
         "    elif 'http' in url or 'magnet' in url:\n",
         "        if file_name:\n",
-        "            !aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {file_name} {url}\n",
+        "            !aria2c {aria2_args} -d {dst_dir} -o {file_name} {url}\n",
         "        else:\n",
         "            parsed_link = '\"{}\"'.format(url)\n",
-        "            !aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -Z {parsed_link}\n",
+        "            !aria2c {aria2_args} -d {dst_dir} -Z {parsed_link}\n",
         "\n",
         "def download(url):\n",
         "    links_and_paths = url.split(',')\n",

files_cells/python/en/downloading_en.py

@@ -325,6 +325,7 @@ prefixes = {
     "adetailer": adetailer_dir
 }
 
+aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'
 # !mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}
 directories = [value for key, value in prefixes.items()] # for unpucking zip files
 get_ipython().system('mkdir -p {" ".join(directories)}')
@@ -356,15 +357,6 @@ def extract_file_and_image_info(data):
     image_url = images[0].get('url', None) # get preview: first image
     return model_name, image_url
 
-def modify_image_url(image_url):
-    parts = image_url.split('/')
-    for i, part in enumerate(parts):
-        if part.startswith('width='):
-            width_value = int(part.split('=')[1])
-            parts[i] = f'width={width_value * 2}' # resize for quality image
-            break
-    return '/'.join(parts)
-
 def generate_preview_filename(model_name, image_url):
     file_parts = model_name.split('.')
     image_format = image_url.split('.')[-1].split('?')[0]
@@ -388,6 +380,7 @@ def handle_manual(url):
                 extension_repo.append((url, file_name))
 
 def manual_download(url, dst_dir, file_name):
+    global aria2_args
     basename = url.split("/")[-1] if file_name is None else file_name
     header_option = f"--header={user_header}"
 
@@ -404,11 +397,10 @@ def manual_download(url, dst_dir, file_name):
         if data:
             model_name, image_url = extract_file_and_image_info(data)
             if model_name and image_url:
-                new_image_url = modify_image_url(image_url)
-                image_file_name = generate_preview_filename(model_name if not file_name else file_name, new_image_url)
-                save_img_path = f"{dst_dir}/{image_file_name}"
-                get_ipython().system('wget -O {save_img_path} {new_image_url} # download image')
-                # print(f"\n\n\n{save_img_path, new_image_url}\n\n\n")
+                image_file_name = generate_preview_filename(model_name if not file_name else file_name, image_url)
+                with capture.capture_output() as cap: # clear shit
+                    get_ipython().system('aria2c {aria2_args} -d {dst_dir} -o {image_file_name} {image_url}')
+                del cap
             else:
                 print("File name or image URL missing.")
         else:
@@ -423,22 +415,24 @@ def manual_download(url, dst_dir, file_name):
                get_ipython().system('gdown "{url}" -O {dst_dir}/{file_name} --fuzzy -c')
             else:
                get_ipython().system('gdown "{url}" -O {dst_dir} --fuzzy -c')
-    # -- Huggin Face --
+
+    # -- Hugging Face --
     elif 'huggingface' in url:
         if '/blob/' in url:
             url = url.replace('/blob/', '/resolve/')
         if file_name:
-            get_ipython().system('aria2c {header_option} --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -c -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {basename} {url}')
+            get_ipython().system('aria2c {header_option} {aria2_args} {dst_dir} -o {basename} {url}')
         else:
             parsed_link = f'\n{url}\n\tout={unquote(url.split("/")[-1])}'
-            get_ipython().system('echo -e "{parsed_link}" | aria2c {header_option} --console-log-level=error --summary-interval=10 -i- -j5 -x16 -s16 -k1M -c -d "{dst_dir}" -o {basename}')
+            get_ipython().system('echo -e "{parsed_link}" | aria2c {header_option} {aria2_args} -d "{dst_dir}" -o {basename}')
+
     # -- Other --
     elif 'http' in url or 'magnet' in url:
         if file_name:
-            get_ipython().system('aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {file_name} {url}')
+            get_ipython().system('aria2c {aria2_args} -d {dst_dir} -o {file_name} {url}')
         else:
             parsed_link = '"{}"'.format(url)
-            get_ipython().system('aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -Z {parsed_link}')
+            get_ipython().system('aria2c {aria2_args} -d {dst_dir} -Z {parsed_link}')
 
 def download(url):
     links_and_paths = url.split(',')

files_cells/python/ru/downloading_ru.py

@@ -325,6 +325,7 @@ prefixes = {
     "adetailer": adetailer_dir
 }
 
+aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'
 # !mkdir -p {models_dir} {vaes_dir} {loras_dir} {embeddings_dir} {extensions_dir} {control_dir} {adetailer_dir}
 directories = [value for key, value in prefixes.items()] # for unpucking zip files
 get_ipython().system('mkdir -p {" ".join(directories)}')
@@ -356,15 +357,6 @@ def extract_file_and_image_info(data):
     image_url = images[0].get('url', None) # get preview: first image
     return model_name, image_url
 
-def modify_image_url(image_url):
-    parts = image_url.split('/')
-    for i, part in enumerate(parts):
-        if part.startswith('width='):
-            width_value = int(part.split('=')[1])
-            parts[i] = f'width={width_value * 2}' # resize for quality image
-            break
-    return '/'.join(parts)
-
 def generate_preview_filename(model_name, image_url):
     file_parts = model_name.split('.')
     image_format = image_url.split('.')[-1].split('?')[0]
@@ -388,6 +380,7 @@ def handle_manual(url):
                 extension_repo.append((url, file_name))
 
 def manual_download(url, dst_dir, file_name):
+    global aria2_args
     basename = url.split("/")[-1] if file_name is None else file_name
     header_option = f"--header={user_header}"
 
@@ -404,11 +397,10 @@ def manual_download(url, dst_dir, file_name):
         if data:
             model_name, image_url = extract_file_and_image_info(data)
             if model_name and image_url:
-                new_image_url = modify_image_url(image_url)
-                image_file_name = generate_preview_filename(model_name if not file_name else file_name, new_image_url)
-                save_img_path = f"{dst_dir}/{image_file_name}"
-                get_ipython().system('wget -O {save_img_path} {new_image_url} # download image')
-                # print(f"\n\n\n{save_img_path, new_image_url}\n\n\n")
+                image_file_name = generate_preview_filename(model_name if not file_name else file_name, image_url)
+                with capture.capture_output() as cap: # clear shit
+                    get_ipython().system('aria2c {aria2_args} -d {dst_dir} -o {image_file_name} {image_url}')
+                del cap
             else:
                 print("File name or image URL missing.")
         else:
@@ -423,22 +415,24 @@ def manual_download(url, dst_dir, file_name):
                get_ipython().system('gdown "{url}" -O {dst_dir}/{file_name} --fuzzy -c')
             else:
                get_ipython().system('gdown "{url}" -O {dst_dir} --fuzzy -c')
+
     # -- Hugging Face --
     elif 'huggingface' in url:
         if '/blob/' in url:
             url = url.replace('/blob/', '/resolve/')
         if file_name:
-            get_ipython().system('aria2c {header_option} --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -c -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {basename} {url}')
+            get_ipython().system('aria2c {header_option} {aria2_args} {dst_dir} -o {basename} {url}')
         else:
             parsed_link = f'\n{url}\n\tout={unquote(url.split("/")[-1])}'
-            get_ipython().system('echo -e "{parsed_link}" | aria2c {header_option} --console-log-level=error --summary-interval=10 -i- -j5 -x16 -s16 -k1M -c -d "{dst_dir}" -o {basename}')
+            get_ipython().system('echo -e "{parsed_link}" | aria2c {header_option} {aria2_args} -d "{dst_dir}" -o {basename}')
+
     # -- Other --
     elif 'http' in url or 'magnet' in url:
         if file_name:
-            get_ipython().system('aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -o {file_name} {url}')
+            get_ipython().system('aria2c {aria2_args} -d {dst_dir} -o {file_name} {url}')
         else:
             parsed_link = '"{}"'.format(url)
-            get_ipython().system('aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c -d {dst_dir} -Z {parsed_link}')
+            get_ipython().system('aria2c {aria2_args} -d {dst_dir} -Z {parsed_link}')
 
 def download(url):
     links_and_paths = url.split(',')