Merge branch 'hect0x7:master' into master

Author: Greeay7

assets/docs/sources/tutorial/0_common_usage.md

@@ -38,7 +38,7 @@ download_album(123, option)
 option.download_album(123)
 ```
 
-## 获取本子/章节/图片的实体类
+## 获取本子/章节/图片的实体类，下载图片
 
 ```python
 from jmcomic import *
@@ -59,7 +59,13 @@ def fetch(photo: JmPhotoDetail):
     image: JmImageDetail
     for image in photo:
         print(f'图片url: {image.img_url}')
-
+        
+    # 下载单个图片
+    client.download_by_image_detail(image, './a.jpg')
+    # 如果是已知未混淆的图片，也可以直接使用url来下载
+    random_image_domain = JmModuleConfig.DOMAIN_IMAGE_LIST
+    client.download_image(f'https://{random_image_domain}/media/albums/416130.jpg', './a.jpg')
+    
 
 # 多线程发起请求
 multi_thread_launcher(

src/jmcomic/__init__.py

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

src/jmcomic/jm_client_interface.py

@@ -63,7 +63,7 @@ def transfer_to(self,
                     ):
         img_url = img_url or self.url
 
-        if decode_image is False:
+        if decode_image is False or scramble_id is None:
             # 不解密图片，直接保存文件
             JmImageTool.save_resp_img(
                 self,
@@ -245,9 +245,6 @@ def download_image(self,
         :param scramble_id: 图片所在photo的scramble_id
         :param decode_image: 要保存的是解密后的图还是原图
         """
-        if scramble_id is None:
-            scramble_id = JmMagicConstants.SCRAMBLE_220980
-
         # 请求图片
         resp = self.get_jm_image(img_url)
 

src/jmcomic/jm_config.py

@@ -76,7 +76,7 @@ class JmMagicConstants:
     APP_TOKEN_SECRET = '18comicAPP'
     APP_TOKEN_SECRET_2 = '18comicAPPContent'
     APP_DATA_SECRET = '185Hcomic3PAPP7R'
-    APP_VERSION = '1.7.2'
+    APP_VERSION = '1.7.5'
 
 
 # 模块级别共用配置
@@ -127,13 +127,10 @@ class JmModuleConfig:
 
     # 移动端API域名
     DOMAIN_API_LIST = shuffled('''
-    www.cdnxxx-proxy.vip
-    www.cdnxxx-proxy.org
-    www.cdnxxx-proxy.xyz
-    www.cdnxxx-proxy.co
+    www.jmapiproxyxxx.vip
+    www.cdnblackmyth.vip
     www.cdnblackmyth.xyz
-
-
+    www.cdnxxx-proxy.co
     ''')
 
     APP_HEADERS_TEMPLATE = {

src/jmcomic/jm_toolkit.py

@@ -6,7 +6,7 @@
 class JmcomicText:
     pattern_jm_domain = compile(r'https://([\w.-]+)')
     pattern_jm_pa_id = [
-        (compile(r'(photos?|album)/(\d+)'), 2),
+        (compile(r'(photos?|albums?)/(\d+)'), 2),
         (compile(r'id=(\d+)'), 1),
     ]
     pattern_html_jm_pub_domain = compile(r'[\w-]+\.\w+/?\w+')
@@ -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>')

tests/test_jmcomic/test_jm_client.py

@@ -71,7 +71,7 @@ def test_photo_sort(self):
 
         # 测试用例 - 多章本子
         multi_photo_album_is = str_to_list('''
-        400222
+        282293
         122061
         ''')