jmcomic 2.5.33__tar.gz → 2.5.34__tar.gz

{jmcomic-2.5.33/src/jmcomic.egg-info → jmcomic-2.5.34}/PKG-INFO

@@ -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 → jmcomic-2.5.34}/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 *

{jmcomic-2.5.33 → jmcomic-2.5.34}/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,

{jmcomic-2.5.33 → jmcomic-2.5.34}/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):

{jmcomic-2.5.33 → jmcomic-2.5.34}/src/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 → jmcomic-2.5.34/src/jmcomic.egg-info}/PKG-INFO

@@ -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