nonebot-plugin-dbdmap 0.2.0__tar.gz → 0.2.2__tar.gz

{nonebot_plugin_dbdmap-0.2.0 → nonebot_plugin_dbdmap-0.2.2}/PKG-INFO

@@ -1,20 +1,18 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-dbdmap
-Version: 0.2.0
+Version: 0.2.2
 Summary: 《黎明杀机地图查询插件》
 Author-email: 77_77 <xiexiewen73@gmail.com>
 License: MIT
-Project-URL: Homepage, https://github.com/xiexiewen73-source/nonebot-plugin-dbdmap
-Project-URL: Repository, https://github.com/xiexiewen73-source/nonebot-plugin-dbdmap
 Keywords: nonebot,plugin,dead-by-daylight,dbd
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.8
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: nonebot2>=2.0.0
+Requires-Dist: nonebot2>=2.5.0
+Requires-Dist: nonebot-adapter-onebot>=2.4.6
 
 # NoneBot-Plugin-DBD-Map
 

{nonebot_plugin_dbdmap-0.2.0 → nonebot_plugin_dbdmap-0.2.2}/nonebot_plugin_dbd/__init__.py

@@ -1,24 +1,22 @@
 from nonebot.plugin import PluginMetadata
 import os
 import json
-from nonebot import on_command,get_driver
-from nonebot.adapters.onebot.v11 import Message, MessageEvent, MessageSegment,Bot
+from nonebot import on_command, get_driver
+from nonebot.adapters.onebot.v11 import Message, MessageEvent, MessageSegment, Bot
 from nonebot.params import CommandArg
 from nonebot.exception import FinishedException
 from pathlib import Path
+
 __plugin_meta__ = PluginMetadata(
     name="黎明杀机地图查询",
-    description="支持查询所有官方地图",
-    usage="发送 /查询 地图名&添加别名详见md",
+    description="支持查询所有官方地图及自定义别名",
+    usage="发送 /查询 地图名 或 /添加别名 原名 新别名",
     type="application",
-    homepage="https://github.com/你的用户名/nonebot-plugin-dbdmap",
+    homepage="https://github.com/xiexiewen73-source/nonebot-plugin-dbdmap",
     supported_adapters={"~onebot.v11"}
 )
-# ==================== 1. 基础地图数据（官方中文名 + 文件名） ====================
-base_dir = Path(os.path.dirname(os.path.abspath(__file__))).parent.parent.parent
 
