jmcomic 2.5.11__py3-none-any.whl → 2.5.12__py3-none-any.whl

jmcomic/__init__.py

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

jmcomic/jm_client_interface.py

@@ -581,6 +581,6 @@ class JmcomicClient(
         """
         if isinstance(self, ctype):
             return True
-        if self.client_key == instance.client_key:
+        if self.client_key == ctype.client_key:
             return True
         return False

jmcomic/jm_config.py

@@ -109,14 +109,17 @@ class JmModuleConfig:
     DOMAIN_IMAGE_LIST = str_to_list('''
     cdn-msp.jmapinodeudzn.net
     cdn-msp2.jmapinodeudzn.net
+    cdn-msp2.jmapiproxy3.cc
+    cdn-msp3.jmapinodeudzn.net
 
     ''')
 
     # 移动端API域名
     DOMAIN_API_LIST = str_to_list('''
     www.jmapinodeudzn.xyz
-    www.jmapinode.vip
-    www.jmapinode.biz
+    www.cdn-eldenringproxy.xyz
+    www.cdn-eldenringproxy.me
+    www.cdn-eldenringproxy.vip
     www.jmapinode.xyz
     ''')
 

jmcomic/jm_option.py

@@ -72,11 +72,9 @@ class DirRule:
 
     Detail = Union[JmAlbumDetail, JmPhotoDetail, None]
     RuleFunc = Callable[[Detail], str]
-    RuleSolver = Tuple[int, RuleFunc, str]
+    RuleSolver = Tuple[str, RuleFunc, str]
     RuleSolverList = List[RuleSolver]
 
-    rule_solver_cache: Dict[str, RuleSolver] = {}
-
     def __init__(self, rule: str, base_dir=None):
         base_dir = JmcomicText.parse_to_abspath(base_dir)
         self.base_dir = base_dir
@@ -100,6 +98,25 @@ class DirRule:
 
         return fix_filepath('/'.join(path_ls), is_dir=True)
 
+    def decide_album_root_dir(self, album: JmAlbumDetail) -> str:
+        path_ls = []
+        for solver in self.solver_list:
+            key, _, rule = solver
+
+            if key != 'Bd' and key != 'A':
+                continue
+
+            try:
+                ret = self.apply_rule_solver(album, None, solver)
+            except BaseException as e:
+                # noinspection PyUnboundLocalVariable
+                jm_log('dir_rule', f'路径规则"{rule}"的解析出错: {e}, album={album}')
+                raise e
+
+            path_ls.append(str(ret))
+
+        return fix_filepath('/'.join(path_ls), is_dir=True)
+
     def get_role_solver_list(self, rule_dsl: str, base_dir: str) -> RuleSolverList:
         """
         解析下载路径dsl，得到一个路径规则解析列表
@@ -111,7 +128,7 @@ class DirRule:
         for rule in rule_list:
             rule = rule.strip()
             if rule == 'Bd':
-                solver_ls.append((0, lambda _: base_dir, 'Bd'))
+                solver_ls.append(('Bd', lambda _: base_dir, 'Bd'))
                 continue
 
             rule_solver = self.get_rule_solver(rule)
@@ -137,24 +154,14 @@ class DirRule:
 
     @classmethod
     def get_rule_solver(cls, rule: str) -> Optional[RuleSolver]:
-        # 查找缓存
-        if rule in cls.rule_solver_cache:
-            return cls.rule_solver_cache[rule]
-
         # 检查dsl
         if not rule.startswith(('A', 'P')):
             return None
 
-        # Axxx or Pyyy
-        key = 1 if rule[0] == 'A' else 2
-
         def solve_func(detail):
             return fix_windir_name(str(DetailEntity.get_dirname(detail, rule[1:])))
 
-        # 保存缓存
-        rule_solver = (key, solve_func, rule)
-        cls.rule_solver_cache[rule] = rule_solver
-        return rule_solver
+        return rule[0], solve_func, rule
 
     @classmethod
     def apply_rule_solver(cls, album, photo, rule_solver: RuleSolver) -> str:
@@ -168,11 +175,11 @@ class DirRule:
         """
 
         def choose_detail(key):
-            if key == 0:
+            if key == 'Bd':
                 return None
-            if key == 1:
+            if key == 'A':
                 return album
-            if key == 2:
+            if key == 'P':
                 return photo
 
         key, func, _ = rule_solver

jmcomic/jm_plugin.py

@@ -1035,3 +1035,62 @@ class SkipPhotoWithFewImagesPlugin(JmOptionPlugin):
     @field_cache()  # 单例
     def build(cls, option: JmOption) -> 'JmOptionPlugin':
         return super().build(option)
+
+
+class DeleteDuplicatedFilesPlugin(JmOptionPlugin):
+    """
+    https://github.com/hect0x7/JMComic-Crawler-Python/issues/244
+    """
+    plugin_key = 'delete_duplicated_files'
+
+    @classmethod
+    def calculate_md5(cls, file_path):
+        import hashlib
+
+        """计算文件的MD5哈希值"""
+        hash_md5 = hashlib.md5()
+        with open(file_path, "rb") as f:
+            for chunk in iter(lambda: f.read(4096), b""):
+                hash_md5.update(chunk)
+        return hash_md5.hexdigest()
+
+    @classmethod
+    def find_duplicate_files(cls, root_folder):
+        """递归读取文件夹下所有文件并计算MD5出现次数"""
+        import os
+        from collections import defaultdict
+        md5_dict = defaultdict(list)
+
+        for root, _, files in os.walk(root_folder):
+            for file in files:
+                file_path = os.path.join(root, file)
+                file_md5 = cls.calculate_md5(file_path)
+                md5_dict[file_md5].append(file_path)
+
+        return md5_dict
+
+    def invoke(self,
+               limit,
+               album=None,
+               downloader=None,
+               delete_original_file=True,
+               **kwargs,
+               ) -> None:
+        if album is None:
+            return
+
+        self.delete_original_file = delete_original_file
+        # 获取到下载本子所在根目录
+        root_folder = self.option.dir_rule.decide_album_root_dir(album)
+        self.find_duplicated_files_and_delete(limit, root_folder, album)
+
+    def find_duplicated_files_and_delete(self, limit: int, root_folder: str, album: Optional[JmAlbumDetail] = None):
+        md5_dict = self.find_duplicate_files(root_folder)
+        # 打印MD5出现次数大于等于limit的文件
+        for md5, paths in md5_dict.items():
+            if len(paths) >= limit:
+                prefix = '' if album is None else f'({album.album_id}) '
+                message = [prefix + f'MD5: {md5} 出现次数: {len(paths)}'] + \
+                          [f'  {path}' for path in paths]
+                self.log('\n'.join(message))
+                self.execute_deletion(paths)

jmcomic/jm_toolkit.py

@@ -707,7 +707,7 @@ class JmImageTool:
         如果需要改变图片的文件格式，比如 .jpg → .png，则需要指定参数 neet_convert=True.
         如果不需要改变图片的文件格式，使用 need_convert=False，可以跳过PIL解析图片，效率更高.
 
-        :param resp: HTTP响应对象
+        :param resp: JmImageResp
         :param filepath: 图片文件路径
         :param need_convert: 是否转换图片
         """
@@ -746,7 +746,7 @@ class JmImageTool:
 
         # 无需解密，直接保存
         if num == 0:
-            img_src.save(decoded_save_path)
+            cls.save_image(img_src, decoded_save_path)
             return
 
         import math

{jmcomic-2.5.11.dist-info → jmcomic-2.5.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jmcomic
-Version: 2.5.11
+Version: 2.5.12
 Summary: Python API For JMComic (禁漫天堂)
 Home-page: https://github.com/hect0x7/JMComic-Crawler-Python
 Author: hect0x7
@@ -71,27 +71,50 @@ Requires-Dist: pycryptodome
 
 ## 快速上手
 
-使用下面的两行代码，即可实现功能：把某个本子（album）里的所有章节（photo）下载到本地
-
+### 1. 下载本子方法
+只需要使用如下代码，就可以下载本子`JM422866`的所有章节的图片：
 ```python
 import jmcomic  # 导入此模块，需要先安装.
 jmcomic.download_album('422866')  # 传入要下载的album的id，即可下载整个album到本地.
 ```
 
-* v2.2.9: 新增命令行调用方式，上述的代码可以转为一行命令
+上面的 `download_album`方法还有一个参数`option`，可用于控制下载配置，配置包括禁漫域名、网络代理、图片格式转换、插件等等。
+
+你可能需要这些配置项。推荐使用配置文件创建option，用option下载本子，见下章：
+
+### 2. 使用option配置来下载本子
+
+1. 首先，创建一个配置文件，假设文件名为 `option.yml`
+   
+    该文件有特定的写法，你需要参考这个文档 → [option配置](./assets/docs/sources/option_file_syntax.md)
+    
+    下面做一个演示，假设你需要把下载的图片转为png格式，你应该把以下内容写进`option.yml`
+
+```yml
+download:
+  image:
+    suffix: .png # 该配置用于把下载的图片转为png格式
+```
+
+2. 第二步，运行下面的python代码
+```python
+import jmcomic
 
-```bash
-# 下载album_id为422866的本子
-$ jmcomic 422866
+# 创建配置对象
+option = jmcomic.create_option_by_file('你的配置文件路径，例如 D:/option.yml')
+# 使用option对象来下载本子
+jmcomic.download_album(422866, option)
 ```
 
+
+
 ## 进阶使用
 
 文档网站：[jmcomic.readthedocs.io](https://jmcomic.readthedocs.io/en/latest)
 
-进阶使用可以参考：[jmcomic常用类和方法演示](assets/docs/sources/tutorial/0_demo.md)
+首先，就下载功能，jmcomic提供了很多配置项，大部分的下载需求你都可以通过上文介绍的配置文件来配置。
 
-下面列出的是一些常用的文档：
+如果你不满足于下载，还有其他的使用需求，推荐你先看看以下文档：
 
 * [jmcomic常用类和方法演示](assets/docs/sources/tutorial/0_demo.md)
 * [option配置文件语法（包含插件配置）](./assets/docs/sources/option_file_syntax.md)

jmcomic-2.5.12.dist-info/RECORD

@@ -0,0 +1,18 @@
+jmcomic/__init__.py,sha256=1QCB9drWLz_G92PcVXTxmj-hCjpl4qW4NKNwvTxc0pA,903
+jmcomic/api.py,sha256=uLHtSof7ZaiWZcNDDAz6grD1NYs4VxsoCOrsge3G7v8,3864
+jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
+jmcomic/jm_client_impl.py,sha256=Oszkw7dKfg8DHzmjyBVD1DrHp9OlvLK33IQHB7uXo48,37811
+jmcomic/jm_client_interface.py,sha256=UmwIZt-7-zHfBHq8sNFnfNf-C5kkCQW8_yKKI4cfJYU,17688
+jmcomic/jm_config.py,sha256=z512nMjxJldxRbn8Kt02DrBZ89wLF3cR5_OtY1pemuA,15359
+jmcomic/jm_downloader.py,sha256=0r4z7FRnow6xkRy_WTv7nLQOhYdtZmoouw0BNrhngco,10397
+jmcomic/jm_entity.py,sha256=-WUKYGkNToQv5Hja3RkI5abHF1g46WpLyVjoyXMs-wI,18974
+jmcomic/jm_exception.py,sha256=B9APE1jw23JBzCT12eV_imCZny3mNrSXju1p2IquaHA,4801
+jmcomic/jm_option.py,sha256=4J7RJi1D2plVjNhPXE2QSjMuBeQzlpeAwRCojWqNqnw,22025
+jmcomic/jm_plugin.py,sha256=F5mvqDNU0ir4XUNWpYroV4EdVR3bDBB-FOS15_l1T4k,35732
+jmcomic/jm_toolkit.py,sha256=Skd7bp008Brr3hiXUlm3lgGpPsB1UmmX9XU2Dbx3jps,28655
+jmcomic-2.5.12.dist-info/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
+jmcomic-2.5.12.dist-info/METADATA,sha256=8A6vYjiV74XxGq-B0NKwN8U4N7104yye6Ri8kSGt-HM,7075
+jmcomic-2.5.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+jmcomic-2.5.12.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
+jmcomic-2.5.12.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
+jmcomic-2.5.12.dist-info/RECORD,,

jmcomic-2.5.11.dist-info/RECORD

@@ -1,18 +0,0 @@
-jmcomic/__init__.py,sha256=Hjp1Q6tJ5zCFkSqh2ETXJuh_Rgpx5OKEjMhSbrU3dTs,903
-jmcomic/api.py,sha256=uLHtSof7ZaiWZcNDDAz6grD1NYs4VxsoCOrsge3G7v8,3864
-jmcomic/cl.py,sha256=PBSh0JndNFZw3B7WJPj5Y8SeFdKzHE00jIwYo9An-K0,3475
-jmcomic/jm_client_impl.py,sha256=Oszkw7dKfg8DHzmjyBVD1DrHp9OlvLK33IQHB7uXo48,37811
-jmcomic/jm_client_interface.py,sha256=vP36T2OI5MQdmfdYEnoFGRpHZRTE9LnBetDUFCOnMg4,17691
-jmcomic/jm_config.py,sha256=I08aDW1WH9uVnbyiUvy4lfI8cAU8NNK96cEA5kGYcoM,15252
-jmcomic/jm_downloader.py,sha256=0r4z7FRnow6xkRy_WTv7nLQOhYdtZmoouw0BNrhngco,10397
-jmcomic/jm_entity.py,sha256=-WUKYGkNToQv5Hja3RkI5abHF1g46WpLyVjoyXMs-wI,18974
-jmcomic/jm_exception.py,sha256=B9APE1jw23JBzCT12eV_imCZny3mNrSXju1p2IquaHA,4801
-jmcomic/jm_option.py,sha256=s16w8uZYfCBUgsxCjegnLoAqHF69rJicVZKQTZlQTJA,21723
-jmcomic/jm_plugin.py,sha256=21bd71tmsKyli73skMx0ozcqBM5saHzICEicjRQ98-Q,33606
-jmcomic/jm_toolkit.py,sha256=WLHaigCN03Z4b5swGTRTTSWzZsa0uFxGAnw4xKhbh1U,28649
-jmcomic-2.5.11.dist-info/LICENSE,sha256=kz4coTxZxuGxisK3W00tjK57Zh3RcMGq-EnbXrK7-xA,1064
-jmcomic-2.5.11.dist-info/METADATA,sha256=2vGTgKwdQwztHQ8eIQ9cMOdHb5FTKYCPRZ_uWP6qP0E,6123
-jmcomic-2.5.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-jmcomic-2.5.11.dist-info/entry_points.txt,sha256=tRbQltaGSBjejI0c9jYt-4SXQMd5nSDHcMvHmuTy4ow,44
-jmcomic-2.5.11.dist-info/top_level.txt,sha256=puvVMFYJqIbd6NOTMEvOyugMTT8woBfSQyxEBan3zY4,8
-jmcomic-2.5.11.dist-info/RECORD,,