3.32

Dao258 · Feb 6, 2020 · df3e6b7 · df3e6b7
1 parent 011647c
commit df3e6b7
Show file tree

Hide file tree

Showing 6 changed files with 158 additions and 42 deletions.
diff --git a/AVDC.py b/AVDC.py
@@ -56,11 +56,24 @@ def setupUi(self, AVDV):
         self.groupBox_7.setGeometry(QtCore.QRect(10, 140, 751, 121))
         self.groupBox_7.setObjectName("groupBox_7")
         self.label = QtWidgets.QLabel(self.groupBox_7)
-        self.label.setGeometry(QtCore.QRect(230, 30, 511, 71))
+        self.label.setGeometry(QtCore.QRect(230, 60, 511, 41))
         self.label.setObjectName("label")
         self.pushButton_select_file = QtWidgets.QPushButton(self.groupBox_7)
         self.pushButton_select_file.setGeometry(QtCore.QRect(10, 30, 201, 71))
         self.pushButton_select_file.setObjectName("pushButton_select_file")
+        self.comboBox_website = QtWidgets.QComboBox(self.groupBox_7)
+        self.comboBox_website.setGeometry(QtCore.QRect(310, 30, 431, 22))
+        self.comboBox_website.setObjectName("comboBox_website")
+        self.comboBox_website.addItem("")
+        self.comboBox_website.addItem("")
+        self.comboBox_website.addItem("")
+        self.comboBox_website.addItem("")
+        self.comboBox_website.addItem("")
+        self.comboBox_website.addItem("")
+        self.comboBox_website.addItem("")
+        self.label_2 = QtWidgets.QLabel(self.groupBox_7)
+        self.label_2.setGeometry(QtCore.QRect(230, 30, 72, 21))
+        self.label_2.setObjectName("label_2")
         self.stackedWidget.addWidget(self.page_tool)
         self.page_setting = QtWidgets.QWidget()
         self.page_setting.setObjectName("page_setting")
@@ -263,7 +276,7 @@ def setupUi(self, AVDV):
         AVDV.setCentralWidget(self.centralwidget)
 
         self.retranslateUi(AVDV)
-        self.stackedWidget.setCurrentIndex(3)
+        self.stackedWidget.setCurrentIndex(1)
         QtCore.QMetaObject.connectSlotsByName(AVDV)
 
     def retranslateUi(self, AVDV):
@@ -282,6 +295,14 @@ def retranslateUi(self, AVDV):
         self.groupBox_7.setTitle(_translate("AVDV", "单文件刮削"))
         self.label.setText(_translate("AVDV", "选择单个文件(程序目录下或者子目录下)，使用文件名做为番号进行刮削。"))
         self.pushButton_select_file.setText(_translate("AVDV", "选择文件"))
+        self.comboBox_website.setItemText(0, _translate("AVDV", "All websites"))
+        self.comboBox_website.setItemText(1, _translate("AVDV", "javdb"))
+        self.comboBox_website.setItemText(2, _translate("AVDV", "javbus"))
+        self.comboBox_website.setItemText(3, _translate("AVDV", "avsox"))
+        self.comboBox_website.setItemText(4, _translate("AVDV", "fc2club"))
+        self.comboBox_website.setItemText(5, _translate("AVDV", "fanza"))
+        self.comboBox_website.setItemText(6, _translate("AVDV", "siro"))
+        self.label_2.setText(_translate("AVDV", "刮削网站:"))
         self.pushButton_save_config.setText(_translate("AVDV", "保存"))
         self.groupBox_8.setTitle(_translate("AVDV", "命名规则"))
         self.label_43.setText(_translate("AVDV", "   目录命名：             "))

diff --git a/AVDC.ui b/AVDC.ui
@@ -24,7 +24,7 @@
      </rect>
     </property>
     <property name="currentIndex">
-     <number>3</number>
+     <number>1</number>
     </property>
     <widget class="QWidget" name="page_avdc">
      <widget class="QPushButton" name="pushButton_start_cap">
@@ -160,9 +160,9 @@ p, li { white-space: pre-wrap; }
        <property name="geometry">
         <rect>
          <x>230</x>
-         <y>30</y>
+         <y>60</y>
          <width>511</width>
