update

Author: tonquer

.github/workflows/CI.yml

@@ -275,10 +275,10 @@ jobs:
       PACKAGENAME: bika_py37_linux
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.7
+    - name: Set up Python 3.9
       uses: actions/setup-python@v5
       with:
-        python-version: 3.7
+        python-version: 3.9
     - name: Install dependencies
       run: |
         sudo apt-get install -y fuse libfuse2

src/config/config.py

@@ -50,9 +50,9 @@
 Issues2 = "https://hub.ggo.icu/tonquer/picacg-qt/issues"
 Issues3 = "https://hub.fastgit.xyz/tonquer/picacg-qt/issues"
 
-UpdateVersion = "v1.5.1.1"
-RealVersion = "v1.5.1.1"
-TimeVersion = "2024-10-29"
+UpdateVersion = "v1.5.2"
+RealVersion = "v1.5.2"
+TimeVersion = "2025-3-16"
 DbVersion = ""
 
 Waifu2xVersion = "1.2.0"
@@ -89,11 +89,11 @@
 # ImageServer3 = 'storage.diwodiwo.xyz'          # 分流3 使用的图片服务器
 # ImageServer3Jump = 'img.diwodiwo.xyz'          # 分流3 使用的图片服务器
 
-ProxyApiDomain = "bika-api.ggo.icu"
-ProxyImgDomain = "bika-img.ggo.icu"
+# ProxyApiDomain = "bika-api.ggo.icu"
+# ProxyImgDomain = "bika-img.ggo.icu"
 
