jmcomic 2.5.23__py3-none-any.whl → 2.5.24__py3-none-any.whl

jmcomic/__init__.py

@@ -2,7 +2,7 @@
 # 被依赖方 <--- 使用方
 # config <--- entity <--- toolkit <--- client <--- option <--- downloader
 
-__version__ = '2.5.23'
+__version__ = '2.5.24'
 
 from .api import *
 from .jm_plugin import *

jmcomic/jm_toolkit.py

@@ -25,31 +25,30 @@ 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+)">\n *?<li.*?>\n *'
-                                              r'第(\d+)話\n([\s\S]*?)\n *'
-                                              r'<[\s\S]*?>(\d+-\d+-\d+).*?')
+    pattern_html_album_episode_list = compile(r'data-album="(\d+)"\s*?>\s*?<li.*?>\s*?第(\d+)話([\s\S]*?)<[\s\S]*?>(\d+-\d+-\d+).*?')
     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>')
+    pattern_html_tag_a = compile(r'<a[^>]*?>\s*(\S*)\s*</a>')
     # 作品
     pattern_html_album_works = [
         compile(r'<span itemprop="author" data-type="works">([\s\S]*?)</span>'),
-        compile(r'<a[^>]*?>(.*?)</a>')
+        pattern_html_tag_a,
     ]
     # 登場人物
     pattern_html_album_actors = [
         compile(r'<span itemprop="author" data-type="actor">([\s\S]*?)</span>'),
-        compile(r'<a[^>]*?>(.*?)</a>')
+        pattern_html_tag_a,
     ]
     # 标签
     pattern_html_album_tags = [
         compile(r'<span itemprop="genre" data-type="tags">([\s\S]*?)</span>'),
-        compile(r'<a[^>]*?>(.*?)</a>')
+        pattern_html_tag_a,
     ]
     # 作者
     pattern_html_album_authors = [
         compile(r'作者： *<span itemprop="author" data-type="author">([\s\S]*?)</span>'),
-        compile(r"<a[^>]*?>(.*?)</a>"),
+        pattern_html_tag_a,
     ]
     # 點擊喜歡
     pattern_html_album_likes = compile(r'<span id="albim_likes_\d+">(.*?)</span>')

{jmcomic-2.5.23.dist-info → jmcomic-2.5.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jmcomic
-Version: 2.5.23
+Version: 2.5.24
 Summary: Python API For JMComic (禁漫天堂)
 Home-page: https://github.com/hect0x7/JMComic-Crawler-Python
 Author: hect0x7
@@ -20,7 +20,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: curl-cffi
+Requires-Dist: curl_cffi
 Requires-Dist: commonX
 Requires-Dist: PyYAML
 Requires-Dist: Pillow

{jmcomic-2.5.23.dist-info → jmcomic-2.5.24.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jmcomic/__init__.py,sha256=Sqb7L1fcmSJ1l0pVOm6cCX_LTFiwCUgwtrvd1v7wvlk,903
+jmcomic/__init__.py,sha256=O5IM5HDnIHtZsJYzakDxedU8ONJfgfVA72XTmFCF-UM,903
 jmcomic/api.py,sha256=40mzFEVhR0h_Ta-ub8vMfJ9yx89yvL09XMv9zK0QUvA,3865
 jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
 jmcomic/jm_client_impl.py,sha256=dJvlhBs0aPxGgH4wsXEFPamHTsxgrmGUytbnv8TQLYk,39523
@@ -9,10 +9,10 @@ jmcomic/jm_entity.py,sha256=yjGz55r2UwCIhQLUEBHhx3-MAipBYLHqn4ofnqvg1GI,19090
 jmcomic/jm_exception.py,sha256=B9APE1jw23JBzCT12eV_imCZny3mNrSXju1p2IquaHA,4801
 jmcomic/jm_option.py,sha256=wmoOIwffM8b8fKUufRslXK5-bynD1nPXqc1sotXLIzQ,21918
 jmcomic/jm_plugin.py,sha256=aCyMO_8YGrT37A12LxkKH020IryP0qn3KVRg0f4dquo,39566
-jmcomic/jm_toolkit.py,sha256=jU83ujluX_NxqwI7wwgoirJ_ZE2UmPBGvZCyVYnCJvQ,29164
-jmcomic-2.5.23.dist-info/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
-jmcomic-2.5.23.dist-info/METADATA,sha256=e2gZHHu3k1eG9416jQLVsAy1HO11WtBxx0ZZy2nKM9o,7118
-jmcomic-2.5.23.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-jmcomic-2.5.23.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
-jmcomic-2.5.23.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
-jmcomic-2.5.23.dist-info/RECORD,,
+jmcomic/jm_toolkit.py,sha256=0c_H4V440UqtVtkzeOvUKQ3Aej7TBeMNHSRSSyQ305c,29078
+jmcomic-2.5.24.dist-info/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
+jmcomic-2.5.24.dist-info/METADATA,sha256=ci2T7corDdDakAt5CBWj9mH9iGWomrrI_isxMOjwvfk,7118
+jmcomic-2.5.24.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+jmcomic-2.5.24.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
+jmcomic-2.5.24.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
+jmcomic-2.5.24.dist-info/RECORD,,

{jmcomic-2.5.23.dist-info → jmcomic-2.5.24.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any