-         <height>71</height>
+         <height>41</height>
         </rect>
        </property>
        <property name="text">
@@ -182,6 +182,64 @@ p, li { white-space: pre-wrap; }
         <string>选择文件</string>
        </property>
       </widget>
+      <widget class="QComboBox" name="comboBox_website">
+       <property name="geometry">
+        <rect>
+         <x>310</x>
+         <y>30</y>
+         <width>431</width>
+         <height>22</height>
+        </rect>
+       </property>
+       <item>
+        <property name="text">
+         <string>All websites</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>javdb</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>javbus</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>avsox</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>fc2club</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>fanza</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>siro</string>
+        </property>
+       </item>
+      </widget>
+      <widget class="QLabel" name="label_2">
+       <property name="geometry">
+        <rect>
+         <x>230</x>
+         <y>30</y>
+         <width>72</width>
+         <height>21</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>刮削网站:</string>
+       </property>
+      </widget>
      </widget>
     </widget>
     <widget class="QWidget" name="page_setting">

diff --git a/AVDC_Main.py b/AVDC_Main.py
@@ -29,7 +29,7 @@ def __init__(self, parent=None):
         self.Ui = Ui_AVDV()  # 实例化 Ui
         self.Ui.setupUi(self)  # 初始化Ui
         self.Init_Ui()
-        self.version = '3.31'
+        self.version = '3.32'
         self.Init()
         self.Load_Config()
         self.show_version()
@@ -175,7 +175,6 @@ def mousePressEvent(self, e):
         if e.button() == Qt.LeftButton:
             self.m_drag = True
             self.m_DragPosition = e.globalPos() - self.pos()
-            e.accept()
             self.setCursor(QCursor(Qt.OpenHandCursor))
 
     def mouseReleaseEvent(self, e):
@@ -281,22 +280,36 @@ def pushButton_select_file_clicked(self):
                                                                    "Movie Files(*.mp4 *.avi *.rmvb "
                                                                    "*.wmv *.mov *.mkv *.flv *.ts *.MP4 *.AVI *.RMVB "
                                                                    "*.WMV *.MOV *.MKV *.FLV *.TS);;All Files(*)")
-
-        self.Ui.stackedWidget.setCurrentIndex(0)
-        try:
-            t = threading.Thread(target=self.select_file_thread, args=(fileName,))
-            t.start()  # 启动线程,即让线程开始执行
-        except Exception as error_info:
-            self.add_text_main('[-]Error in pushButton_select_file_clicked: ' + str(error_info))
+        if fileName != '':
+            self.Ui.stackedWidget.setCurrentIndex(0)
+            try:
+                t = threading.Thread(target=self.select_file_thread, args=(fileName,))
+                t.start()  # 启动线程,即让线程开始执行
+            except Exception as error_info:
+                self.add_text_main('[-]Error in pushButton_select_file_clicked: ' + str(error_info))
 
     def select_file_thread(self, file_name):
         file_root = os.getcwd().replace("\\\\", "/").replace("\\", "/")
         file_path = file_name.replace(file_root, '.').replace("\\\\", "/").replace("\\", "/")
         file_name = os.path.splitext(file_name.split('/')[-1])[0]
-        file_name = getNumber(file_name)
+        mode = 0
+        if self.Ui.comboBox_website.currentText() == 'All websites':
+            mode = 1
+        elif self.Ui.comboBox_website.currentText() == 'javdb':
+            mode = 2
+        elif self.Ui.comboBox_website.currentText() == 'javbus':
+            mode = 3
+        elif self.Ui.comboBox_website.currentText() == 'avsox':
+            mode = 4
+        elif self.Ui.comboBox_website.currentText() == 'fc2club':
+            mode = 5
+        elif self.Ui.comboBox_website.currentText() == 'fanza':
+            mode = 6
+        elif self.Ui.comboBox_website.currentText() == 'siro':
+            mode = 7
         self.add_text_main("[!]Making Data for   [" + file_path + "], the number is [" + file_name + "]")
         try:
-            self.Core_Main(file_path, file_name)
+            self.Core_Main(file_path, file_name, mode)
         except Exception as error_info:
             self.add_text_main('[-]Error in select_file_thread: ' + str(error_info))
         self.add_text_main("[*]======================================================")
@@ -313,7 +326,7 @@ def move_file(self):
     def move_file_thread(self):
         escape_dir = self.Ui.lineEdit_escape_dir_move.text()
         movie_list = movie_lists(escape_dir)
-        self.add_text_main('[+]Move Movies Start! Find ' + str(len(movie_list)) + ' Movies')
+        self.add_text_main('[+]Move Movies Start!')
         for movie in movie_list:
             sour = movie
             lenth = len(sour.split('/'))
@@ -762,7 +775,19 @@ def creatFolder(self, success_folder, json_data, config):
                 return 'error'
         return path
 
-    def Core_Main(self, file_path, number_th):
+    # ========================================================================从指定网站获取json_data
+    def get_json_data(self, mode, number, config):
+        if (mode == 0 and self.Ui.radioButton_all.isChecked()) or mode == 1:
+            json_data = getDataFromJSON(number, config, 1)  # 所有网站
+        elif (mode == 0 and self.Ui.radioButton_javdb.isChecked()) or mode == 2:
+            self.add_text_main('[!]Please Wait Three Seconds！')
+            time.sleep(3)
+            json_data = getDataFromJSON(number, config, 2)  # 仅javdb
+        else:
+            json_data = getDataFromJSON(number, config, mode)  # 仅javbus或仅avsox或仅fc2club或仅fanza或仅siro
+        return json_data
+
+    def Core_Main(self, file_path, number_th, mode):
         # =======================================================================初始化所需变量
         multi_part = 0
         part = ''
@@ -781,14 +806,8 @@ def Core_Main(self, file_path, number_th):
         program_mode = Config['common']['main_mode']  # 运行模式
         failed_folder = Config['common']['failed_output_folder']  # 失败输出目录
         success_folder = Config['common']['success_output_folder']  # 成功输出目录
-        # =======================================================================抓取网站设置
-        json_data = {}
-        if self.Ui.radioButton_all.isChecked():
-            json_data = getDataFromJSON(number, Config, 1)  # 所有网站
-        elif self.Ui.radioButton_javdb.isChecked():
-            self.add_text_main('[!]Please Wait Three Seconds！')
-            time.sleep(3)
-            json_data = getDataFromJSON(number, Config, 2)  # 仅javdb
+        # =======================================================================获取json_data
+        json_data = self.get_json_data(mode, number, Config)
         # =======================================================================是否找到影片信息
         if json_data['website'] == 'timeout':
             self.add_text_main('[-]Connect Failed! Please check your Proxy or Network!')
@@ -824,7 +843,8 @@ def Core_Main(self, file_path, number_th):
         if program_mode == '1':
             if multi_part == 1:
                 number += part  # 这时number会被附加上-CDx后缀
-            self.smallCoverCheck(path, number, json_data['imagecut'], json_data['cover_small'], c_word, option, Config, filepath,
+            self.smallCoverCheck(path, number, json_data['imagecut'], json_data['cover_small'], c_word, option, Config,
+                                 filepath,
                                  failed_folder)  # 检查小封面
             self.imageDownload(option, json_data['cover'], number, c_word, path, multi_part, Config, filepath,
                                failed_folder)  # creatFoder会返回番号路径
@@ -906,7 +926,7 @@ def AVDC_Main(self):
             self.add_text_main('[!] - ' + percentage + ' [' + str(count) + '/' + count_all + '] -')
             try:
                 self.add_text_main("[!]Making Data for   [" + movie + "], the number is [" + getNumber(movie) + "]")
-                self.Core_Main(movie, getNumber(movie))
+                self.Core_Main(movie, getNumber(movie), 0)
                 self.add_text_main("[*]======================================================")
             except Exception as error_info:
                 self.add_text_main('[-]Error in AVDC_Main: ' + str(error_info))

diff --git a/AV_Data_Capture.py b/AV_Data_Capture.py
@@ -39,10 +39,14 @@ def getNumber(filepath):
         filename = str(re.sub("\[\d{4}-\d{1,2}-\d{1,2}\] - ", "", filepath))  # 去除文件名中时间
         if 'FC2' or 'fc2' in filename:
             filename = filename.replace('-PPV', '').replace('PPV-', '').replace('-ppv', '').replace('ppv-', '')
-        try:
+        if re.search('\w+-\d+', filename):  # 提取类似mkbd-120番号
             file_number = re.search('\w+-\d+', filename).group()
-        except:  # 提取类似mkbd-s120番号
+        elif re.search('\w+-\w+\d+', filename):  # 提取类似mkbd-s120番号
             file_number = re.search('\w+-\w+\d+', filename).group()
+        elif re.search('\d+-\w+', filename):  # 提取类似 111111-MMMM 番号
+            file_number = re.search('\d+-\w+', filename).group()
+        elif re.search('\d+-\d+', filename):  # 提取类似 111111-000 番号
+            file_number = re.search('\d+-\d+', filename).group()
         return file_number
     else:  # 提取不含减号-的番号，FANZA CID 保留ssni00644，将MIDE139改成MIDE-139
         try:

diff --git a/core.py b/core.py
@@ -30,6 +30,8 @@ def getDataFromJSON(file_number, config, mode):  # 从JSON返回元数据
             json_data = json.loads(avsox.main(file_number))
             if getDataState(json_data) == 0:  # 如果元数据获取失败，请求番号至其他网站抓取
                 json_data = json.loads(javdb.main(file_number))
+            if getDataState(json_data) == 0:  # 如果元数据获取失败，请求番号至其他网站抓取
+                json_data = json.loads(javbus.main(file_number))
         # ==
         elif re.match('\d+\D+', file_number):  # 259LUXU-1111
             json_data = json.loads(siro.main(file_number))
@@ -41,6 +43,8 @@ def getDataFromJSON(file_number, config, mode):  # 从JSON返回元数据
         elif 'fc2' in file_number or 'FC2' in file_number:  # FC2-111111
             json_data = json.loads(fc2fans_club.main(
                 file_number.replace('fc2-', '').replace('fc2_', '').replace('FC2-', '').replace('fc2_', '')))
+            if getDataState(json_data) == 0:  # 如果元数据获取失败，请求番号至其他网站抓取
+                json_data = json.loads(javdb.main(file_number))
         # ==
         elif 'HEYZO' in file_number or 'heyzo' in file_number or 'Heyzo' in file_number:  # HEYZO-1111
             json_data = json.loads(avsox.main(file_number))
@@ -55,19 +59,28 @@ def getDataFromJSON(file_number, config, mode):  # 从JSON返回元数据
                 json_data = json.loads(avsox.main(file_number))
             if getDataState(json_data) == 0:  # 如果元数据获取失败，请求番号至其他网站抓取
                 json_data = json.loads(javdb.main(file_number))
-    elif mode == 2:  # 仅从JAVDB
-        if re.match('\D{2,}00\d{3,}', file_number):  # ssni00321
-            json_data = {
-                'title': '',
-                'actor': '',
-                'website': '',
-            }
-        else:
-            json_data = json.loads(javdb.main(file_number))
+    elif mode != 6 and re.match('\D{2,}00\d{3,}', file_number):
+        json_data = {
+            'title': '',
+            'actor': '',
+            'website': '',
+        }
+    elif mode == 2:  # 仅从javdb
+        json_data = json.loads(javdb.main(file_number))
+    elif mode == 3:  # 仅从javbus
+        json_data = json.loads(javbus.main(file_number))
+    elif mode == 4:  # 仅从avsox
+        json_data = json.loads(avsox.main(file_number))
+    elif mode == 5:  # 仅从fc2club
+        json_data = json.loads(fc2fans_club.main(file_number))
+    elif mode == 6:  # 仅从fanza
+        json_data = json.loads(fanza.main(file_number))
+    elif mode == 7:  # 仅从siro
+        json_data = json.loads(siro.main(file_number))
 
     # ================================================网站规则添加结束================================================
-    # ======================================超时或未找到
     # print(json_data)
+    # ======================================超时或未找到
     if json_data['website'] == 'timeout':
         return json_data
     elif json_data['title'] == '':

diff --git a/update_check.json b/update_check.json
@@ -1,5 +1,5 @@
 {
-	"version": "3.31",
-	"version_show":"3.31",
+	"version": "3.32",
+	"version_show":"3.32",
 	"download": "https://github.com/moyy996/AVDC/releases"
 }