-ProxyApiDomain2 = "bika2-api.ggo.icu"
-ProxyImgDomain2 = "bika2-img.ggo.icu"
+# ProxyApiDomain2 = "bika2-api.ggo.icu"
+# ProxyImgDomain2 = "bika2-img.ggo.icu"
 
 ApiDomain = [
     "picaapi.picacomic.com",

src/config/global_config.py

@@ -21,15 +21,25 @@ def set_value(self, value):
 
 
 class GlobalConfig:
-    Ver = GlobalItem(0)
+    Ver = GlobalItem(6)
     VerTime = GlobalItem("2024-10-15")
+    # web url
+    WebDnsList = GlobalItem([])
+
+
     LocalProxyIndex = [2, 3]
     Address = GlobalItem(["104.21.91.145", "188.114.98.153"])
     AddressIpv6 = GlobalItem(["2606:4700:d:28:dbf4:26f3:c265:73bc", "2a06:98c1:3120:ca71:be2c:c721:d2b5:5dbf"])
     ImageUrl = GlobalItem("s3.picacomic.com")
     ImageServerList = GlobalItem(["s3.picacomic.com", "storage.diwodiwo.xyz", "s2.picacomic.com", "storage1.picacomic.com", "storage-b.picacomic.com"])
     ImageJumList = GlobalItem(["img.picacomic.com", "img.diwodiwo.xyz"])
 
+    ProxyApiDomain = GlobalItem("bika-api.ggo.icu")
+    ProxyImgDomain = GlobalItem("bika-img.ggo.icu")
+
+    ProxyApiDomain2 = GlobalItem("bika2-api.ggo.icu")
+    ProxyImgDomain2 = GlobalItem("bika21-img.ggo.icu")
+
     def __init__(self):
         pass
 

src/config/setting.py

@@ -89,9 +89,12 @@ class Setting:
     NotCategoryShow = SettingValue("GeneraSetting", 0, False)  #
 
     CategorySize = SettingValue("GeneraSetting", 80, False)  #
-    ScaleLevel = SettingValue("GeneraSetting", 0, True, ["Auto", 100, 125, 150, 175, 200])
+    # ScaleLevel = SettingValue("GeneraSetting", 0, True, ["Auto", 100, 125, 150, 175, 200])
+    IsUseScaleFactor = SettingValue("GeneraSetting", 0, True)
+    ScaleFactor = SettingValue("GeneraSetting", 100, True)
+
     # IsUseTitleBar = SettingValue("GeneraSetting", 1, True)
-    IsUsewindowsize = SettingValue("GeneraSetting", 0, False)
+
     FontName = SettingValue("GeneraSetting", "", True)
     FontSize = SettingValue("GeneraSetting", "", True)
     FontStyle = SettingValue("GeneraSetting", 0, True)
@@ -174,6 +177,7 @@ class Setting:
     IsForbidCategory =SettingValue("Other", True, False)
     IsForbidTag = SettingValue("Other", False, False)
     IsForbidTitle = SettingValue("Other", False, False)
+    IsSkipSpace = SettingValue("Other", 0, False)
 
     @staticmethod
     def InitLoadSetting():

src/interface/ui_book_info.py

@@ -119,6 +119,55 @@ def setupUi(self, BookInfo):
 
         self.verticalLayout_2.addLayout(self.horizontalLayout_8)
 
+        self.horizontalLayout_9 = QHBoxLayout()
+        self.horizontalLayout_9.setObjectName(u"horizontalLayout_9")
+        self.label_7 = QLabel(self.scrollAreaWidgetContents)
+        self.label_7.setObjectName(u"label_7")
+        self.label_7.setMaximumSize(QSize(80, 20))
+
+        self.horizontalLayout_9.addWidget(self.label_7)
+
+        self.views = QLabel(self.scrollAreaWidgetContents)
+        self.views.setObjectName(u"views")
+        self.views.setMaximumSize(QSize(16777215, 20))
+
+        self.horizontalLayout_9.addWidget(self.views)
+
+
+        self.verticalLayout_2.addLayout(self.horizontalLayout_9)
+
+        self.horizontalLayout_13 = QHBoxLayout()
+        self.horizontalLayout_13.setObjectName(u"horizontalLayout_13")
+        self.label_9 = QLabel(self.scrollAreaWidgetContents)
+        self.label_9.setObjectName(u"label_9")
+        self.label_9.setMaximumSize(QSize(80, 16777215))
+
+        self.horizontalLayout_13.addWidget(self.label_9)
+
+        self.upTime = QLabel(self.scrollAreaWidgetContents)
+        self.upTime.setObjectName(u"upTime")
+
+        self.horizontalLayout_13.addWidget(self.upTime)
+
+
+        self.verticalLayout_2.addLayout(self.horizontalLayout_13)
+
+        self.horizontalLayout_14 = QHBoxLayout()
+        self.horizontalLayout_14.setObjectName(u"horizontalLayout_14")
+        self.label_12 = QLabel(self.scrollAreaWidgetContents)
+        self.label_12.setObjectName(u"label_12")
+        self.label_12.setMaximumSize(QSize(80, 16777215))
+
+        self.horizontalLayout_14.addWidget(self.label_12)
+
+        self.lastUpTime = QLabel(self.scrollAreaWidgetContents)
+        self.lastUpTime.setObjectName(u"lastUpTime")
+
+        self.horizontalLayout_14.addWidget(self.lastUpTime)
+
+
+        self.verticalLayout_2.addLayout(self.horizontalLayout_14)
+
         self.horizontalLayout_4 = QHBoxLayout()
         self.horizontalLayout_4.setObjectName(u"horizontalLayout_4")
         self.horizontalLayout_11 = QHBoxLayout()
@@ -233,23 +282,6 @@ def setupUi(self, BookInfo):
 
         self.verticalLayout_2.addLayout(self.horizontalLayout_7)
 
-        self.horizontalLayout_9 = QHBoxLayout()
-        self.horizontalLayout_9.setObjectName(u"horizontalLayout_9")
-        self.label_7 = QLabel(self.scrollAreaWidgetContents)
-        self.label_7.setObjectName(u"label_7")
-        self.label_7.setMaximumSize(QSize(55, 20))
-
-        self.horizontalLayout_9.addWidget(self.label_7)
-
-        self.views = QLabel(self.scrollAreaWidgetContents)
-        self.views.setObjectName(u"views")
-        self.views.setMaximumSize(QSize(16777215, 20))
-
-        self.horizontalLayout_9.addWidget(self.views)
-
-
-        self.verticalLayout_2.addLayout(self.horizontalLayout_9)
-
         self.commandLinkButton = QCommandLinkButton(self.scrollAreaWidgetContents)
         self.commandLinkButton.setObjectName(u"commandLinkButton")
         sizePolicy = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Preferred)
