update download code 2

files_cells/notebooks/en/downloading_en.ipynb

@@ -186,10 +186,6 @@
         "        ## Update extensions\n",
         "        if latest_exstensions:\n",
         "            !{'for dir in ' + webui_path + '/extensions/*/; do cd \\\"$dir\\\" && git reset --hard && git pull; done'}\n",
-        "\n",
-        "            # # My Chinese friend, you broke the images again in the latest update... >W<'\n",
-        "            # %cd {webui_path}/extensions/Encrypt-Image\n",
-        "            # !git reset --hard 376358d8854472b9ea50e9fc8800367d1ca51137 # stable commit :3\n",
         "    del cap\n",
         "    print(f\"\\r✨ {action} Completed!\")\n",
         "\n",
@@ -362,16 +358,15 @@
         "        print(f\"An error occurred: {e}\")\n",
         "        return None\n",
         "\n",
-        "def extract_file_and_image_info(data):\n",
+        "def extract_model_info(data):\n",
         "    model_name = data['files'][0]['name'] # get original model file name\n",
         "    image_url = data['images'][0]['url'] # get preview: first image\n",
         "    return model_name, image_url\n",
         "\n",
-        "def generate_preview_filename(model_name, image_url):\n",
+        "def gen_preview_filename(model_name, image_url):\n",
         "    name = model_name.split('.')\n",
-        "    img_ext = image_url.split('.')\n",
-        "    print(f\"\\n\\033[31m[Preview DL]\\033[0m: {name[0]}.preview.{img_ext[-1]}\")\n",
-        "    return f\"{name[0]}.preview.{img_ext[-1]}\" # assigning the original image format\n",
+        "    img_exts = image_url.split('.')\n",
+        "    return f\"{name[0]}.preview.{img_exts[-1]}\" # assigning the original image format\n",
         "\n",
         "''' main download code '''\n",
         "\n",
@@ -395,27 +390,33 @@
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'\n",
         "\n",
-        "    print(f\"\\n\\033[32m{'---'*45}\\n\\033[33mURL: \\033[34m{url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name}\\033[0m\")\n",
-        "    # print(url, dst_dir, file_name)\n",
-        "\n",
         "    # === CivitAi API ===\n",
         "    civitai_token = \"62c0c5956b2f9defbd844d754000180b\"\n",
         "    if 'civitai' in url:\n",
+        "        image_file_name = None\n",
         "        model_id = url.split('/')[-1]\n",
-        "        url = f\"{url}&token={civitai_token}\" if '?' in url else f\"{url}?token={civitai_token}\"\n",
+        "        url = f\"{url}&token={civitai_token}\" if '?' in url else f\"{url}?token={civitai_token}\" # some authors are pussies and they need API token...\n",
         "\n",
-        "        if dst_dir not in [vaes_dir, control_dir, adetailer_dir]: # filter\n",
+        "        if dst_dir in [models_dir, embeddings_dir, loras_dir]: # filter\n",
         "            data = get_data_from_api(model_id, civitai_token)\n",
         "            if data:\n",
-        "                model_name, image_url = extract_file_and_image_info(data)\n",
+        "                model_name, image_url = extract_model_info(data)\n",
         "                if model_name and image_url:\n",
-        "                    image_file_name = generate_preview_filename(model_name if not file_name else file_name, image_url)\n",
+        "                    image_file_name = gen_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",
+        "                    if not file_name:\n",
+        "                        file_name = model_name\n",
         "            else:\n",
         "                print(\"\\033[31m[Preview DL]\\033[0m: Failed to retrieve data from the API.\")\n",
         "\n",
+        "\n",
+        "    # print(url, dst_dir, file_name if not 'huggingface' in url else basename) # for my tests\n",
+        "    print(f\"\\n\\033[32m{'---'*45}\\n\\033[33mURL: \\033[34m{url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name if not 'huggingface' in url else basename}\\033[0m\")\n",
+        "    print(f\"\\033[31m[Preview DL]\\033[0m: {image_file_name}\") if 'civitai' in url and image_file_name else None # CivitiAi PreviewDl\n",
+        "\n",
+        "\n",
         "    # -- GDrive --\n",
         "    if 'drive.google' in url:\n",
         "        try:\n",
@@ -532,7 +533,6 @@
         "        urls = [url.split('#')[0].strip() for url in line.split(',')]  # filter urls\n",
         "        for url in urls:\n",
         "            if url.startswith(\"http\") and url not in unique_urls:\n",
