nonebot-plugin-jmdownloader 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

nonebot_plugin_jmdownloader/__init__.py

@@ -2,6 +2,7 @@ import asyncio
 import hashlib
 import os
 import random
+from re import A
 import shutil
 import time
 
@@ -12,7 +13,7 @@ from nonebot import logger, on_command, require, get_bot
 from nonebot.adapters.onebot.v11 import (GROUP_ADMIN, GROUP_OWNER,
                                          ActionFailed, Bot, GroupMessageEvent,
                                          Message, MessageEvent, MessageSegment,
-                                         PrivateMessageEvent)
+                                         PrivateMessageEvent, NetworkError)
 from nonebot.params import ArgPlainText, CommandArg
 from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata
@@ -88,31 +89,36 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
         else:
             await jm_download.finish("该本子（或其tag）被禁止下载！")
 
-    if str(user_id) not in bot.config.superusers:
-        data_manager.decrease_user_limit(user_id, 1)
-        user_limit_new = data_manager.get_user_limit(user_id)
-        message = Message()
-        message += f"jm{photo.id} | {photo.title}\n"
-        message += f"🎨 作者: {photo.author}\n"
-        message += "🔖 标签: " + " ".join(f"#{tag}" for tag in photo.tags) + "\n"
-        message += f"开始下载...\n你本周还有{user_limit_new}次下载次数！"
-        await jm_download.send(message)
-    else:
-        message = Message()
-        message += f"jm{photo.id} | {photo.title}\n"
-        message += f"🎨 作者: {photo.author}\n"
-        message += "🔖 标签: " + " ".join(f"#{tag}" for tag in photo.tags) + "\n"
-        message += "开始下载..."
-        await jm_download.send(message)
-
     try:
-        pdf_path = f"{cache_dir}/{photo.id}.pdf"
+        if str(user_id) not in bot.config.superusers:
+            data_manager.decrease_user_limit(user_id, 1)
+            user_limit_new = data_manager.get_user_limit(user_id)
+            message = Message()
+            message += f"jm{photo.id} | {photo.title}\n"
+            message += f"🎨 作者: {photo.author}\n"
+            message += "🔖 标签: " + " ".join(f"#{tag}" for tag in photo.tags) + "\n"
+            message += f"开始下载...\n你本周还有{user_limit_new}次下载次数！"
+            await jm_download.send(message)
+        else:
+            message = Message()
+            message += f"jm{photo.id} | {photo.title}\n"
+            message += f"🎨 作者: {photo.author}\n"
+            message += "🔖 标签: " + " ".join(f"#{tag}" for tag in photo.tags) + "\n"
+            message += "开始下载..."
+            await jm_download.send(message)
+    except ActionFailed:
+        await jm_download.send("本子信息可能被屏蔽，已开始下载")
+    except NetworkError as e:
+        logger.warning(f"{e},可能是协议端发送文件时间太长导致的报错")
+
+    pdf_path = f"{cache_dir}/{photo.id}.pdf"
 
-        # 如果不存在，则下载
-        if not os.path.exists(pdf_path):
-            if not await download_photo_async(client, downloader, photo):
-                await jm_download.finish("下载失败")
+    # 如果不存在，则下载
+    if not os.path.exists(pdf_path):
+        if not await download_photo_async(downloader, photo):
+            await jm_download.finish("下载失败")
 
+    try:
         # 根据配置决定是否需要修改MD5
         if plugin_config.jmcomic_modify_real_md5:
             random_suffix = hashlib.md5(str(time.time() + random.random()).encode()).hexdigest()[:8]
@@ -121,41 +127,41 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
             modified = await asyncio.to_thread(modify_pdf_md5, pdf_path, renamed_pdf_path)
             if modified:
                 pdf_path = renamed_pdf_path
+    except Exception as e:
+        logger.error(f"处理PDF文件时出错: {e}")
+        await jm_download.finish("处理文件失败")
 
-        try:
-            if isinstance(event, GroupMessageEvent):
-                folder_id = data_manager.get_group_folder_id(event.group_id)
-
-                if folder_id:
-                    await bot.call_api(
-                        "upload_group_file",
-                        group_id=event.group_id,
-                        file=pdf_path,
-                        name=f"{photo.id}.pdf",
-                        folder_id=folder_id
-                    )
-                else:
-                    await bot.call_api(
-                        "upload_group_file",
-                        group_id=event.group_id,
-                        file=pdf_path,
-                        name=f"{photo.id}.pdf"
-                    )
-
-            elif isinstance(event, PrivateMessageEvent):
+    try:
+        if isinstance(event, GroupMessageEvent):
+            folder_id = data_manager.get_group_folder_id(event.group_id)
+
+            if folder_id:
+                await bot.call_api(
+                    "upload_group_file",
+                    group_id=event.group_id,
+                    file=pdf_path,
+                    name=f"{photo.id}.pdf",
+                    folder_id=folder_id
+                )
+            else:
                 await bot.call_api(
-                    "upload_private_file",
-                    user_id=event.user_id,
+                    "upload_group_file",
+                    group_id=event.group_id,
                     file=pdf_path,
                     name=f"{photo.id}.pdf"
                 )
 
-        except ActionFailed:
-            await jm_download.send("发送文件失败")
+        elif isinstance(event, PrivateMessageEvent):
+            await bot.call_api(
+                "upload_private_file",
+                user_id=event.user_id,
+                file=pdf_path,
+                name=f"{photo.id}.pdf"
+            )
+
+    except ActionFailed:
+        await jm_download.send("发送文件失败")
 
