本地漫画支持多章节

src/component/list/comic_list_widget.py

@@ -33,6 +33,7 @@ def __init__(self, parent):
  self.isDelMenu = False
  self.isGame = False
  self.isLocal = False
+ self.isLocalEps = False
  self.isMoveMenu = False
  self.openMenu = False
 
@@ -106,7 +107,10 @@ def AddBookByLocal(self, v, category=""):
  widget.title = v.title
  widget.picNum = v.picCnt
  widget.url = v.file
- title += "<font color=#d5577c>{}</font>".format("(" + str(v.picCnt) + "P)")
+ if len(v.eps) > 0:
+ title += "<font color=#d5577c>{}</font>".format("(" + str(len(v.eps)) + "E)")
+ else:
+ title += "<font color=#d5577c>{}</font>".format("(" + str(v.picCnt) + "P)")
  if v.lastReadTime:
  categories = "{} {}".format(ToolUtil.GetUpdateStrByTick(v.lastReadTime), Str.GetStr(Str.Looked))
 
@@ -120,7 +124,6 @@ def AddBookByLocal(self, v, category=""):
  widget.categoryLabel.setText(category)
  widget.categoryLabel.setVisible(True)
 
- # widget.toolButton.setVisible(False)
  widget.nameLable.setText(title)
  item = QListWidgetItem(self)
  item.setFlags(item.flags() & ~Qt.ItemIsSelectable)
@@ -253,6 +256,8 @@ def SelectItem(self, item):
 
  if self.isGame:
  QtOwner().OpenGameInfo(widget.id)
+ elif self.isLocalEps:
+ QtOwner().OpenLocalEpsBook(widget.id)
  elif self.isLocal:
  QtOwner().OpenLocalBook(widget.id)
  else:

src/config/config.py

@@ -39,7 +39,7 @@
 UpdateVersion = "v1.1.5"
 RealVersion = "v1.1.5"
 Waifu2xVersion = "1.1.6"
-TimeVersion = "2023-6-25"
+TimeVersion = "2023-8-13"
 
 CurSite = "e-hentai" # 当前站点
 CurLoginName = "" # 当前登录名

src/interface/ui_local.py

@@ -16,8 +16,9 @@
  QImage, QKeySequence, QLinearGradient, QPainter,
  QPalette, QPixmap, QRadialGradient, QTransform)
 from PySide6.QtWidgets import (QApplication, QComboBox, QFrame, QGridLayout,
- QHBoxLayout, QLabel, QListWidgetItem, QPushButton,
- QSizePolicy, QSpacerItem, QSpinBox, QWidget)
+ QHBoxLayout, QLabel, QLineEdit, QListWidgetItem,
+ QPushButton, QSizePolicy, QSpacerItem, QSpinBox,
+ QWidget)
 
 from component.list.comic_list_widget import ComicListWidget
 from component.list.tag_list_widget import TagListWidget
@@ -29,6 +30,17 @@ def setupUi(self, Local):
  Local.resize(628, 334)
  self.gridLayout_2 = QGridLayout(Local)
  self.gridLayout_2.setObjectName(u"gridLayout_2")
+ self.gridLayout_3 = QGridLayout()
+ self.gridLayout_3.setObjectName(u"gridLayout_3")
+ self.bookList = ComicListWidget(Local)
+ self.bookList.setObjectName(u"bookList")
+ self.bookList.setStyleSheet(u"")
+
+ self.gridLayout_3.addWidget(self.bookList, 0, 0, 1, 1)
+
+
+ self.gridLayout_2.addLayout(self.gridLayout_3, 3, 0, 1, 1)
+
  self.horizontalLayout_2 = QHBoxLayout()
  self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
  self.tagsList = TagListWidget(Local)
@@ -67,18 +79,7 @@ def setupUi(self, Local):
  self.horizontalLayout_2.addWidget(self.toolButton, 0, Qt.AlignRight)
 
 
