Update 2.4

core.py

@@ -33,7 +33,7 @@ def escapePath(path, Config):  # Remove escape literals
 def moveFailedFolder(filepath, failed_folder):
     print('[-]Move to Failed output folder')
     shutil.move(filepath, str(os.getcwd()) + '/' + failed_folder + '/')
-    os._exit(0)
+    return 
 
 
 def CreatFailedFolder(failed_folder):
@@ -42,7 +42,7 @@ def CreatFailedFolder(failed_folder):
             os.makedirs(failed_folder + '/')
         except:
             print("[-]failed!can not be make Failed output folder\n[-](Please run as Administrator)")
-            os._exit(0)
+            return 
 
 
 def getDataFromJSON(file_number, filepath, failed_folder):  # 从JSON返回元数据
@@ -69,7 +69,8 @@ def getDataFromJSON(file_number, filepath, failed_folder):  # 从JSON返回元
     # ==
     elif 'siro' in file_number or 'SIRO' in file_number or 'Siro' in file_number:
         json_data = json.loads(siro.main(file_number))
-    elif not '-' in file_number or '_' in file_number:
+    # ==
+    else:
         json_data = json.loads(fanza.main(file_number))
         if getDataState(json_data) == 0:  # 如果元数据获取失败，请求番号至其他网站抓取
             json_data = json.loads(javbus.main(file_number))
@@ -77,13 +78,6 @@ def getDataFromJSON(file_number, filepath, failed_folder):  # 从JSON返回元
             json_data = json.loads(avsox.main(file_number))
         if getDataState(json_data) == 0:  # 如果元数据获取失败，请求番号至其他网站抓取
             json_data = json.loads(javdb.main(file_number))
-    # ==
-    else:
-        json_data = json.loads(javbus.main(file_number))
-        if getDataState(json_data) == 0:  # 如果元数据获取失败，请求番号至其他网站抓取
-            json_data = json.loads(avsox.main(file_number))
-        if getDataState(json_data) == 0:  # 如果元数据获取失败，请求番号至其他网站抓取
-            json_data = json.loads(javdb.main(file_number))
 
     # ================================================网站规则添加结束================================================
 
@@ -231,7 +225,7 @@ def DownloadFileWithFilename(url, filename, path, Config, filepath, failed_folde
                                  proxies={"http": "http://" + str(proxy), "https": "https://" + str(proxy)})
                 if r == '':
                     print('[-]Movie Data not found!')
-                    os._exit(0)
+                    return 
                 with open(str(path) + "/" + filename, "wb") as code:
                     code.write(r.content)
                 return
@@ -243,7 +237,7 @@ def DownloadFileWithFilename(url, filename, path, Config, filepath, failed_folde
                 r = requests.get(url, timeout=timeout, headers=headers)
                 if r == '':
                     print('[-]Movie Data not found!')
-                    os._exit(0)
+                    return 
                 with open(str(path) + "/" + filename, "wb") as code:
                     code.write(r.content)
                 return
@@ -559,10 +553,10 @@ def pasteFileToFolder(filepath, path, number, c_word):  # 文件路径，番号
     except FileExistsError:
         print('[-]File Exists! Please check your movie!')
         print('[-]move to the root folder of the program.')
-        os._exit(0)
+        return 
     except PermissionError:
         print('[-]Error! Please run as administrator!')
-        os._exit(0)
+        return 
 
 
 def pasteFileToFolder_mode2(filepath, path, multi_part, number, part, c_word):  # 文件路径，番号，后缀，要移动至的位置
@@ -587,10 +581,10 @@ def pasteFileToFolder_mode2(filepath, path, multi_part, number, part, c_word):
     except FileExistsError:
         print('[-]File Exists! Please check your movie!')
         print('[-]move to the root folder of the program.')
-        os._exit(0)
+        return 
     except PermissionError:
         print('[-]Error! Please run as administrator!')
-        os._exit(0)
+        return 
 
 
 def copyRenameJpgToBackdrop(option, path, number, c_word):