-    except Exception as e:
-        logger.error(f"处理PDF文件时出错: {e}")
-        await jm_download.send("处理文件失败")
 
 
 jm_query = on_command("jm查询", aliases={"JM查询"}, block=True, rule=check_group_and_user)

nonebot_plugin_jmdownloader/utils.py

@@ -43,17 +43,17 @@ async def get_photo_info_async(client: JmcomicClient, photo_id):
     return await asyncio.to_thread(get_photo_info, client, photo_id)
 
 
-def download_photo(client: JmcomicClient, downloader: JmDownloader, photo: JmPhotoDetail):
+def download_photo(downloader: JmDownloader, photo: JmPhotoDetail):
     try:
         with downloader as dler:
-            dler.download_by_photo_detail(photo, client)
+            dler.download_by_photo_detail(photo)
         return True
     except JmcomicException as e:
         logger.error(f"JMComic 下载失败: {e}")
         return False
 
-async def download_photo_async(client: JmcomicClient, downloader: JmDownloader, photo: JmPhotoDetail):
-    return await asyncio.to_thread(download_photo, client, downloader, photo)
+async def download_photo_async(downloader: JmDownloader, photo: JmPhotoDetail):
+    return await asyncio.to_thread(download_photo, downloader, photo)
 
 
 def search_album(client: JmcomicClient, search_query: str, page: int = 1):

{nonebot_plugin_jmdownloader-1.0.1.dist-info → nonebot_plugin_jmdownloader-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-jmdownloader
-Version: 1.0.1
+Version: 1.0.3
 Summary: 基于 Nonebot2 的 JMComic 插件
 Author-email: Misty02600 <xiao02600@gmail.com>
 Project-URL: Repository, https://github.com/Misty02600/nonebot-plugin-jmdownloader
@@ -15,7 +15,7 @@ Requires-Dist: nonebot-plugin-waiter<1.0.0,>=0.8.1
 Requires-Dist: nonebot-plugin-localstore<1.0.0,>=0.7.4
 Requires-Dist: nonebot-plugin-apscheduler<1.0.0,>=0.5.0
 Requires-Dist: nonebot-adapter-onebot<3.0.0,>=2.4.6
-Requires-Dist: jmcomic>=2.5.33
+Requires-Dist: jmcomic>=2.5.35
 Requires-Dist: pillow>=11.1.0
 Requires-Dist: img2pdf>=0.6.0
 Dynamic: license-file

nonebot_plugin_jmdownloader-1.0.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+nonebot_plugin_jmdownloader/__init__.py,sha256=yHK1h2VyHdirwzc5IMF0HqZYv4R5bzgV41A-8rgbwxk,23535
+nonebot_plugin_jmdownloader/config.py,sha256=6v9_tJMbA0w6BC-UWdwT2E7ENYqEEeyk9RoQVjF0FBA,2302
+nonebot_plugin_jmdownloader/data_source.py,sha256=xWD9wxBpkSw0XNB7a94G6DUoms_uE_1_3IaRkLiyG_w,9425
+nonebot_plugin_jmdownloader/utils.py,sha256=NHq3QryefW39MiszY1JuGR-EvUsjm5qgtW_pJ0GWeF4,7207
+nonebot_plugin_jmdownloader-1.0.3.dist-info/licenses/LICENSE,sha256=tenc1Gy1mv_JaYJ084mXncDgF7lCA-37R_IHhtZ9GxQ,1062
+nonebot_plugin_jmdownloader-1.0.3.dist-info/METADATA,sha256=a-ckSbodVXmpOyOrEdLdTPUPj2r3YAtvleX2xp6Hr4c,8641
+nonebot_plugin_jmdownloader-1.0.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nonebot_plugin_jmdownloader-1.0.3.dist-info/top_level.txt,sha256=zNFH1naQN94G9iYfnucKC0g4FM6ApV8x_D705Slo1aY,28
+nonebot_plugin_jmdownloader-1.0.3.dist-info/RECORD,,

nonebot_plugin_jmdownloader-1.0.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-nonebot_plugin_jmdownloader/__init__.py,sha256=klXjYxXCCbC0ifFsFK6YAIdI9e2LbVB4dg_cNH6jxVc,23341
-nonebot_plugin_jmdownloader/config.py,sha256=6v9_tJMbA0w6BC-UWdwT2E7ENYqEEeyk9RoQVjF0FBA,2302
-nonebot_plugin_jmdownloader/data_source.py,sha256=xWD9wxBpkSw0XNB7a94G6DUoms_uE_1_3IaRkLiyG_w,9425
-nonebot_plugin_jmdownloader/utils.py,sha256=K6Dx9vkQVsCTIhk5vnL-DXacajuXUslDjv1G0HYEhdg,7269
-nonebot_plugin_jmdownloader-1.0.1.dist-info/licenses/LICENSE,sha256=tenc1Gy1mv_JaYJ084mXncDgF7lCA-37R_IHhtZ9GxQ,1062
-nonebot_plugin_jmdownloader-1.0.1.dist-info/METADATA,sha256=HyTUX_8_DU_FUfak2_sxHPvI46cg4uyiswZ0F5pGX1s,8641
-nonebot_plugin_jmdownloader-1.0.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nonebot_plugin_jmdownloader-1.0.1.dist-info/top_level.txt,sha256=zNFH1naQN94G9iYfnucKC0g4FM6ApV8x_D705Slo1aY,28
-nonebot_plugin_jmdownloader-1.0.1.dist-info/RECORD,,