jmcomic 2.5.18__tar.gz → 2.5.20__tar.gz

{jmcomic-2.5.18/src/jmcomic.egg-info → jmcomic-2.5.20}/PKG-INFO

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

{jmcomic-2.5.18 → jmcomic-2.5.20}/src/jmcomic/__init__.py

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

{jmcomic-2.5.18 → jmcomic-2.5.20}/src/jmcomic/jm_config.py

@@ -1,4 +1,12 @@
-from common import time_stamp, str_to_list, field_cache, ProxyBuilder
+from common import time_stamp, field_cache, ProxyBuilder
+
+
+def shuffled(lines):
+    from random import shuffle
+    from common import str_to_list
+    ls = str_to_list(lines)
+    shuffle(ls)
+    return ls
 
 
 def default_jm_logging(topic: str, msg: str):
@@ -68,7 +76,7 @@ class JmMagicConstants:
     APP_TOKEN_SECRET = '18comicAPP'
     APP_TOKEN_SECRET_2 = '18comicAPPContent'
     APP_DATA_SECRET = '185Hcomic3PAPP7R'
-    APP_VERSION = '1.7.1'
+    APP_VERSION = '1.7.2'
 
 
 # 模块级别共用配置
@@ -142,20 +150,19 @@ class JmModuleConfig:
     APP_COOKIES = None
 
     # 移动端图片域名
-    DOMAIN_IMAGE_LIST = str_to_list('''
+    DOMAIN_IMAGE_LIST = shuffled('''
     cdn-msp.jmapiproxy1.cc
     cdn-msp.jmapiproxy2.cc
     cdn-msp2.jmapiproxy2.cc
     cdn-msp3.jmapiproxy2.cc
     cdn-msp.jmapinodeudzn.net
     cdn-msp3.jmapinodeudzn.net
-
     ''')
 
     # 移动端API域名
-    DOMAIN_API_LIST = str_to_list('''
-    www.jmapidestiny.xyz
+    DOMAIN_API_LIST = shuffled('''
     www.jmeadpoolcdn.one
+    www.jmapiproxyxxx.one
     www.jmeadpoolcdn.life
     
     ''')

{jmcomic-2.5.18 → jmcomic-2.5.20}/src/jmcomic/jm_downloader.py

@@ -110,7 +110,6 @@ class JmDownloader(DownloadCallback):
         if use_cache is True and image.exists:
             return
 
-        e = None
         try:
             client.download_by_image_detail(
                 image,
@@ -121,9 +120,7 @@ class JmDownloader(DownloadCallback):
             jm_log('image.failed', f'图片下载失败: [{image.download_url}], 异常: {e}')
             # 保存失败记录
             self.download_failed_list.append((image, e))
-
-        if e is not None:
-            raise e
+            raise
 
         self.after_image(image, img_save_path)
 

{jmcomic-2.5.18 → jmcomic-2.5.20/src/jmcomic.egg-info}/PKG-INFO

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