nonebot-plugin-jmdownloader 1.0.0__tar.gz → 1.0.2__tar.gz

{nonebot_plugin_jmdownloader-1.0.0 → nonebot_plugin_jmdownloader-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-jmdownloader
-Version: 1.0.0
+Version: 1.0.2
 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.0 → nonebot_plugin_jmdownloader-1.0.2}/nonebot_plugin_jmdownloader/__init__.py

@@ -2,12 +2,14 @@ import asyncio
 import hashlib
 import os
 import random
+from re import A
 import shutil
 import time
 
+from httpx import get
 from jmcomic import (JmcomicException, JmDownloader,
                      MissingAlbumPhotoException, create_option_by_str)
-from nonebot import logger, on_command, require
+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,
@@ -52,6 +54,7 @@ except JmcomicException as e:
 
 results_per_page = plugin_config.jmcomic_results_per_page
 
+
 # region jm功能指令
 jm_download = on_command("jm下载", aliases={"JM下载"}, block=True, rule=check_group_and_user)
 @jm_download.handle()
@@ -86,29 +89,32 @@ 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:
+        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("本子信息可能被屏蔽，已开始下载")
 
     try:
         pdf_path = f"{cache_dir}/{photo.id}.pdf"
 
         # 如果不存在，则下载
         if not os.path.exists(pdf_path):
-            if not await download_photo_async(client, downloader, photo):
+            if not await download_photo_async(downloader, photo):
                 await jm_download.finish("下载失败")
 
         # 根据配置决定是否需要修改MD5
@@ -180,7 +186,7 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
         avatar = await blur_image_async(avatar)
         message += MessageSegment.image(avatar)
 
-    message_node = MessageSegment("node", {"name": "jm查询结果", "content": message})
+    message_node = MessageSegment("node", {"name": "jm查询结果", "uin": bot.self_id, "content": message})
     messages = [message_node]
 
     try:
@@ -222,6 +228,7 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
         if data_manager.has_restricted_tag(photo.tags):
             message_node = MessageSegment("node", {
                 "name": "jm搜索结果",
+                "uin": bot.self_id,
                 "content": blocked_message
             })
         else:
@@ -236,6 +243,7 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
 
             message_node = MessageSegment("node", {
                 "name": "jm搜索结果",
+                "uin": bot.self_id,
                 "content": node_content
             })
         messages.append(message_node)
@@ -306,7 +314,11 @@ async def handle_jm_next_page(bot: Bot, event: MessageEvent):
             continue
 
         if data_manager.has_restricted_tag(photo.tags):
-            message_node = MessageSegment("node", {"name": "jm搜索结果", "content": blocked_message})
+            message_node = MessageSegment("node", {
+                "name": "jm搜索结果",
+                "uin": bot.self_id,
+                "content": blocked_message
+            })
         else:
             node_content = Message()
             node_content += f"jm{photo.id} | {photo.title}\n"
@@ -317,7 +329,11 @@ async def handle_jm_next_page(bot: Bot, event: MessageEvent):
                 avatar = await blur_image_async(avatar)
                 node_content += MessageSegment.image(avatar)
 
-            message_node = MessageSegment("node", {"name": "jm搜索结果", "content": node_content})
+            message_node = MessageSegment("node", {
+                "name": "jm搜索结果",
+                "uin": bot.self_id,
+                "content": node_content
+            })
         messages.append(message_node)
 
     try:

{nonebot_plugin_jmdownloader-1.0.0 → nonebot_plugin_jmdownloader-1.0.2}/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.0 → nonebot_plugin_jmdownloader-1.0.2}/nonebot_plugin_jmdownloader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-jmdownloader
-Version: 1.0.0
+Version: 1.0.2
 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.0 → nonebot_plugin_jmdownloader-1.0.2}/nonebot_plugin_jmdownloader.egg-info/requires.txt

@@ -6,6 +6,6 @@ nonebot-plugin-waiter<1.0.0,>=0.8.1
 nonebot-plugin-localstore<1.0.0,>=0.7.4
 nonebot-plugin-apscheduler<1.0.0,>=0.5.0
 nonebot-adapter-onebot<3.0.0,>=2.4.6
-jmcomic>=2.5.33
+jmcomic>=2.5.35
 pillow>=11.1.0
 img2pdf>=0.6.0

{nonebot_plugin_jmdownloader-1.0.0 → nonebot_plugin_jmdownloader-1.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-jmdownloader"
-version = "1.0.0"
+version = "1.0.2"
 description = "基于 Nonebot2 的 JMComic 插件"
 readme = "README.md"
 authors = [{ name = "Misty02600", email = "xiao02600@gmail.com" }]
@@ -15,7 +15,7 @@ dependencies = [
   "nonebot-plugin-localstore>=0.7.4,<1.0.0",
   "nonebot-plugin-apscheduler>=0.5.0,<1.0.0",
   "nonebot-adapter-onebot>=2.4.6,<3.0.0",
-  "jmcomic>=2.5.33",
+  "jmcomic>=2.5.35",
   "pillow>=11.1.0",
   "img2pdf>=0.6.0",
 ]