jmcomic 2.5.33__py3-none-any.whl → 2.5.34__py3-none-any.whl

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 *

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,

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):

jmcomic/jm_toolkit.py

@@ -25,7 +25,7 @@ class JmcomicText:
     pattern_html_album_album_id = compile(r'<span class="number">.*?：JM(\d+)</span>')
     pattern_html_album_scramble_id = compile(r'var scramble_id = (\d+);')
     pattern_html_album_name = compile(r'<h1 class="book-name" id="book-name">([\s\S]*?)</h1>')
-    pattern_html_album_episode_list = compile(r'data-album="(\d+)"[^>]*>\s*?<li.*?>\s*?第(\d+)話([\s\S]*?)<[\s\S]*?>(\d+-\d+-\d+).*?')
+    pattern_html_album_episode_list = compile(r'data-album="(\d+)"[^>]*>\s*?<li.*?>\s*?第(\d+)[话話]([\s\S]*?)<[\s\S]*?>')
     pattern_html_album_page_count = compile(r'<span class="pagecount">.*?:(\d+)</span>')
     pattern_html_album_pub_date = compile(r'>上架日期 : (.*?)</span>')
     pattern_html_album_update_date = compile(r'>更新日期 : (.*?)</span>')
@@ -693,7 +693,7 @@ class JmApiAdaptTool:
             chapter = AdvancedDict(chapter)
             # photo_id, photo_index, photo_title, photo_pub_date
             episode_list.append(
-                (chapter.id, chapter.sort, chapter.name, None)
+                (chapter.id, chapter.sort, chapter.name)
             )
         fields['episode_list'] = episode_list
         for it in 'scramble_id', 'page_count', 'pub_date', 'update_date':

{jmcomic-2.5.33.dist-info → jmcomic-2.5.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jmcomic
-Version: 2.5.33
+Version: 2.5.34
 Summary: Python API For JMComic (禁漫天堂)
 Home-page: https://github.com/hect0x7/JMComic-Crawler-Python
 Author: hect0x7

{jmcomic-2.5.33.dist-info → jmcomic-2.5.34.dist-info}/RECORD

@@ -1,18 +1,18 @@
-jmcomic/__init__.py,sha256=5JBDh7vWLkZIu1X_zrdMEt1ibxdewV9t8IzE7w-4LWs,903
+jmcomic/__init__.py,sha256=afRFtpIkAXkt9GtOS-LhzVxRlikGkxkrXWGPfXEoGGQ,903
 jmcomic/api.py,sha256=40mzFEVhR0h_Ta-ub8vMfJ9yx89yvL09XMv9zK0QUvA,3865
 jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
 jmcomic/jm_client_impl.py,sha256=KguizzmrN2etAFvHzZaxbq7c8RtFhvqJzhQIAgPj7Dw,39622
 jmcomic/jm_client_interface.py,sha256=LqJqa-4G7-F98_U9R9QTxFND_9t30B-BIQZa_o0p-KY,19005
 jmcomic/jm_config.py,sha256=rOeKMqZ3HwWk3I-vA0YTCIimBcfdZpvXj7Itg0OKfCo,16767
 jmcomic/jm_downloader.py,sha256=vfAjHggbs4vvtrv9zM8NjeGWXk2-9tlqQaC8iC4FKpw,10351
-jmcomic/jm_entity.py,sha256=kqLtl30o_MN2pwGoahmbqm24pDojIt-45Ey_4cIHfa8,19103
+jmcomic/jm_entity.py,sha256=7CMOhAkhGN8SFPZiWFUg_YAktVxHlnSOMZLit7oVqRM,19077
 jmcomic/jm_exception.py,sha256=B9APE1jw23JBzCT12eV_imCZny3mNrSXju1p2IquaHA,4801
 jmcomic/jm_option.py,sha256=2tINFsDcncCJbd6FRtCMAidhro6faB8TBLoaSxP3uQ8,21926
-jmcomic/jm_plugin.py,sha256=4aMRnq3Y4gF8tPGz4eCX9-TIUjMUWqe0_WG47wWdR1U,39901
-jmcomic/jm_toolkit.py,sha256=AK5lH_xp6HSMqqy-Jkr7iE2TJVjxoYEH7JJvYmCK1wQ,29183
-jmcomic-2.5.33.dist-info/licenses/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
-jmcomic-2.5.33.dist-info/METADATA,sha256=65iNRYOv6sW5HcYwo5sdfm8ODusld3TA7930xpKZ6kE,8161
-jmcomic-2.5.33.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-jmcomic-2.5.33.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
-jmcomic-2.5.33.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
-jmcomic-2.5.33.dist-info/RECORD,,
+jmcomic/jm_plugin.py,sha256=e2B_x2adghxn7f8eKAJivDWf8oLY9962Utt1-J70zBw,39902
+jmcomic/jm_toolkit.py,sha256=_qAJKbcV9jaFHRGvGU4Na2ts5h7QPGJS4uRQ05KpQ88,29166
+jmcomic-2.5.34.dist-info/licenses/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
+jmcomic-2.5.34.dist-info/METADATA,sha256=23F2knHh_wQVsuFzNEjbelpyd3gTbC3RN3bzSGtOgio,8161
+jmcomic-2.5.34.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+jmcomic-2.5.34.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
+jmcomic-2.5.34.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
+jmcomic-2.5.34.dist-info/RECORD,,