diff --git a/AVDC.py b/AVDC.py
index 39cf07153..f46bc28c7 100644
--- a/AVDC.py
+++ b/AVDC.py
@@ -467,7 +467,7 @@ def setupUi(self, AVDV):
AVDV.setCentralWidget(self.centralwidget)
self.retranslateUi(AVDV)
- self.stackedWidget.setCurrentIndex(1)
+ self.stackedWidget.setCurrentIndex(3)
QtCore.QMetaObject.connectSlotsByName(AVDV)
def retranslateUi(self, AVDV):
@@ -610,13 +610,33 @@ def retranslateUi(self, AVDV):
"6、命名规则
\n"
" 1、目录命名：存放视频数据的目录名，支持多层目录，支持自定义符号，例：[actor]/studio/number-【title】。
\n"
" 2、视频标题：nfo中的标题命名。例：number-[title]。可以自定义符号。
\n"
-" 可选项为title（片名）、actor（演员）、studio（公司）、director（导演）、release（发售日）、year（发行年份）、numbe（番号）、runtime（时长）、label（系列）
\n"
+" 3、可选项为title（片名）、actor（演员）、studio（制作商）、director（导演）、release（发售日）、year（发行年份）、number（番号）、runtime（时长）、series（系列）、publisher（发行商）
\n"
"
\n"
"7、网站选择
\n"
" 1、All website: 使用avsox,javbus,fanza,javdb,fc2club进行刮削。
2、Only javdb: 仅使用javdb进行刮削。
\n"
"
\n"
"四、更新日志
\n"
"
\n"
+"3.7
\n"
+"2020-02-15 19:30更新
\n"
+"可选项变更：title（片名）、actor（演员）、studio（制作商）、director（导演）、release（发售日）、year（发行年份）、number（番号）、runtime（时长）、series（系列）、publisher（发行商）
\n"
+"修复：
\n"
+" 1、修改javbus的抓取逻辑，成功率提高。
\n"
+" 2、更新进度条改为刮削完之后。
\n"
+" 3、不再强制替换‘_’为‘-’。
\n"
+" 4、EMBY添加头像时，演员有别名，中文符号导致添加失败。
\n"
+" 5、修复字幕移动，与视频文件同名的字幕，刮削完后会随视频一起移动。
\n"
+"新增：
\n"
+" 1、自定义本地文件名。
\n"
+" 2、获取制作商，发行商。
\n"
+" 3、标签加入系列、发行商、制作商(太多标签EMBY只显示一部分)。
\n"
+" 4、小工具-视频移动，会移动与视频文件同名的字幕。
\n"
+"
\n"
+"3.61
\n"
+"2020-02-12-15:40更新
\n"
+"修复：
\n"
+" 1、演员过多导致文件夹创建失败。(只取前三个)
2、avsox有多个封面图时导致失败。
3、主页面-封面开关不管用。
4、制作商、导演抓取错误。
\n"
+"
\n"
"3.6
\n"
"2020-02-11 晚23点更新
\n"
"新增：
\n"
diff --git a/AVDC.ui b/AVDC.ui
index cc1add03a..906eb2239 100644
--- a/AVDC.ui
+++ b/AVDC.ui
@@ -24,7 +24,7 @@
- 1
+ 3
@@ -1325,13 +1325,33 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:12pt; font-weight:600;">6、命名规则</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:9.5pt; font-weight:600; background-color:#ffffff;"> 1、</span><span style=" font-family:'宋体'; font-size:9.5pt; font-weight:600; color:#ff0000; background-color:#ffffff;">目录命名</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">：存放视频数据的目录名，支持</span><span style=" font-family:'宋体'; font-size:9.5pt; font-weight:600; color:#ff0000; background-color:#ffffff;">多层目录</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">，支持</span><span style=" font-family:'宋体'; font-size:9.5pt; font-weight:600; color:#ff0000; background-color:#ffffff;">自定义符号</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">，例：[actor]/studio/number-【title】。</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:9.5pt; font-weight:600; background-color:#ffffff;"> 2、</span><span style=" font-family:'宋体'; font-size:9.5pt; font-weight:600; color:#ff0000; background-color:#ffffff;">视频标题</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">：nfo中的标题命名。例：</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">number-</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">[</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">title</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">]。可以自定义符号。</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> 可选项为</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#ff0000; background-color:#ffffff;">title</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">（片名）、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#ff0000; background-color:#ffffff;">actor</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">（演员）、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#ff0000; background-color:#ffffff;">studio</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">（公司）、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#ff0000; background-color:#ffffff;">director</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">（导演）、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#ff0000; background-color:#ffffff;">release</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">（发售日）、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#ff0000; background-color:#ffffff;">year</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">（发行年份）、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#ff0000; background-color:#ffffff;">numbe</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">（番号）、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#ff0000; background-color:#ffffff;">runtime</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">（时长）、</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#ff0000; background-color:#ffffff;">label</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">（系列）</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> </span><span style=" font-family:'宋体'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">3、</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">可选项为</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">title（片名）、actor（演员）、studio（制作商）、director（导演）、release（发售日）、year（发行年份）、number（番号）、runtime（时长）、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">series（系列）、publisher（发行商）</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e;"> </span></p>
<h4 style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:12pt; font-weight:600;">7、网站选择</span></h4>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> 1</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#ff0000; background-color:#ffffff;">All website</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">: </span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">使用</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">avsox,javbus,fanza,javdb,fc2club</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">进行刮削。</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"><br /> 2</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#ff0000; background-color:#ffffff;">Only javdb</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">: </span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">仅使用</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">javdb</span><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">进行刮削。</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:9.5pt; color:#24292e;"> </span></p>
<h1 style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:22pt; font-weight:600;">四、更新日志</span></h1>
<h1 style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'宋体'; font-size:22pt; font-weight:600;"><br /></h1>
+<h1 style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:18pt; font-weight:600; color:#ff0000;">3.7</span></h1>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:11pt; font-weight:600;">2020-02-15 19:30更新</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:11pt; font-weight:600; color:#24292e; background-color:#ffffff;">可选项变更：</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">title（片名）、actor（演员）、studio（制作商）、director（导演）、release（发售日）、year（发行年份）、number（番号）、runtime（时长）、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">series（系列）、publisher（发行商）</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:11pt; font-weight:600; color:#24292e; background-color:#ffffff;">修复：</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> 1、修改javbus的抓取逻辑，成功率提高。</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> 2、更新</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">进度条</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">改为刮削完之后。</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> 3、不再强制替换‘_’为‘-’。</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> 4、EMBY添加头像时，演员有别名，</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">中文符号</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">导致添加失败。</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> 5、修复字幕移动，与视频文件同名的</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">字幕</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">，刮削完后会随视频一起移动。</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:11pt; font-weight:600; color:#24292e; background-color:#ffffff;">新增：</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> 1、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">自定义本地文件名</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">。</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> 2、获取</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">制作商，发行商</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">。</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> 3、标签加入</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">系列、发行商、制作商</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">(太多标签EMBY只显示一部分)。</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> 4、小工具-</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">视频移动</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">，会移动与视频文件同名的</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">字幕</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">。</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> </span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:18pt; font-weight:600; color:#ff0000;">3.61</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:11pt; font-weight:600;">2020-02-12-15:40更新</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:11pt; font-weight:600; color:#24292e; background-color:#ffffff;">修复：</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;"> 1、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">演员过多</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">导致文件夹创建失败。(只取</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">前三个</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">)<br /> 2、avsox有多个封面图时导致失败。<br /> 3、主页面-</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">封面开关</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">不管用。<br /> 4、</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; font-weight:600; color:#24292e; background-color:#ffffff;">制作商、导演</span><span style=" font-family:'Segoe UI'; font-size:9.5pt; color:#24292e; background-color:#ffffff;">抓取错误。</span></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Segoe UI'; font-size:9.5pt; color:#24292e;"><br /></p>
<h1 style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:18pt; font-weight:600; color:#ff0000;">3.6</span></h1>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'宋体'; font-size:11pt; font-weight:600;">2020-02-11 晚23点更新</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Segoe UI'; font-size:11pt; font-weight:600; color:#24292e; background-color:#ffffff;">新增：</span></p>
diff --git a/AVDC_Main.py b/AVDC_Main.py
index dac62019a..581111cfa 100644
--- a/AVDC_Main.py
+++ b/AVDC_Main.py
@@ -499,7 +499,7 @@ def move_file_thread(self):
# ========================================================================小工具-emby女优头像
def pushButton_add_actor_pic_clicked(self): # 添加头像按钮响应
- self.Ui.stackedWidget.setCurrentIndex(0)
+ self.Ui.stackedWidget.setCurrentIndex(4)
emby_url = self.Ui.lineEdit_emby_url.text()
api_key = self.Ui.lineEdit_api_key.text()
if emby_url == '':
@@ -517,7 +517,7 @@ def pushButton_add_actor_pic_clicked(self): # 添加头像按钮响应
self.add_text_main('[-]Error in pushButton_add_actor_pic_clicked: ' + str(error_info))
def pushButton_show_pic_actor_clicked(self): # 查看按钮响应
- self.Ui.stackedWidget.setCurrentIndex(0)
+ self.Ui.stackedWidget.setCurrentIndex(4)
emby_url = self.Ui.lineEdit_emby_url.text()
api_key = self.Ui.lineEdit_api_key.text()
if emby_url == '':