Skip to content

Commit

Permalink
🐛 修复updateComicInfoEvent函数参数量异常,默认添加BiliPlus临时解析
Browse files Browse the repository at this point in the history
  • Loading branch information
shadlc committed May 1, 2024
1 parent 2fdcdcc commit bd40e31
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/BiliPlus.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def _() -> dict:
renewal_time = soup.body.div.find_all("p")[2].text
episode_div_list = soup.body.div.find_all("div", {"class": "contents-full"})
ep_list = []
for idx, episode_div in enumerate(episode_div_list):
for idx, episode_div in enumerate(reversed(episode_div_list)):
ord = idx
id = episode_div.find("div", {"class": "epid"}).text.split()[-1]
temp = episode_div.find("div").find_all("div")[-1].text.split(" / ")
Expand Down
15 changes: 8 additions & 7 deletions src/ui/MangaUI.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def _() -> None:
self.present_comic_id = comic_id
self.resolveEnable(False)
comic = BiliPlusComic(self.present_comic_id, self.mainGUI)
self.updateComicInfoEvent(comic, "done")
self.updateComicInfoEvent(comic)

self.mainGUI.lineEdit_manga_search_id.returnPressed.connect(_)
self.mainGUI.pushButton_manga_search_id.clicked.connect(_)
Expand All @@ -138,7 +138,7 @@ def _(item: QListWidgetItem) -> None:
self.present_comic_id = self.search_info[index]["id"]
self.resolveEnable(False)
comic = Comic(self.present_comic_id, self.mainGUI)
self.updateComicInfoEvent(comic, "done")
self.updateComicInfoEvent(comic)

self.mainGUI.listWidget_manga_search.itemDoubleClicked.connect(_)

Expand Down Expand Up @@ -282,7 +282,7 @@ def updateMyLibrarySingle(self, comic_id: int, comic_path: str) -> int | None:
comic_path (str): 漫画保存路径
"""

comic = Comic(comic_id, self.mainGUI)
comic = BiliPlusComic(comic_id, self.mainGUI)
data = comic.getComicInfo()
# ? 获取漫画信息失败直接跳过
if not data:
Expand Down Expand Up @@ -334,7 +334,7 @@ def _(_event: QEvent, widget: QWidget, comic: Comic) -> None:
widget.setStyleSheet("background-color:rgb(200, 200, 255); font-size: 10pt;")

widget.mousePressEvent = partial(_, widget=widget, comic=comic)
widget.mouseDoubleClickEvent = partial(self.updateComicInfoEvent, comic, "bilibili")
widget.mouseDoubleClickEvent = partial(self.updateComicInfoEvent, comic)
widget.setLayout(h_layout_my_library)

# ?###########################################################
Expand Down Expand Up @@ -779,7 +779,7 @@ def _() -> None:
return
self.resolveEnable(False)
comic = Comic(self.present_comic_id, self.mainGUI)
self.updateComicInfoEvent(comic, "done")
self.updateComicInfoEvent(comic)

self.mainGUI.pushButton_resolve_detail.clicked.connect(_)

Expand All @@ -796,7 +796,7 @@ def _() -> None:
return
self.resolveEnable(False)
comic = BiliPlusComic(self.present_comic_id, self.mainGUI)
self.updateComicInfoEvent(comic, "done")
self.updateComicInfoEvent(comic)

self.mainGUI.pushButton_biliplus_resolve_detail.clicked.connect(_)

Expand Down Expand Up @@ -833,7 +833,7 @@ def _() -> None:
if self.mainGUI.getConfig("save_meta") and not os.path.exists(
os.path.join(save_path, "元数据.json")
):
comic = Comic(self.present_comic_id, self.mainGUI)
comic = BiliPlusComic(self.present_comic_id, self.mainGUI)
self.save_meta(comic.getComicInfo())

# ?###########################################################
Expand All @@ -845,6 +845,7 @@ def _() -> None:
item.flags() != Qt.ItemFlag.NoItemFlags
and item.checkState() == Qt.CheckState.Checked
):
comic = BiliPlusComic(self.present_comic_id, self.mainGUI)
self.mainGUI.downloadUI.addTask(self.mainGUI, self.epi_list[i])
item.setFlags(Qt.ItemFlag.NoItemFlags)
item.setBackground(QColor(0, 255, 0, 50))
Expand Down

0 comments on commit bd40e31

Please sign in to comment.