diff --git a/.github/workflows/test_html.yml b/.github/workflows/test_html.yml index 099aa21..56ee600 100644 --- a/.github/workflows/test_html.yml +++ b/.github/workflows/test_html.yml @@ -16,7 +16,7 @@ jobs: test: # This code is based on https://github.com/gaogaotiantian/viztracer/blob/master/.github/workflows/python-package.yml strategy: matrix: - python-version: ['3.7', '3.8', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.13'] os: [ ubuntu-latest ] runs-on: ${{ matrix.os }} timeout-minutes: 5 diff --git a/src/jmcomic/__init__.py b/src/jmcomic/__init__.py index 9b5a0ac..93308a3 100644 --- a/src/jmcomic/__init__.py +++ b/src/jmcomic/__init__.py @@ -2,7 +2,7 @@ # 被依赖方 <--- 使用方 # config <--- entity <--- toolkit <--- client <--- option <--- downloader -__version__ = '2.5.33' +__version__ = '2.5.34' from .api import * from .jm_plugin import * diff --git a/src/jmcomic/jm_entity.py b/src/jmcomic/jm_entity.py index 017db68..16d99d7 100644 --- a/src/jmcomic/jm_entity.py +++ b/src/jmcomic/jm_entity.py @@ -457,10 +457,10 @@ class JmAlbumDetail(DetailEntity, Downloadable): self.authors: List[str] = authors # 作者 # 有的 album 没有章节,则自成一章。 - episode_list: List[Tuple[str, str, str, str]] + episode_list: List[Tuple[str, str, str]] if len(episode_list) == 0: # photo_id, photo_index, photo_title, photo_pub_date - episode_list = [(album_id, "1", name, pub_date)] + episode_list = [(album_id, "1", name)] else: episode_list = self.distinct_episode(episode_list) @@ -505,7 +505,7 @@ class JmAlbumDetail(DetailEntity, Downloadable): raise IndexError(f'photo index out of range for album-{self.album_id}: {index} >= {length}') # ('212214', '81', '94 突然打來', '2020-08-29') - pid, pindex, pname, _pub_date = self.episode_list[index] + pid, pindex, pname = self.episode_list[index] photo = JmModuleConfig.photo_class()( photo_id=pid, diff --git a/src/jmcomic/jm_plugin.py b/src/jmcomic/jm_plugin.py index 9f8c861..44ef6ff 100644 --- a/src/jmcomic/jm_plugin.py +++ b/src/jmcomic/jm_plugin.py @@ -319,7 +319,7 @@ class ZipPlugin(JmOptionPlugin): return ( downloader.download_success_dict[album] if album is not None # after_album - else downloader.download_success_dict[photo.from_album] # after_photo + else downloader.download_success_dict[photo.from_album] # after_photo ) def zip_photo(self, photo, image_list: list, zip_path: str, path_to_delete): diff --git a/src/jmcomic/jm_toolkit.py b/src/jmcomic/jm_toolkit.py index 7602afb..0c53014 100644 --- a/src/jmcomic/jm_toolkit.py +++ b/src/jmcomic/jm_toolkit.py @@ -25,7 +25,7 @@ class JmcomicText: pattern_html_album_album_id = compile(r'.*?:JM(\d+)') pattern_html_album_scramble_id = compile(r'var scramble_id = (\d+);') pattern_html_album_name = compile(r'