@@ -519,12 +551,16 @@ def retranslateUi(self, BookInfo):
         self.title.setText(QCoreApplication.translate("BookInfo", u"\u6807\u9898", None))
         self.label_6.setText(QCoreApplication.translate("BookInfo", u"id:", None))
         self.idLabel.setText("")
+        self.label_7.setText(QCoreApplication.translate("BookInfo", u"\u89c2\u770b\u6570\uff1a", None))
+        self.views.setText(QCoreApplication.translate("BookInfo", u"\u89c2\u770b\u6570", None))
+        self.label_9.setText(QCoreApplication.translate("BookInfo", u"\u4e0a\u4f20\u65f6\u95f4\uff1a", None))
+        self.upTime.setText("")
+        self.label_12.setText(QCoreApplication.translate("BookInfo", u"\u66f4\u65b0\u65f6\u95f4\uff1a", None))
+        self.lastUpTime.setText("")
         self.label_2.setText(QCoreApplication.translate("BookInfo", u"\u4f5c\u8005\uff1a", None))
         self.label_3.setText(QCoreApplication.translate("BookInfo", u"\u63cf\u8ff0\uff1a", None))
         self.label_4.setText(QCoreApplication.translate("BookInfo", u"\u5206\u7c7b\uff1a", None))
         self.label_5.setText(QCoreApplication.translate("BookInfo", u"Tags\uff1a", None))
-        self.label_7.setText(QCoreApplication.translate("BookInfo", u"\u89c2\u770b\u6570\uff1a", None))
-        self.views.setText(QCoreApplication.translate("BookInfo", u"\u89c2\u770b\u6570", None))
         self.commandLinkButton.setText(QCoreApplication.translate("BookInfo", u"\u770b\u4e86\u8fd9\u8fb9\u672c\u5b50\u7684\u4eba\u4e5f\u5728\u770b", None))
         self.user_icon.setText(QCoreApplication.translate("BookInfo", u"TextLabel", None))
         self.user_name.setText(QCoreApplication.translate("BookInfo", u"TextLabel", None))

src/interface/ui_download.py

@@ -33,6 +33,11 @@ def setupUi(self, Download):
 
         self.horizontalLayout_2.addItem(self.horizontalSpacer_2)
 
+        self.skipSpaceRadio = QCheckBox(Download)
+        self.skipSpaceRadio.setObjectName(u"skipSpaceRadio")
+
+        self.horizontalLayout_2.addWidget(self.skipSpaceRadio)
+
         self.redownloadRadio = QCheckBox(Download)
         self.redownloadRadio.setObjectName(u"redownloadRadio")
 
@@ -147,6 +152,7 @@ def setupUi(self, Download):
 
     def retranslateUi(self, Download):
         Download.setWindowTitle(QCoreApplication.translate("Download", u"\u4e0b\u8f7d", None))
+        self.skipSpaceRadio.setText(QCoreApplication.translate("Download", u"\u8df3\u8fc7\u7a7a\u767d\u7ae0\u8282", None))
         self.redownloadRadio.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u5931\u8d25\u540e\u81ea\u52a8\u91cd\u8bd5", None))
         self.radioButton.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u81ea\u52a8Waifu2x\u8f6c\u6362", None))
         self.comboBox.setItemText(0, QCoreApplication.translate("Download", u"\u5168\u90e8", None))

src/interface/ui_help.py

@@ -36,7 +36,7 @@ def setupUi(self, Help):
         self.scrollArea.setWidgetResizable(True)
         self.scrollAreaWidgetContents = QWidget()
         self.scrollAreaWidgetContents.setObjectName(u"scrollAreaWidgetContents")
-        self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 736, 771))
+        self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 736, 815))
         self.verticalLayout_3 = QVBoxLayout(self.scrollAreaWidgetContents)
         self.verticalLayout_3.setObjectName(u"verticalLayout_3")
         self.horizontalLayout = QHBoxLayout()
