Merge pull request #13 from Zeal-L/develop

Develop

README.md

@@ -32,7 +32,7 @@
 - **可配置的多线程下载，速度拉满！**
 - **实现了应对网络波动等情况的异常重试，以及应用了指数级退让来避免在短时间大量重试被拉黑名单**
 - **本地漫画管理功能，一键检查更新！**
-- **通过正则匹配过滤重复的章节名称内容！**
+- **通过正则匹配过滤重复的章节名称内容，以及过滤非法字符！**
 - **提供多种可选的保存格式：**
   - PDF
   - 7z压缩包
@@ -127,6 +127,10 @@
   - 是否更改依赖性
 
 ## ⚰️ 更新记录
+### v1.0.3 - *2022-03-12*
+- 修复bug：使用7z保存时可能会因为文件名特殊字符引起报错；添加针对“.”的正则过滤
+- 优化配置：全局网络请求的 timeout 以及 max retry 值增大一倍
+
 ### v1.0.2 - *2022-03-11*
 - 修复bug：总进度条数值错误更新为0
 - 优化设置选项：以防在网络不好的情况下高线程数导致的频繁重试警告，最大线程数现在设为32
@@ -140,7 +144,7 @@
 - 所有基本功能都测试可用
 
 ## 🍻 联系方式
-欢迎进群讨论程序，漫画，~~(资源分享)~~, 提交问题等等
+欢迎进群讨论程序，漫画，资源分享, 提交问题等等
 - Q群号：244029317
 
 ## 🙈 PS

src/Episode.py