-        "                # handle_manual(f\"{current_tag}:{url}\")\n",
         "                files_urls += f\"{current_tag}:{url}, \"\n",
         "                unique_urls.append(url)\n",
         "\n",

files_cells/notebooks/ru/downloading_ru.ipynb

@@ -186,10 +186,6 @@
         "        ## Update extensions\n",
         "        if latest_exstensions:\n",
         "            !{'for dir in ' + webui_path + '/extensions/*/; do cd \\\"$dir\\\" && git reset --hard && git pull; done'}\n",
-        "\n",
-        "            # # My Chinese friend, you broke the images again in the latest update... >W<'\n",
-        "            # %cd {webui_path}/extensions/Encrypt-Image\n",
-        "            # !git reset --hard 376358d8854472b9ea50e9fc8800367d1ca51137 # stable commit :3\n",
         "    del cap\n",
         "    print(f\"\\r✨ {action} Завершено!\")\n",
         "\n",
@@ -362,16 +358,15 @@
         "        print(f\"An error occurred: {e}\")\n",
         "        return None\n",
         "\n",
-        "def extract_file_and_image_info(data):\n",
+        "def extract_model_info(data):\n",
         "    model_name = data['files'][0]['name'] # get original model file name\n",
         "    image_url = data['images'][0]['url'] # get preview: first image\n",
         "    return model_name, image_url\n",
         "\n",
-        "def generate_preview_filename(model_name, image_url):\n",
+        "def gen_preview_filename(model_name, image_url):\n",
         "    name = model_name.split('.')\n",
-        "    img_ext = image_url.split('.')\n",
-        "    print(f\"\\n\\033[31m[Preview DL]\\033[0m: {name[0]}.preview.{img_ext[-1]}\")\n",
-        "    return f\"{name[0]}.preview.{img_ext[-1]}\" # assigning the original image format\n",
+        "    img_exts = image_url.split('.')\n",
+        "    return f\"{name[0]}.preview.{img_exts[-1]}\" # assigning the original image format\n",
         "\n",
         "''' main download code '''\n",
         "\n",
@@ -395,27 +390,33 @@
         "    basename = url.split(\"/\")[-1] if file_name is None else file_name\n",
         "    aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'\n",
         "\n",
-        "    print(f\"\\n\\033[32m{'---'*45}\\n\\033[33mURL: \\033[34m{url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name}\\033[0m\")\n",
-        "    # print(url, dst_dir, file_name)\n",
-        "\n",
         "    # === CivitAi API ===\n",
         "    civitai_token = \"62c0c5956b2f9defbd844d754000180b\"\n",
         "    if 'civitai' in url:\n",
+        "        image_file_name = None\n",
         "        model_id = url.split('/')[-1]\n",
-        "        url = f\"{url}&token={civitai_token}\" if '?' in url else f\"{url}?token={civitai_token}\"\n",
+        "        url = f\"{url}&token={civitai_token}\" if '?' in url else f\"{url}?token={civitai_token}\" # some authors are pussies and they need API token...\n",
         "\n",
-        "        if dst_dir not in [vaes_dir, control_dir, adetailer_dir]: # filter\n",
+        "        if dst_dir in [models_dir, embeddings_dir, loras_dir]: # filter\n",
         "            data = get_data_from_api(model_id, civitai_token)\n",
         "            if data:\n",
-        "                model_name, image_url = extract_file_and_image_info(data)\n",
+        "                model_name, image_url = extract_model_info(data)\n",
         "                if model_name and image_url:\n",
-        "                    image_file_name = generate_preview_filename(model_name if not file_name else file_name, image_url)\n",
+        "                    image_file_name = gen_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",
+        "                    if not file_name:\n",
+        "                        file_name = model_name\n",
         "            else:\n",
         "                print(\"\\033[31m[Preview DL]\\033[0m: Failed to retrieve data from the API.\")\n",
         "\n",
+        "\n",
+        "    # print(url, dst_dir, file_name if not 'huggingface' in url else basename) # for my tests\n",
+        "    print(f\"\\n\\033[32m{'---'*45}\\n\\033[33mURL: \\033[34m{url}\\n\\033[33mSAVE DIR: \\033[34m{dst_dir}\\n\\033[33mFILE NAME: \\033[34m{file_name if not 'huggingface' in url else basename}\\033[0m\")\n",
+        "    print(f\"\\033[31m[Preview DL]\\033[0m: {image_file_name}\") if 'civitai' in url and image_file_name else None # CivitiAi PreviewDl\n",
+        "\n",
+        "\n",
         "    # -- GDrive --\n",
         "    if 'drive.google' in url:\n",
         "        try:\n",