- self.gridLayout_2.addLayout(self.horizontalLayout_2, 0, 0, 1, 1)
-
- self.gridLayout_3 = QGridLayout()
- self.gridLayout_3.setObjectName(u"gridLayout_3")
- self.bookList = ComicListWidget(Local)
- self.bookList.setObjectName(u"bookList")
- self.bookList.setStyleSheet(u"")
-
- self.gridLayout_3.addWidget(self.bookList, 0, 0, 1, 1)
-
-
- self.gridLayout_2.addLayout(self.gridLayout_3, 2, 0, 1, 1)
+ self.gridLayout_2.addLayout(self.horizontalLayout_2, 1, 0, 1, 1)
 
  self.gridLayout_4 = QGridLayout()
  self.gridLayout_4.setObjectName(u"gridLayout_4")
@@ -168,7 +169,24 @@ def setupUi(self, Local):
  self.gridLayout_4.addLayout(self.horizontalLayout, 0, 0, 1, 1)
 
 
- self.gridLayout_2.addLayout(self.gridLayout_4, 3, 0, 1, 1)
+ self.gridLayout_2.addLayout(self.gridLayout_4, 4, 0, 1, 1)
+
+ self.widget = QWidget(Local)
+ self.widget.setObjectName(u"widget")
+ self.horizontalLayout_3 = QHBoxLayout(self.widget)
+ self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
+ self.label = QLabel(self.widget)
+ self.label.setObjectName(u"label")
+
+ self.horizontalLayout_3.addWidget(self.label)
+
+ self.lineEdit = QLineEdit(self.widget)
+ self.lineEdit.setObjectName(u"lineEdit")
+
+ self.horizontalLayout_3.addWidget(self.lineEdit)
+
+
+ self.gridLayout_2.addWidget(self.widget, 0, 0, 1, 1)
 
 
  self.retranslateUi(Local)
@@ -194,5 +212,6 @@ def retranslateUi(self, Local):
 #if QT_CONFIG(shortcut)
  self.jumpButton.setShortcut(QCoreApplication.translate("Local", u"Return", None))
 #endif // QT_CONFIG(shortcut)
+ self.label.setText(QCoreApplication.translate("Local", u"\u641c\u7d22\uff1a", None))
  # retranslateUi
 

src/interface/ui_local_eps.py

@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+
+################################################################################
+## Form generated from reading UI file 'ui_local_eps.ui'
+##
+## Created by: Qt User Interface Compiler version 6.2.4
+##
+## WARNING! All changes made in this file will be lost when recompiling UI file!
+################################################################################
+
+from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
+ QMetaObject, QObject, QPoint, QRect,
+ QSize, QTime, QUrl, Qt)
+from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
+ QFont, QFontDatabase, QGradient, QIcon,
+ QImage, QKeySequence, QLinearGradient, QPainter,
+ QPalette, QPixmap, QRadialGradient, QTransform)
+from PySide6.QtWidgets import (QApplication, QGridLayout, QHBoxLayout, QLabel,
+ QListWidgetItem, QRadioButton, QSizePolicy, QSpacerItem,
+ QWidget)
+
+from component.list.comic_list_widget import ComicListWidget
+
+class Ui_LocalEps(object):
+ def setupUi(self, LocalEps):
+ if not LocalEps.objectName():
+ LocalEps.setObjectName(u"LocalEps")
+ LocalEps.resize(646, 391)
+ self.gridLayout_2 = QGridLayout(LocalEps)
+ self.gridLayout_2.setObjectName(u"gridLayout_2")
+ self.gridLayout_3 = QGridLayout()
+ self.gridLayout_3.setObjectName(u"gridLayout_3")
+ self.bookList = ComicListWidget(LocalEps)
+ self.bookList.setObjectName(u"bookList")
+ self.bookList.setStyleSheet(u"")
+
+ self.gridLayout_3.addWidget(self.bookList, 0, 0, 1, 1)
+
+
+ self.gridLayout_2.addLayout(self.gridLayout_3, 4, 0, 1, 1)
+
+ self.name = QLabel(LocalEps)
+ self.name.setObjectName(u"name")
+
+ self.gridLayout_2.addWidget(self.name, 0, 0, 1, 1)
+
+ self.horizontalLayout = QHBoxLayout()
+ self.horizontalLayout.setObjectName(u"horizontalLayout")
+ self.showWaifu2x = QRadioButton(LocalEps)
+ self.showWaifu2x.setObjectName(u"showWaifu2x")
+
+ self.horizontalLayout.addWidget(self.showWaifu2x)
+
+ self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+
+ self.horizontalLayout.addItem(self.horizontalSpacer)
+
+
+ self.gridLayout_2.addLayout(self.horizontalLayout, 2, 0, 1, 1)
+
+
+ self.retranslateUi(LocalEps)
+
+ QMetaObject.connectSlotsByName(LocalEps)
+ # setupUi
+
+ def retranslateUi(self, LocalEps):
+ LocalEps.setWindowTitle(QCoreApplication.translate("LocalEps", u"\u672c\u5730\u6f2b\u753b\u7ae0\u8282", None))
+ self.name.setText("")
+ self.showWaifu2x.setText(QCoreApplication.translate("LocalEps", u"\u53ea\u663e\u793aWaifu2x", None))
+ # retranslateUi
+

