Beta 0.4 更新 *更好的错误提示

AV_Data_Capture.py

@@ -21,7 +21,8 @@ def movie_lists():
     total = a2+b2+c2+d2+e2+f2+g2
     return total
 
-def lists_from_test(custom_nuber):
+def lists_from_test(custom_nuber): #电影列表
+
     a=[]
     a.append(custom_nuber)
     return a
@@ -35,11 +36,25 @@ def CEF(path):
         except:
             a=''
 
+def rreplace(self, old, new, *max):
+#从右开始替换文件名中内容，源字符串，将被替换的子字符串， 新字符串，用于替换old子字符串，可选字符串, 替换不超过 max 次
+    count = len(self)
+    if max and str(max[0]).isdigit():
+        count = max[0]
+    return new.join(self.rsplit(old, count))
+
 if __name__ =='__main__':
     os.chdir(os.getcwd())
-    for i in movie_lists():
-        os.system('python core.py' + ' "' + i + '"')
+    for i in movie_lists(): #遍历电影列表 交给core处理
+        if '_' in i:
+            os.rename(i, rreplace(i,'_','-',1))
+            i = rreplace(i,'_','-',1)
+        os.system('python core.py' + ' "' + i + '"') #选择从py文件启动  （用于源码py）
+        #os.system('core.exe' + ' "' + i + '"')      #选择从exe文件启动（用于EXE版程序）
+        print("[*]=====================================")
+
     print("[!]Cleaning empty folders")
     CEF('JAV_output')
     print("[+]All finished!!!")
     time.sleep(3)
+    

core.py

@@ -73,10 +73,8 @@ def DownloadFileWithFilename(url,filename,path): #path = examle:photo , video.in
         with open(str(path) + "/"+str(filename), "wb") as code:
             code.write(r.content)
     except IOError as e:
-        print("[-]Download Failed1!")
-        print("[-]Error:"+str(e))
-        print("[-]Movie not found in Javbus.com!")
-        print("[*]=====================================")
+        print("[-]Movie not found in All website!")
+        #print("[*]=====================================")
         return "failed"
     except Exception as e1:
         print(e1)