@@ -39,8 +39,11 @@ def __init__(self, episode: dict, sessData: str, comic_id: str, comic_info: dict
         #? 修复标题中的特殊字符
         episode['short_title'] = re.sub(r'[\\/:*?"<>|]', ' ', episode['short_title'])
         episode['short_title'] = re.sub(r'\s+$', '', episode['short_title'])
+        episode['short_title'] = re.sub(r'\.', '·', episode['short_title'])
         episode['title'] =  re.sub(r'[\\/:*?"<>|]', ' ', episode['title'])
         episode['title'] =  re.sub(r'\s+$', '', episode['title'])
+        episode['title'] =  re.sub(r'\.', '·', episode['title'])
+
 
         #?###########################################################
         #? 修复重复标题

src/ui/myAbout.ui

@@ -33,7 +33,7 @@
      <item>
       <widget class="QLabel" name="outline">
        <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:16pt; font-weight:700; color:#00aaff;&quot;&gt;哔哩哔哩&lt;/span&gt;&lt;span style=&quot; font-size:16pt; font-weight:700;&quot;&gt;漫画下载器 &lt;/span&gt;&lt;span style=&quot; font-size:16pt; font-weight:700; color:#aa00ff;&quot;&gt;v1.0.2&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:700;&quot;&gt;作者：Zeal-L&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:700;&quot;&gt;项目地址：&lt;/span&gt;&lt;a href=&quot;https://github.com/Zeal-L/BiliBili-Manga-Downloader&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/Zeal-L/BiliBili-Manga-Downloader&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:700;&quot;&gt;本程序仅供学习交流使用，严禁用于商业用途&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:16pt; font-weight:700; color:#00aa00;&quot;&gt;联系方式：&lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:700;&quot;&gt;Q群号：&lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:700; color:#aa00ff;&quot;&gt;244029317&lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:700;&quot;&gt;&lt;br/&gt;欢迎进群讨论程序，漫画，资源分享, 提交问题等等&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt; font-weight:700;&quot;&gt;-- LICENSE --&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt;&quot;&gt;BiliBili-Manga-Downloader&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt;&quot;&gt;Copyright (C) 2023 Zeal L&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt;&quot;&gt;This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt;&quot;&gt;This program is distributed in the hope that it will be useful,but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt;&quot;&gt;You should have received a copy of the GNU Affero General Public License along with this program. If not, see &lt;/span&gt;&lt;a href=&quot;https://www.gnu.org/licenses&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.gnu.org/licenses&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:16pt; font-weight:700; color:#00aaff;&quot;&gt;哔哩哔哩&lt;/span&gt;&lt;span style=&quot; font-size:16pt; font-weight:700;&quot;&gt;漫画下载器 &lt;/span&gt;&lt;span style=&quot; font-size:16pt; font-weight:700; color:#aa00ff;&quot;&gt;v1.0.3&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:700;&quot;&gt;作者：Zeal-L&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:700;&quot;&gt;项目地址：&lt;/span&gt;&lt;a href=&quot;https://github.com/Zeal-L/BiliBili-Manga-Downloader&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/Zeal-L/BiliBili-Manga-Downloader&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:700;&quot;&gt;本程序仅供学习交流使用，严禁用于商业用途&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:16pt; font-weight:700; color:#00aa00;&quot;&gt;联系方式：&lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:700;&quot;&gt;Q群号：&lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:700; color:#aa00ff;&quot;&gt;244029317&lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:700;&quot;&gt;&lt;br/&gt;欢迎进群讨论程序，漫画，资源分享, 提交问题等等&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt; font-weight:700;&quot;&gt;-- LICENSE --&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt;&quot;&gt;BiliBili-Manga-Downloader&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt;&quot;&gt;Copyright (C) 2023 Zeal L&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt;&quot;&gt;This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt;&quot;&gt;This program is distributed in the hope that it will be useful,but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt;&quot;&gt;You should have received a copy of the GNU Affero General Public License along with this program. If not, see &lt;/span&gt;&lt;a href=&quot;https://www.gnu.org/licenses&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.gnu.org/licenses&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'HYWenHei-85W'; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="wordWrap">
         <bool>true</bool>

src/ui/ui_myAbout.py

@@ -55,7 +55,7 @@ def setupUi(self, My_about):
     def retranslateUi(self, My_about):
         My_about.setWindowTitle(QCoreApplication.translate("My_about", u"Form", None))
         self.label.setText("")
-        self.outline.setText(QCoreApplication.translate("My_about", u"<html><head/><body><p align=\"center\"><span style=\" font-size:16pt; font-weight:700; color:#00aaff;\">\u54d4\u54e9\u54d4\u54e9</span><span style=\" font-size:16pt; font-weight:700;\">\u6f2b\u753b\u4e0b\u8f7d\u5668 </span><span style=\" font-size:16pt; font-weight:700; color:#aa00ff;\">v1.0.2</span></p><p align=\"center\"><span style=\" font-size:14pt; font-weight:700;\">\u4f5c\u8005\uff1aZeal-L</span></p><p align=\"center\"><span style=\" font-size:12pt; font-weight:700;\">\u9879\u76ee\u5730\u5740\uff1a</span><a href=\"https://github.com/Zeal-L/BiliBili-Manga-Downloader\"><span style=\" font-size:12pt; text-decoration: underline; color:#0000ff;\">https://github.com/Zeal-L/BiliBili-Manga-Downloader</span></a></p><p align=\"center\"><span style=\" font-size:12pt; font-weight:700;\">\u672c\u7a0b\u5e8f\u4ec5\u4f9b\u5b66\u4e60\u4ea4\u6d41\u4f7f\u7528\uff0c\u4e25\u7981\u7528\u4e8e\u5546\u4e1a\u7528\u9014</span></p><p align=\"center\"><span style=\" font-size:16pt; font-weight:700; color:#00aa00;\">\u8054\u7cfb\u65b9"
+        self.outline.setText(QCoreApplication.translate("My_about", u"<html><head/><body><p align=\"center\"><span style=\" font-size:16pt; font-weight:700; color:#00aaff;\">\u54d4\u54e9\u54d4\u54e9</span><span style=\" font-size:16pt; font-weight:700;\">\u6f2b\u753b\u4e0b\u8f7d\u5668 </span><span style=\" font-size:16pt; font-weight:700; color:#aa00ff;\">v1.0.3</span></p><p align=\"center\"><span style=\" font-size:14pt; font-weight:700;\">\u4f5c\u8005\uff1aZeal-L</span></p><p align=\"center\"><span style=\" font-size:12pt; font-weight:700;\">\u9879\u76ee\u5730\u5740\uff1a</span><a href=\"https://github.com/Zeal-L/BiliBili-Manga-Downloader\"><span style=\" font-size:12pt; text-decoration: underline; color:#0000ff;\">https://github.com/Zeal-L/BiliBili-Manga-Downloader</span></a></p><p align=\"center\"><span style=\" font-size:12pt; font-weight:700;\">\u672c\u7a0b\u5e8f\u4ec5\u4f9b\u5b66\u4e60\u4ea4\u6d41\u4f7f\u7528\uff0c\u4e25\u7981\u7528\u4e8e\u5546\u4e1a\u7528\u9014</span></p><p align=\"center\"><span style=\" font-size:16pt; font-weight:700; color:#00aa00;\">\u8054\u7cfb\u65b9"
                         "\u5f0f\uff1a</span><span style=\" font-size:12pt; font-weight:700;\">Q\u7fa4\u53f7\uff1a</span><span style=\" font-size:12pt; font-weight:700; color:#aa00ff;\">244029317</span><span style=\" font-size:12pt; font-weight:700;\"><br/>\u6b22\u8fce\u8fdb\u7fa4\u8ba8\u8bba\u7a0b\u5e8f\uff0c\u6f2b\u753b\uff0c\u8d44\u6e90\u5206\u4eab, \u63d0\u4ea4\u95ee\u9898\u7b49\u7b49</span></p><p align=\"center\"><span style=\" font-family:'HYWenHei-85W'; font-size:12pt; font-weight:700;\">-- LICENSE --</span></p><p align=\"center\"><span style=\" font-family:'HYWenHei-85W'; font-size:12pt;\">BiliBili-Manga-Downloader</span></p><p align=\"center\"><span style=\" font-family:'HYWenHei-85W'; font-size:12pt;\">Copyright (C) 2023 Zeal L</span></p><p align=\"center\"><span style=\" font-family:'HYWenHei-85W'; font-size:12pt;\">This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or ("
                         "at your option) any later version.</span></p><p align=\"center\"><span style=\" font-family:'HYWenHei-85W'; font-size:12pt;\">This program is distributed in the hope that it will be useful,but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.</span></p><p align=\"center\"><span style=\" font-family:'HYWenHei-85W'; font-size:12pt;\">You should have received a copy of the GNU Affero General Public License along with this program. If not, see </span><a href=\"https://www.gnu.org/licenses\"><span style=\" font-size:12pt; text-decoration: underline; color:#0000ff;\">https://www.gnu.org/licenses</span></a><span style=\" font-family:'HYWenHei-85W'; font-size:12pt;\">.</span></p><p><br/></p></body></html>", None))
     # retranslateUi

src/utils.py

@@ -6,19 +6,19 @@
 from logging.handlers import TimedRotatingFileHandler
 
 __app_name__ = "BiliBili-Manga-Downloader"
-__version__ = "1.0.2"
+__version__ = "1.0.3"
 __author__ = "Zeal L"
 __copyright__ = "Copyright (C) 2023 Zeal L"
 
 ############################################################
 # 配置全局网络请求的 timeout 以及 max retry
 ############################################################
 
-TIMEOUT_SMALL = 2
-TIMEOUT_LARGE = 5
+TIMEOUT_SMALL = 4
+TIMEOUT_LARGE = 10
 
-MAX_RETRY_SMALL = 5000
-MAX_RETRY_LARGE = 10000
+MAX_RETRY_SMALL = 10000
+MAX_RETRY_LARGE = 20000
 
 RETRY_WAIT_EX = 200
 

version.txt

@@ -8,8 +8,8 @@ VSVersionInfo(
         # filevers 和 prodvers 应该总是一个包含四项的元组：(1, 2, 3, 4)
         # 将不需要的项目设置为零。
         # 文件版本号
-        filevers=(1, 0, 2, 0),
-        prodvers=(1, 0, 2, 0),
+        filevers=(1, 0, 3, 0),
+        prodvers=(1, 0, 3, 0),
         # 包含指定有效位“flags”的位掩码
         mask=0x3f,
         # 包含指定文件布尔属性的位掩码。
@@ -33,17 +33,17 @@ VSVersionInfo(
                 u'040904B0',
             # 文件说明
                 [StringStruct(u'FileDescription', u'哔哩哔哩漫画下载器'),
-                StringStruct(u'FileVersion', u'1, 0, 2'),
+                StringStruct(u'FileVersion', u'1, 0, 3'),
             # 内部名称
-                StringStruct(u'InternalName', u'哔哩哔哩漫画下载器 v1.0.2'),
+                StringStruct(u'InternalName', u'哔哩哔哩漫画下载器 v1.0.3'),
             # 版权
                 StringStruct(u'LegalCopyright', u'Copyright (C) 2023 Zeal L'),
             # 原始文件名
                 StringStruct(u'OriginalFilename', u'哔哩哔哩漫画下载器.exe'),
             # 产品名称
                 StringStruct(u'ProductName', u'BiliBili-Manga-Downloader'),
             # 产品版本号
-                StringStruct(u'ProductVersion', u'1.0.2')])
+                StringStruct(u'ProductVersion', u'1.0.3')])
                 ]),
             VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
         ]