src/interface/ui_main.py

@@ -29,6 +29,7 @@
 from view.search.rank_view import RankView
 from view.search.search_view import SearchView
 from view.setting.setting_view import SettingView
+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
@@ -88,6 +89,9 @@ def setupUi(self, Main):
  self.searchView = SearchView()
  self.searchView.setObjectName(u"searchView")
  self.subStackWidget.addWidget(self.searchView)
+ self.localReadEpsView = LocalReadEpsView()
+ self.localReadEpsView.setObjectName(u"localReadEpsView")
+ self.subStackWidget.addWidget(self.localReadEpsView)
  self.rankView = RankView()
  self.rankView.setObjectName(u"rankView")
  self.subStackWidget.addWidget(self.rankView)

src/interface/ui_main_windows.py

@@ -30,6 +30,7 @@
 from view.search.rank_view import RankView
 from view.search.search_view import SearchView
 from view.setting.setting_view import SettingView
+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
@@ -96,6 +97,9 @@ def setupUi(self, MainWindows):
  self.helpView = HelpView()
  self.helpView.setObjectName(u"helpView")
  self.subStackWidget.addWidget(self.helpView)
+ self.localReadEpsView = LocalReadEpsView()
+ self.localReadEpsView.setObjectName(u"localReadEpsView")
+ self.subStackWidget.addWidget(self.localReadEpsView)
  self.rankView = RankView()
  self.rankView.setObjectName(u"rankView")
  self.subStackWidget.addWidget(self.rankView)

src/qt_owner.py

@@ -157,9 +157,9 @@ def OpenReadView(self, bookId, token, site, name, pageIndex):
  self.owner.totalStackWidget.setCurrentIndex(1)
  self.owner.readView.OpenPage(bookId, token, site, name, pageIndex=pageIndex, isOffline=QtOwner().isOfflineModel)
 
- def OpenLocalReadView(self, v):
+ def OpenLocalReadView(self, v, epsId=0):
  self.owner.totalStackWidget.setCurrentIndex(1)
- self.owner.readView.OpenLocalPage(v)
+ self.owner.readView.OpenLocalPage(v, epsId)
 
  def OpenFavoriteInfo(self, bookId, bookName):
  from view.user.favorite_info_view import FavoriteInfoView
@@ -175,6 +175,9 @@ def OpenBookInfo(self, bookId, token="", site=""):
  def OpenLocalBook(self, bookId):
  self.owner.localReadView.OpenLocalBook(bookId)
 
+ def OpenLocalEpsBook(self, bookId):
+ self.owner.localReadEpsView.OpenLocalBook(bookId)
+
  def OpenBookInfoExt(self, task):
  arg = {"task": task}
  self.owner.SwitchWidget(self.owner.bookInfoView, **arg)
@@ -199,6 +202,10 @@ def OpenWaifu2xTool(self, data):
  arg = {"data": data}
  self.owner.SwitchWidget(self.owner.waifu2xToolView, **arg)
 
+ def OpenLocalEpsView(self, bookId):
+ arg = {"bookId": bookId}
+ self.owner.SwitchWidget(self.owner.localReadEpsView, **arg)
+
  def CloseReadView(self):
  self.owner.totalStackWidget.setCurrentIndex(0)
  QtOwner().bookInfoView.ReloadHistory.emit()