@@ -532,7 +533,6 @@
         "        urls = [url.split('#')[0].strip() for url in line.split(',')]  # filter urls\n",
         "        for url in urls:\n",
         "            if url.startswith(\"http\") and url not in unique_urls:\n",
-        "                # handle_manual(f\"{current_tag}:{url}\")\n",
         "                files_urls += f\"{current_tag}:{url}, \"\n",
         "                unique_urls.append(url)\n",
         "\n",

files_cells/python/en/downloading_en.py

@@ -167,10 +167,6 @@ if latest_webui or latest_exstensions:
         ## Update extensions
         if latest_exstensions:
             get_ipython().system('{\'for dir in \' + webui_path + \'/extensions/*/; do cd \\"$dir\\" && git reset --hard && git pull; done\'}')
-
-            # # My Chinese friend, you broke the images again in the latest update... >W<'
-            # %cd {webui_path}/extensions/Encrypt-Image
-            # !git reset --hard 376358d8854472b9ea50e9fc8800367d1ca51137 # stable commit :3
     del cap
     print(f"\r✨ {action} Completed!")
 
@@ -343,16 +339,15 @@ def get_data_from_api(model_id, api_key): # get model data
         print(f"An error occurred: {e}")
         return None
 
-def extract_file_and_image_info(data):
+def extract_model_info(data):
     model_name = data['files'][0]['name'] # get original model file name
     image_url = data['images'][0]['url'] # get preview: first image
     return model_name, image_url
 
-def generate_preview_filename(model_name, image_url):
+def gen_preview_filename(model_name, image_url):
     name = model_name.split('.')
-    img_ext = image_url.split('.')
-    print(f"\n\033[31m[Preview DL]\033[0m: {name[0]}.preview.{img_ext[-1]}")
-    return f"{name[0]}.preview.{img_ext[-1]}" # assigning the original image format
+    img_exts = image_url.split('.')
+    return f"{name[0]}.preview.{img_exts[-1]}" # assigning the original image format
 
 ''' main download code '''
 
@@ -376,27 +371,33 @@ def manual_download(url, dst_dir, file_name):
     basename = url.split("/")[-1] if file_name is None else file_name
     aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'
 
-    print(f"\n\033[32m{'---'*45}\n\033[33mURL: \033[34m{url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name}\033[0m")
-    # print(url, dst_dir, file_name)
-
     # === CivitAi API ===
     civitai_token = "62c0c5956b2f9defbd844d754000180b"
     if 'civitai' in url:
+        image_file_name = None
         model_id = url.split('/')[-1]
-        url = f"{url}&token={civitai_token}" if '?' in url else f"{url}?token={civitai_token}"
+        url = f"{url}&token={civitai_token}" if '?' in url else f"{url}?token={civitai_token}" # some authors are pussies and they need API token...
 
-        if dst_dir not in [vaes_dir, control_dir, adetailer_dir]: # filter
+        if dst_dir in [models_dir, embeddings_dir, loras_dir]: # filter
             data = get_data_from_api(model_id, civitai_token)
             if data:
-                model_name, image_url = extract_file_and_image_info(data)
+                model_name, image_url = extract_model_info(data)
                 if model_name and image_url:
-                    image_file_name = generate_preview_filename(model_name if not file_name else file_name, image_url)
+                    image_file_name = gen_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
+                    if not file_name:
+                        file_name = model_name
             else:
                 print("\033[31m[Preview DL]\033[0m: Failed to retrieve data from the API.")
 
+
+    # print(url, dst_dir, file_name if not 'huggingface' in url else basename) # for my tests
+    print(f"\n\033[32m{'---'*45}\n\033[33mURL: \033[34m{url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name if not 'huggingface' in url else basename}\033[0m")
+    print(f"\033[31m[Preview DL]\033[0m: {image_file_name}") if 'civitai' in url and image_file_name else None # CivitiAi PreviewDl
+
+
     # -- GDrive --
     if 'drive.google' in url:
         try:
@@ -513,7 +514,6 @@ def process_file_download(file_url):
         urls = [url.split('#')[0].strip() for url in line.split(',')]  # filter urls
         for url in urls:
             if url.startswith("http") and url not in unique_urls:
-                # handle_manual(f"{current_tag}:{url}")
                 files_urls += f"{current_tag}:{url}, "
                 unique_urls.append(url)
 

files_cells/python/ru/downloading_ru.py

@@ -167,10 +167,6 @@ if latest_webui or latest_exstensions:
         ## Update extensions
         if latest_exstensions:
             get_ipython().system('{\'for dir in \' + webui_path + \'/extensions/*/; do cd \\"$dir\\" && git reset --hard && git pull; done\'}')
-
-            # # My Chinese friend, you broke the images again in the latest update... >W<'
-            # %cd {webui_path}/extensions/Encrypt-Image
-            # !git reset --hard 376358d8854472b9ea50e9fc8800367d1ca51137 # stable commit :3
     del cap
     print(f"\r✨ {action} Завершено!")
 
@@ -343,16 +339,15 @@ def get_data_from_api(model_id, api_key): # get model data
         print(f"An error occurred: {e}")
         return None
 
-def extract_file_and_image_info(data):
+def extract_model_info(data):
     model_name = data['files'][0]['name'] # get original model file name
     image_url = data['images'][0]['url'] # get preview: first image
     return model_name, image_url
 
-def generate_preview_filename(model_name, image_url):
+def gen_preview_filename(model_name, image_url):
     name = model_name.split('.')
-    img_ext = image_url.split('.')
-    print(f"\n\033[31m[Preview DL]\033[0m: {name[0]}.preview.{img_ext[-1]}")
-    return f"{name[0]}.preview.{img_ext[-1]}" # assigning the original image format
+    img_exts = image_url.split('.')
+    return f"{name[0]}.preview.{img_exts[-1]}" # assigning the original image format
 
 ''' main download code '''
 
@@ -376,27 +371,33 @@ def manual_download(url, dst_dir, file_name):
     basename = url.split("/")[-1] if file_name is None else file_name
     aria2_args = '--optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -j5 -x16 -s16 -k1M -c'
 
-    print(f"\n\033[32m{'---'*45}\n\033[33mURL: \033[34m{url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name}\033[0m")
-    # print(url, dst_dir, file_name)
-
     # === CivitAi API ===
     civitai_token = "62c0c5956b2f9defbd844d754000180b"
     if 'civitai' in url:
+        image_file_name = None
         model_id = url.split('/')[-1]
-        url = f"{url}&token={civitai_token}" if '?' in url else f"{url}?token={civitai_token}"
+        url = f"{url}&token={civitai_token}" if '?' in url else f"{url}?token={civitai_token}" # some authors are pussies and they need API token...
 
-        if dst_dir not in [vaes_dir, control_dir, adetailer_dir]: # filter
+        if dst_dir in [models_dir, embeddings_dir, loras_dir]: # filter
             data = get_data_from_api(model_id, civitai_token)
             if data:
-                model_name, image_url = extract_file_and_image_info(data)
+                model_name, image_url = extract_model_info(data)
                 if model_name and image_url:
-                    image_file_name = generate_preview_filename(model_name if not file_name else file_name, image_url)
+                    image_file_name = gen_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
+                    if not file_name:
+                        file_name = model_name
             else:
                 print("\033[31m[Preview DL]\033[0m: Failed to retrieve data from the API.")
 
+
+    # print(url, dst_dir, file_name if not 'huggingface' in url else basename) # for my tests
+    print(f"\n\033[32m{'---'*45}\n\033[33mURL: \033[34m{url}\n\033[33mSAVE DIR: \033[34m{dst_dir}\n\033[33mFILE NAME: \033[34m{file_name if not 'huggingface' in url else basename}\033[0m")
+    print(f"\033[31m[Preview DL]\033[0m: {image_file_name}") if 'civitai' in url and image_file_name else None # CivitiAi PreviewDl
+
+
     # -- GDrive --
     if 'drive.google' in url:
         try:
@@ -513,7 +514,6 @@ def process_file_download(file_url):
         urls = [url.split('#')[0].strip() for url in line.split(',')]  # filter urls
         for url in urls:
             if url.startswith("http") and url not in unique_urls:
-                # handle_manual(f"{current_tag}:{url}")
                 files_urls += f"{current_tag}:{url}, "
                 unique_urls.append(url)