Update Beta 11.9

AV_Data_Capture.py

@@ -14,7 +14,7 @@ os.chdir(os.getcwd())
 
 # ============global var===========
 
-version='0.11.8'
+version='0.11.9'
 
 config = ConfigParser()
 config.read(config_file, encoding='UTF-8')
@@ -37,6 +37,26 @@ def UpdateCheck():
         print('[+]Update Check disabled!')
 def movie_lists():
     directory = config['directory_capture']['directory']
+    a2=[]
+    b2=[]
+    c2=[]
+    d2=[]
+    e2=[]
+    f2=[]
+    g2=[]
+    h2=[]
+    if directory=='*':
+        for i in os.listdir(os.getcwd()):
+            a2 += glob.glob(r"./" + i + "/*.mp4")
+            b2 += glob.glob(r"./" + i + "/*.avi")
+            c2 += glob.glob(r"./" + i + "/*.rmvb")
+            d2 += glob.glob(r"./" + i + "/*.wmv")
+            e2 += glob.glob(r"./" + i + "/*.mov")
+            f2 += glob.glob(r"./" + i + "/*.mkv")
+            g2 += glob.glob(r"./" + i + "/*.flv")
+            h2 += glob.glob(r"./" + i + "/*.ts")
+        total = a2 + b2 + c2 + d2 + e2 + f2 + g2 + h2
+        return total
     a2 = glob.glob(r"./" + directory + "/*.mp4")
     b2 = glob.glob(r"./" + directory + "/*.avi")
     c2 = glob.glob(r"./" + directory + "/*.rmvb")
@@ -139,6 +159,7 @@ if __name__ =='__main__':
             print('[-]' + i + ' Cannot catch the number :')
             print('[-]Move ' + i + ' to failed folder')
             shutil.move(i, str(os.getcwd()) + '/' + 'failed/')
+            continue
 
 
     CEF('JAV_output')

core.py

@@ -101,8 +101,9 @@ def getDataFromJSON(file_number): #从JSON返回元数据
             json_data = json.loads(fc2fans_club.main(file_number.strip('fc2_').strip('fc2-').strip('ppv-').strip('PPV-').strip('FC2_').strip('FC2-').strip('ppv-').strip('PPV-')))
         elif 'FC2' in file_number:
             json_data = json.loads(fc2fans_club.main(file_number.strip('FC2_').strip('FC2-').strip('ppv-').strip('PPV-').strip('fc2_').strip('fc2-').strip('ppv-').strip('PPV-')))
-        elif 'siro' in number or 'SIRO' in number or 'Siro' in number:
+        # =======================siro.py=========================
-            json_data = json_data(siro.main(file_number))
+        elif 'siro' in file_number or 'SIRO' in file_number or 'Siro' in file_number:
+            json_data = json.loads(siro.main(file_number))
         # =======================javbus.py=======================
         else:
             json_data = json.loads(javbus.main(file_number))

javbus.py

@@ -89,7 +89,7 @@ def getTag(htmlcode):  # 获取演员
 
 def main(number):
     try:
-        if re.search('\d+\D+', number).group() in number or 'siro' in number or 'SIRO' in number or 'Siro' in number:
+        if re.search('\d+\D+', number).group() in number:
             js = siro.main(number)
             return js
     except: