V3.96

moyy996 · moyy996 · commit 3b83e948c5dc · 2020-06-29T16:36:13.000+08:00
修复FC2番号识别错误
diff --git a/AVDC_Main.py b/AVDC_Main.py
@@ -33,7 +33,7 @@ def __init__(self, parent=None):
         self.Init_Ui()
         self.set_style()
         # 初始化需要的变量
-        self.version = '3.95'
+        self.version = '3.96'
         self.m_drag = False
         self.m_DragPosition = 0
         self.count_claw = 0  # 批量刮削次数
@@ -282,7 +282,7 @@ def init_config_clicked(self):
             'website': 'all',
             'failed_output_folder': 'failed',
             'success_output_folder': 'JAV_output',
-            'proxy': '127.0.0.1:10809',
+            'proxy': '',
             'timeout': 7,
             'retry': 3,
             'folder_name': 'actor/number-title-release',
@@ -292,7 +292,7 @@ def init_config_clicked(self):
             'folders': 'failed,JAV_output',
             'string': '1080p,720p,22-sht.me,-HD',
             'emby_url': 'localhost:8096',
-            'api_key': 'bb2e96d99cbf471ea83065d40b229fc1',
+            'api_key': '',
             'media_path': 'E:/TEMP',
             'media_type': '.mp4|.avi|.rmvb|.wmv|.mov|.mkv|.flv|.ts|.webm|.MP4|.AVI|.RMVB|.WMV|.MOV|.MKV|.FLV|.TS|.WEBM',
             'sub_type': '.smi|.srt|.idx|.sub|.sup|.psb|.ssa|.ass|.txt|.usf|.xss|.ssf|.rt|.lrc|.sbv|.vtt|.ttml',
diff --git a/Function/Function.py b/Function/Function.py
@@ -106,7 +106,9 @@ def getNumber(filepath, escape_string):
     elif '-' in filename or '_' in filename:  # 普通提取番号 主要处理包含减号-和_的番号
         if 'FC2' or 'fc2' in filename:
             filename = filename.upper().replace('PPV', '').replace('--', '-')
-        if re.search('[a-zA-Z]+-\d+', filename):  # 提取类似mkbd-120番号
+        if re.search('FC2-\d{5,}', filename):  # 提取类似mkbd-120番号
+            file_number = re.search('FC2-\d{5,}', filename).group()
+        elif re.search('[a-zA-Z]+-\d+', filename):  # 提取类似mkbd-120番号
             file_number = re.search('\w+-\d+', filename).group()
         elif re.search('\d+[a-zA-Z]+-\d+', filename):  # 提取类似259luxu-1111番号
             file_number = re.search('\d+[a-zA-Z]+-\d+', filename).group()
diff --git a/Ui/AVDC.py b/Ui/AVDC.py
@@ -2,9 +2,10 @@
 
 # Form implementation generated from reading ui file 'AVDC.ui'
 #
-# Created by: PyQt5 UI code generator 5.13.0
+# Created by: PyQt5 UI code generator 5.15.0
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
 from PyQt5 import QtCore, QtGui, QtWidgets
@@ -773,13 +774,13 @@ def setupUi(self, AVDV):
         AVDV.setCentralWidget(self.centralwidget)
 
         self.retranslateUi(AVDV)
-        self.stackedWidget.setCurrentIndex(2)
+        self.stackedWidget.setCurrentIndex(1)
         self.tabWidget.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(AVDV)
 
     def retranslateUi(self, AVDV):
         _translate = QtCore.QCoreApplication.translate
