Update main22.py

main22.py

@@ -227,6 +227,7 @@ def get_civitai_file(str):
         return match.group(0).split('\n')[0]
     else:
         print("无法从输出中提取文件名")
+        return ''
 
 
 def move_model(source_path, target_path):
@@ -243,17 +244,19 @@ def download_file(item):
           return
       download_url = item['downloadLink']
       # huggingface
-      match = re.search(r'/([^/]*)$', download_url)
-      file_name = match.group(1)
+      file_name = urlparse(download_url).path.split("/")[-1]
       # 开始下载
-      if '.' not in match.group(1):
+      if '.' not in file_name:
+        print("civitai")
         if len(cookie)>0:
           cmd = ['aria2c', '--header', f'Cookie:{cookie}', '--console-log-level=error', '-c', '-x', '16', '-s', '16', '-k', '1M', download_url, '-d', lora_dir]
         else:
           cmd = f"aria2c --console-log-level=error -c -x 16 -s 16 -k 1M {download_url} -d {lora_dir}"
+        result = subprocess.run(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
       else:
         cmd = f"aria2c --console-log-level=error -c -x 16 -s 16 -k 1M {download_url} -d {lora_dir} -o {file_name}"
-      result = subprocess.run(cmd,stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+        result = subprocess.run(cmd ,shell=True ,stderr=subprocess. PIPE, stdout=subprocess.PIPE)
+      print(result)
       if result.returncode == 0:
           # 判断是civitai还是hugging face还是自定义
           # civitai
@@ -297,7 +300,7 @@ def download_file(item):
             print(f"2.粘贴{item['downloadLink']}到链接输入栏进行跳转同时观察包含http s://civitai.com/api/download 的这个请求")
             print(f"3.将请求头的cookie复制下来在cookie的输入框中填入，重新执行2.2进行下载\n   ")
             print("===============================================================================")
-          print(f"{item['name']}下载失败,请检查{item['downloadLink']}")
+          print(f"\033[91m{item['name']}下载失败,请检查{item['downloadLink']}\033[0m")
     except Exception as e:
       traceback.print_exc()