-# 拼接静态资源路径
-STATIC_FOLDER = base_dir / "static" / "DBD_Map"
+# 基础地图数据（纯内存数据，无外部依赖）
 BASE_MAP_DATA = {
     "gas_heaven": {"zh": "天堂加油站", "file": "gas_heaven.jpg"},
     "forgotten_ruins": {"zh": "被遗忘的废墟", "file": "forgotten_ruins.jpg"},
@@ -42,7 +40,7 @@ BASE_MAP_DATA = {
     "forgotten_ruins_dnd": {"zh": "被遗忘的废墟 (D&D)", "file": "forgotten_ruins_dnd.jpg"},
     "mount_ormond_resort": {"zh": "奥蒙德度假村", "file": "mount_ormond_resort.jpg"},
     "mount_ormond_resort_v2": {"zh": "奥蒙德度假村 v2", "file": "mount_ormond_resort_v2.jpg"},
-    "shelter_woods_2": {"zh": "庇护林", "file": "shelter_woods_2.jpg"},
+    "shelter_woods_2": {"zh": "庇护林 II", "file": "shelter_woods_2.jpg"},
     "family_residence": {"zh": "家族住所", "file": "family_residence.jpg"},
     "dead_sands": {"zh": "死亡沙地", "file": "dead_sands.jpg"},
     "raccoon_city_police_station": {"zh": "浣熊市警察局", "file": "raccoon_city_police_station.jpg"},
@@ -50,7 +48,7 @@ BASE_MAP_DATA = {
     "mothers_dwelling": {"zh": "母亲之屋", "file": "mothers_dwelling.jpg"},
     "rotten_fields": {"zh": "腐烂田野", "file": "rotten_fields.jpg"},
     "toba_landing": {"zh": "托巴登陆点", "file": "toba_landing.jpg"},
-    "suffocation_pit_ii": {"zh": "窒息矿井", "file": "suffocation_pit_ii.jpg"},
+    "suffocation_pit_ii": {"zh": "窒息矿井 II", "file": "suffocation_pit_ii.jpg"},
     "freddy_fazbears_pizza": {"zh": "弗莱迪披萨店", "file": "freddy_fazbears_pizza.jpg"},
     "torment_creek": {"zh": "折磨溪流", "file": "torment_creek.jpg"},
     "family_residence_v1": {"zh": "家族住所 v1", "file": "family_residence_v1.jpg"},
@@ -58,10 +56,10 @@ BASE_MAP_DATA = {
     "nostromo_wreckage": {"zh": "诺斯特罗莫残骸", "file": "nostromo_wreckage.jpg"},
     "dead_dawg_saloon": {"zh": "死狗酒馆", "file": "dead_dawg_saloon.jpg"},
     "blood_lodge": {"zh": "血腥小屋", "file": "blood_lodge.jpg"},
-    "coal_tower_i": {"zh": "煤塔", "file": "coal_tower_i.jpg"},
-    "coal_tower_ii": {"zh": "煤塔", "file": "coal_tower_ii.jpg"},
+    "coal_tower_i": {"zh": "煤塔 I", "file": "coal_tower_i.jpg"},
+    "coal_tower_ii": {"zh": "煤塔 II", "file": "coal_tower_ii.jpg"},
     "shelter_woods": {"zh": "庇护林", "file": "shelter_woods.jpg"},
-    "ironworks_of_misery_ii": {"zh": "苦难铁厂", "file": "ironworks_of_misery_ii.jpg"},
+    "ironworks_of_misery_ii": {"zh": "苦难铁厂 II", "file": "ironworks_of_misery_ii.jpg"},
     "rancid_abattoir": {"zh": "腐臭屠宰场", "file": "rancid_abattoir.jpg"},
     "crotus_prenn_asylum": {"zh": "克劳图斯精神病院", "file": "crotus_prenn_asylum.jpg"},
     "eyrie_of_crows": {"zh": "乌鸦之巢", "file": "eyrie_of_crows.jpg"},
@@ -71,47 +69,18 @@ BASE_MAP_DATA = {
     "wretched_shop": {"zh": "悲惨商店", "file": "wretched_shop.jpg"},
 }
 
-# ==================== 2. 动态别名文件管理 ====================
-current_dir = os.path.dirname(os.path.abspath(__file__))
-base_dir = os.path.dirname(current_dir)
-ALIAS_FILE = os.path.join(base_dir, "data", "dbd_aliases.json")
-
-# 确保 data 文件夹存在
-os.makedirs(os.path.dirname(ALIAS_FILE), exist_ok=True)
-
-
-# 读取自定义别名
-def load_custom_aliases():
-    if os.path.exists(ALIAS_FILE):
-        with open(ALIAS_FILE, "r", encoding="utf-8") as f:
-            return json.load(f)
-    return {}
-
-
-# 保存自定义别名
-def save_custom_aliases(aliases):
-    with open(ALIAS_FILE, "w", encoding="utf-8") as f:
-        json.dump(aliases, f, ensure_ascii=False, indent=4)
-
-
-# 构建当前所有别名（基础中文 + 自定义别名）
+# 构建所有别名（纯内存操作）
 def get_all_aliases():
     aliases = {}
-    # 基础中文名
     for info in BASE_MAP_DATA.values():
         aliases[info["zh"]] = info["file"]
-    # 自定义别名
-    custom = load_custom_aliases()
-    aliases.update(custom)
     return aliases
 
-
-# ==================== 3. 查询指令 ====================
+# ==================== 查询指令 ====================
 query_cmd = on_command("查询", aliases={"地图", "查图"}, priority=1, block=True)
 
-
 @query_cmd.handle()
-async def handle_query(event: MessageEvent,bot:Bot,args: Message = CommandArg()):
+async def handle_query(event: MessageEvent, bot: Bot, args: Message = CommandArg()):
     keyword = args.extract_plain_text().strip()
 
     if not keyword:
@@ -123,46 +92,43 @@ async def handle_query(event: MessageEvent,bot:Bot,args: Message = CommandArg())
     filename = aliases.get(keyword)
 
     if not filename:
-        # 如果没找到，尝试匹配英文名
         if keyword.lower() in BASE_MAP_DATA:
             filename = BASE_MAP_DATA[keyword.lower()]["file"]
         else:
             await query_cmd.finish(f"没有找到地图【{keyword}】，请尝试其他关键词。")
             return
 
-    # 拼接图片路径（使用动态绝对路径）
-    img_path = os.path.join(base_dir, "static", "DBD_Map", filename)
+    # 动态获取机器人项目根目录（测试服务器也会成功）
+    plugin_dir = Path(__file__).parent
+    # 向上3级找到项目根目录
+    project_root = plugin_dir.parent.parent.parent
+    img_path = project_root / "static" / "DBD_Map" / filename
 
     try:
-        # 尝试发送图片
         await query_cmd.send(MessageSegment.image(f"file:///{img_path}"))
 
-    except FinishedException as e:  # 3. 直接在这里“捕获”它，不需要赋值！
-        error_msg = f"事件已经被其他插件结束 (FinishedException)\n可能被抢答：{img_path}"
+    except FinishedException:
+        error_msg = f"事件已经被其他插件结束\n可能被抢答：{img_path}"
         global_config = get_driver().config
 
-        async def send_error_to_master(bot: Bot, error_msg: str):
-            # 遍历所有超级用户的 QQ 号，发给每一个
-            for master_id in global_config.superusers:
-                try:
-                    await bot.call_api(
-                        "send_private_msg",
-                        user_id=int(master_id),
-                        message=f"⚠️ DBD地图查询被拦截了！\n\n错误详情：\n{error_msg}"
-                    )
-                    print(f"[报错上报] 已私聊通知主人：{master_id}")
-                except Exception as e:
-                    print(f"[报错上报失败] 无法私聊主人 {master_id}，原因：{e}")
-        print(f"[DBD地图] 遭遇 FinishedException，已上报主人。")
-
-    except Exception as e:  # 4. 其他普通错误，直接回复用户
+        for master_id in global_config.superusers:
+            try:
+                await bot.call_api(
+                    "send_private_msg",
+                    user_id=int(master_id),
+                    message=f"⚠️ DBD地图查询被拦截了！\n\n错误详情：\n{error_msg}"
+                )
+                print(f"[报错上报] 已私聊通知主人：{master_id}")
+            except Exception as e:
+                print(f"[报错上报失败] 无法私聊主人 {master_id}，原因：{e}")
+
+    except Exception as e:
         await query_cmd.finish(f"图片发送失败：{e}")
 
 
-# ==================== 4. 添加别名管理指令 ====================
+# ==================== 添加别名指令 ====================
 add_alias_cmd = on_command("添加别名", aliases={"别名"}, priority=1, block=True)
 
-
 @add_alias_cmd.handle()
 async def handle_add_alias(event: MessageEvent, args: Message = CommandArg()):
     input_text = args.extract_plain_text().strip()
@@ -177,7 +143,6 @@ async def handle_add_alias(event: MessageEvent, args: Message = CommandArg()):
 
     original_keyword, new_alias = parts[0], parts[1]
 
-    # 查找原关键词对应的图片文件名
     all_aliases = get_all_aliases()
     target_file = all_aliases.get(original_keyword) or BASE_MAP_DATA.get(original_keyword.lower(), {}).get("file")
 
@@ -185,9 +150,23 @@ async def handle_add_alias(event: MessageEvent, args: Message = CommandArg()):
         await add_alias_cmd.finish(f"找不到原关键词【{original_keyword}】，请确认它是否存在。")
         return
 
-    # 更新并保存自定义别名
-    custom_aliases = load_custom_aliases()
+    # 动态获取项目目录
+    plugin_dir = Path(__file__).parent
+    project_root = plugin_dir.parent.parent.parent
+    data_dir = project_root / "data"
+    data_dir.mkdir(parents=True, exist_ok=True)
+
+    alias_file = data_dir / "dbd_aliases.json"
+
+    # 读取
+    custom_aliases = {}
+    if alias_file.exists():
+        with open(alias_file, "r", encoding="utf-8") as f:
+            custom_aliases = json.load(f)
+
+    # 写入
     custom_aliases[new_alias] = target_file
-    save_custom_aliases(custom_aliases)
+    with open(alias_file, "w", encoding="utf-8") as f:
+        json.dump(custom_aliases, f, ensure_ascii=False, indent=4)
 
     await add_alias_cmd.finish(f"✅ 成功添加别名！以后发送“{new_alias}”也能查到“{original_keyword}”对应的地图了。")

{nonebot_plugin_dbdmap-0.2.0 → nonebot_plugin_dbdmap-0.2.2}/nonebot_plugin_dbdmap.egg-info/PKG-INFO

@@ -1,20 +1,18 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-dbdmap
-Version: 0.2.0
+Version: 0.2.2
 Summary: 《黎明杀机地图查询插件》
 Author-email: 77_77 <xiexiewen73@gmail.com>
 License: MIT
-Project-URL: Homepage, https://github.com/xiexiewen73-source/nonebot-plugin-dbdmap
-Project-URL: Repository, https://github.com/xiexiewen73-source/nonebot-plugin-dbdmap
 Keywords: nonebot,plugin,dead-by-daylight,dbd
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.8
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: nonebot2>=2.0.0
+Requires-Dist: nonebot2>=2.5.0
+Requires-Dist: nonebot-adapter-onebot>=2.4.6
 
 # NoneBot-Plugin-DBD-Map
 

nonebot_plugin_dbdmap-0.2.2/nonebot_plugin_dbdmap.egg-info/requires.txt

@@ -0,0 +1,2 @@
+nonebot2>=2.5.0
+nonebot-adapter-onebot>=2.4.6

{nonebot_plugin_dbdmap-0.2.0 → nonebot_plugin_dbdmap-0.2.2}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "nonebot-plugin-dbdmap"
-version = "0.2.0"
+version = "0.2.2"
 description = "《黎明杀机地图查询插件》"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9, <4.0"
 license = {text = "MIT"}
 authors = [
     {name = "77_77", email = "xiexiewen73@gmail.com"}
@@ -11,16 +11,11 @@ authors = [
 keywords = ["nonebot", "plugin", "dead-by-daylight", "dbd"]
 classifiers = [
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
-#    "Framework :: NoneBot",
+    "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "nonebot2>=2.0.0",
-]
-
-[project.urls]
-Homepage = "https://github.com/xiexiewen73-source/nonebot-plugin-dbdmap"
-Repository = "https://github.com/xiexiewen73-source/nonebot-plugin-dbdmap"
+    "nonebot2>=2.5.0",
+    "nonebot-adapter-onebot>=2.4.6"
+]

nonebot_plugin_dbdmap-0.2.0/nonebot_plugin_dbdmap.egg-info/requires.txt

@@ -1 +0,0 @@
-nonebot2>=2.0.0