-        AVDV.setWindowTitle(_translate("AVDV", "AVDC-3.95"))
+        AVDV.setWindowTitle(_translate("AVDV", "AVDC-3.96"))
         self.pushButton_start_cap.setText(_translate("AVDV", "开始"))
         self.textBrowser_warning.setHtml(_translate("AVDV", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
@@ -825,18 +826,18 @@ def retranslateUi(self, AVDV):
         self.comboBox_website.setItemText(7, _translate("AVDV", "xcity"))
         self.comboBox_website.setItemText(8, _translate("AVDV", "dmm"))
         self.label_2.setText(_translate("AVDV", "刮削网站:"))
-        self.groupBox_12.setTitle(_translate("AVDV", "Emby-女优头像"))
+        self.groupBox_12.setTitle(_translate("AVDV", "Emby-演员头像"))
         self.pushButton_add_actor_pic.setText(_translate("AVDV", "添加头像"))
         self.label_3.setText(_translate("AVDV", "Emby地址："))
         self.label_4.setText(_translate("AVDV", "API密钥："))
         self.label_5.setText(_translate("AVDV", "说明:\n"
 "   1、头像请放在程序目录(AVDC目录)下的Actor目录中。\n"
 "   2、密钥创建方法：Emby控制台->高级->API密钥->添加(APP名称任意)。"))
         self.pushButton_show_pic_actor.setText(_translate("AVDV", "查看"))
-        self.comboBox_pic_actor.setItemText(0, _translate("AVDV", "可添加头像的女优"))
-        self.comboBox_pic_actor.setItemText(1, _translate("AVDV", "没有头像的女优"))
-        self.comboBox_pic_actor.setItemText(2, _translate("AVDV", "已有头像的女优"))
-        self.comboBox_pic_actor.setItemText(3, _translate("AVDV", "所有女优"))
+        self.comboBox_pic_actor.setItemText(0, _translate("AVDV", "可添加头像的演员"))
+        self.comboBox_pic_actor.setItemText(1, _translate("AVDV", "没有头像的演员"))
+        self.comboBox_pic_actor.setItemText(2, _translate("AVDV", "已有头像的演员"))
+        self.comboBox_pic_actor.setItemText(3, _translate("AVDV", "所有演员"))
         self.groupBox_13.setTitle(_translate("AVDV", "裁剪封面图"))
         self.pushButton_select_thumb.setText(_translate("AVDV", "选择缩略图"))
         self.label_6.setText(_translate("AVDV", "说明:\n"
diff --git a/Ui/AVDC.ui b/Ui/AVDC.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>AVDC-3.95</string>
+   <string>AVDC-3.96</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <widget class="QStackedWidget" name="stackedWidget">
@@ -24,7 +24,7 @@
      </rect>
     </property>
     <property name="currentIndex">
-     <number>2</number>
+     <number>1</number>
     </property>
     <widget class="QWidget" name="page_avdc">
      <widget class="QPushButton" name="pushButton_start_cap">
@@ -711,7 +711,7 @@ p, li { white-space: pre-wrap; }
        </rect>
       </property>
       <property name="title">
-       <string>Emby-女优头像</string>
+       <string>Emby-演员头像</string>
       </property>
       <widget class="QPushButton" name="pushButton_add_actor_pic">
        <property name="geometry">
@@ -811,22 +811,22 @@ p, li { white-space: pre-wrap; }
        </property>
        <item>
         <property name="text">
-         <string>可添加头像的女优</string>
+         <string>可添加头像的演员</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>没有头像的女优</string>
+         <string>没有头像的演员</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>已有头像的女优</string>
+         <string>已有头像的演员</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>所有女优</string>
+         <string>所有演员</string>
         </property>
        </item>
       </widget>
diff --git a/config.ini b/config.ini
@@ -9,7 +9,7 @@ website = all
 # all or mgstage or fc2club or javbus or jav321 or javdb or avsox or xcity or dmm
 
 [proxy]
-proxy = 127.0.0.1:10809
+proxy = 
 timeout = 7
 retry = 3
 
@@ -39,7 +39,7 @@ switch = 1
 
 [emby]
 emby_url = localhost:8096
-api_key = bb2e96d99cbf471ea83065d40b229fc1
+api_key = 
 
 [mark]
 poster_mark = 1
diff --git a/py-require.txt b/py-require.txt
@@ -4,4 +4,5 @@ pyqt5-tools
 pillow
 bs4
 pyquery
-requests
+requests
+baidu-aip
diff --git a/update_check.json b/update_check.json
@@ -1,5 +1,5 @@
 {
-	"version": "3.95",
-	"version_show":"3.95",
+	"version": "3.96",
+	"version_show":"3.96",
 	"download": "https://github.com/moyy996/AVDC/releases"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "3.95",`
`3`		`- "version_show":"3.95",`
	`2`	`+ "version": "3.96",`
	`3`	`+ "version_show":"3.96",`
`4`	`4`	`"download": "https://github.com/moyy996/AVDC/releases"`
`5`	`5`	`}`