@@ -78,6 +78,20 @@ def setupUi(self, Help):
 
         self.verticalLayout_2.addWidget(self.pushButton, 0, Qt.AlignHCenter)
 
+        self.label_13 = QLabel(self.widget)
+        self.label_13.setObjectName(u"label_13")
+        font1 = QFont()
+        font1.setItalic(True)
+        self.label_13.setFont(font1)
+
+        self.verticalLayout_2.addWidget(self.label_13, 0, Qt.AlignHCenter)
+
+        self.label_14 = QLabel(self.widget)
+        self.label_14.setObjectName(u"label_14")
+        self.label_14.setFont(font1)
+
+        self.verticalLayout_2.addWidget(self.label_14, 0, Qt.AlignHCenter)
+
         self.widget_2 = QWidget(self.widget)
         self.widget_2.setObjectName(u"widget_2")
         self.gridLayout = QGridLayout(self.widget_2)
@@ -211,9 +225,9 @@ def setupUi(self, Help):
         self.verticalLayout_4.setObjectName(u"verticalLayout_4")
         self.label_8 = QLabel(self.updateWidget)
         self.label_8.setObjectName(u"label_8")
-        font1 = QFont()
-        font1.setPointSize(16)
-        self.label_8.setFont(font1)
+        font2 = QFont()
+        font2.setPointSize(16)
+        self.label_8.setFont(font2)
 
         self.verticalLayout_4.addWidget(self.label_8)
 
@@ -262,7 +276,9 @@ def retranslateUi(self, Help):
         self.label.setText("")
         self.label_2.setText(QCoreApplication.translate("Help", u"\u9700\u8981\u53cd\u9988\u4f7f\u7528\u8fc7\u7a0b\u4e2d\u7684\u95ee\u9898\uff1f", None))
         self.label_3.setText(QCoreApplication.translate("Help", u"\u60f3\u63d0\u4f9b\u4e00\u4e9b\u5efa\u8bae\uff1f", None))
-        self.pushButton.setText(QCoreApplication.translate("Help", u"Github Issue", None))
+        self.pushButton.setText(QCoreApplication.translate("Help", u"\u524d\u5f80Github Issue", None))
+        self.label_13.setText(QCoreApplication.translate("Help", u"\u672c\u8f6f\u4ef6\u5728Github\u5f00\u6e90\uff0c\u8bf7\u52ff\u7528\u4e8e\u4efb\u4f55\u5546\u4e1a\u884c\u4e3a", None))
+        self.label_14.setText(QCoreApplication.translate("Help", u"by@tonquer", None))
         self.label_5.setText(QCoreApplication.translate("Help", u"\u672c\u5730\u5e93\u6570\u91cf:", None))
         self.label_9.setText(QCoreApplication.translate("Help", u"\u4e0a\u6b21\u66f4\u65b0\u65f6\u95f4\uff1a", None))
         self.preCheckBox.setText(QCoreApplication.translate("Help", u"\u63a5\u53d7Beta\u7248\u672c\u66f4\u65b0", None))

src/interface/ui_main.py

@@ -43,8 +43,8 @@
 from view.read.read_view import ReadView
 from view.search.search_view import SearchView
 from view.setting.setting_view import SettingView
-from view.tool.local_eps_read_view import LocalEpsReadView
 from view.tool.local_read_all_view import LocalReadAllView
+from view.tool.local_read_eps_view import LocalReadEpsView
 from view.tool.local_read_view import LocalReadView
 from view.tool.waifu2x_tool_view import Waifu2xToolView
 from view.user.favorite_view import FavoriteView
@@ -113,7 +113,7 @@ def setupUi(self, Main):
         self.convertView = ConvertView()
         self.convertView.setObjectName(u"convertView")
         self.subStackWidget.addWidget(self.convertView)
-        self.localReadEpsView = LocalEpsReadView()
+        self.localReadEpsView = LocalReadEpsView()
         self.localReadEpsView.setObjectName(u"localReadEpsView")
         self.subStackWidget.addWidget(self.localReadEpsView)
         self.chatNewView = ChatNewView()