nonebot-plugin-savepic 0.1.3__tar.gz → 0.2.0__tar.gz

{nonebot_plugin_savepic-0.1.3 → nonebot_plugin_savepic-0.2.0}/PKG-INFO

@@ -1,20 +1,24 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-savepic
-Version: 0.1.3
+Version: 0.2.0
 Summary: 保存表情包（语录）与随机出图
 Home-page: https://github.com/Yan-Zero/nonebot-plugin-savepic
 License: MIT
 Author: Yan
 Author-email: 1964649083@qq.com
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.10,<3.13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Requires-Dist: arclet-alconna (>=1.7.14,<2.0.0)
 Requires-Dist: asyncpg (>=0.28.0,<0.29.0)
 Requires-Dist: nonebot-adapter-onebot (>=2.2.3,<3.0.0)
 Requires-Dist: nonebot-plugin-datastore (>=1.1.0,<2.0.0)
 Requires-Dist: nonebot2 (>=2.0.1,<3.0.0)
+Requires-Dist: numpy (>=1.25.2,<2.0.0)
+Requires-Dist: pillow (>=10.0.0,<11.0.0)
+Requires-Dist: scipy (>=1.11.1,<2.0.0)
 Description-Content-Type: text/markdown
 
 <div align="center">

nonebot_plugin_savepic-0.2.0/nonebot_plugin_savepic/__init__.py

@@ -0,0 +1,190 @@
+from nonebot import require
+from nonebot import get_driver
+from nonebot import on_command
+from nonebot.params import CommandArg, Arg
+from nonebot.adapters.onebot.v11.message import Message as V11Msg
+from nonebot.adapters.onebot.v11.message import MessageSegment as V11Seg
+from nonebot.internal.adapter.bot import Bot
+from nonebot.adapters.onebot.v11.event import GroupMessageEvent
+from nonebot.matcher import Matcher
+from nonebot.typing import T_State
+from nonebot.plugin import PluginMetadata
+from asyncpg.exceptions import InvalidRegularExpressionError
+from arclet.alconna import Alconna, Option, Args, CommandMeta, append
+import os
+
+require("nonebot_plugin_datastore")
+
+from .config import Config
+from .pic_sql import savepic, rename, delete, write_pic, randpic, load_pic, select_pic
+from .rule import PIC_AMDIN
+from .ext_listener import pic_listen
+from .picture import p_hash
+
+
+__plugin_meta__ = PluginMetadata(
+    name="Savepic",
+    description="表情包保存",
+    usage="""用法:
+/savepic <文件名> <图片>
+/savepic -g <文件名> <全局图片>
+/savepic -d <文件名> 删除图图片
+/savepic -m <原文件名> <新文件名> 重命名图片
+/randpic <关键词> 随机图片
+<文件名> 发送图片""",
+    config=Config,
+    homepage="https://github.com/Yan-Zero/nonebot-plugin-savepic",
+    type="application",
+    supported_adapters=["~onebot.v11"],
+)
+
+INVALID_FILENAME_CHARACTERS = r'\/:*?"<>|'
+
+p_config = Config.parse_obj(get_driver().config)
+
+rpic = on_command("randpic", aliases={"随机图"}, priority=5)
+
+
+@rpic.handle()
+async def _(bot: Bot, event, args: V11Msg = CommandArg()):
+    reg = args.extract_plain_text().strip()
+    group_id = (
+        "globe"
+        if not isinstance(event, GroupMessageEvent)
+        else f"qq_group:{event.group_id}"
+    )
+    try:
+        pic = await randpic(reg, group_id)
+        if pic:
+            file_ = await load_pic(pic.url)
+            await bot.send(event, V11Msg([pic.name + "\n", V11Seg.image(file=file_)]))
+    except InvalidRegularExpressionError:
+        await rpic.finish("正则表达式错误")
+    except Exception as ex:
+        await rpic.finish(str(ex))
+
+
+spic = on_command("savepic", aliases={"存图"}, priority=5)
+a_spic = Alconna(
+    "/savepic",
+    Option("-d", help_text="删除图片"),
+    Option("-g", help_text="全局"),
+    Option("-ac", help_text="允许相似碰撞"),
+    Args.filename[str],
+    meta=CommandMeta(description="保存图片，默认保存到本群"),
+)
+
+
+@spic.handle()
+async def _(
+    bot: Bot,
+    matcher: Matcher,
+    event: GroupMessageEvent,
+    state: T_State,
+):
+    command = a_spic.parse(event.message.extract_plain_text())
+    if not command.matched:
+        await spic.finish(str(command.error_info) + "\n\n" + a_spic.get_help())
+
+    state["savepiv_group"] = "globe" if command.g else f"qq_group:{event.group_id}"
+    filename = command.filename
+    for c in INVALID_FILENAME_CHARACTERS:
+        filename = filename.replace(c, "-")
+    if not filename.endswith((".jpg", ".png", ".gif")):
+        filename += ".jpg"
+    state["savepiv_filename"] = filename
+    state["savepiv_ac"] = command.ac is not None
+
+    if command.d:
+        if not await PIC_AMDIN(bot, event):
+            await spic.finish("不支持选项 -d")
+        try:
+            await delete(filename, state["savepiv_group"])
+        except Exception as ex:
+            await spic.finish(str(ex))
+        await spic.finish("图片已删除")
+
+    pic = await select_pic(filename, state["savepiv_group"])
+    if pic and pic.group == state["savepiv_group"]:
+        spic.finish("文件名已存在。")
+
+    picture = event.message.get("image")
+    if not picture and event.reply:
+        picture = event.reply.message.get("image")
+    if picture:
+        matcher.set_arg("picture", picture)
+
+
+@spic.got("picture", "图呢？")
+async def _(state: T_State, picture: V11Msg = Arg()):
+    picture = picture.get("image")
+    if not picture:
+        await spic.finish("6，这也不是图啊")
+
+    try:
+        dir = await write_pic(picture[0].data["url"], p_config.savepic_dir)
+    except Exception as ex:
+        await spic.finish("存图失败。" + "\n" + str(ex))
+    try:
+        await savepic(
+            state["savepiv_filename"],
+            dir,
+            p_hash(await load_pic(dir)),
+            state["savepiv_group"],
+            state["savepiv_ac"],
+        )
+        await spic.send("保存成功")
+    except Exception as ex:
+        os.remove(dir)
+        await spic.finish(str(ex))
+
+
+s_mvpic = on_command("mvpic", priority=5)
+a_mvpic = Alconna(
+    "/mvpic",
+    Option("-l", args=Args.filename[str], help_text="本地图片", action=append),
+    Option("-g", args=Args.filename[str], help_text="全局图片", action=append),
+    meta=CommandMeta(description="重命名图片，按照参数先后判断"),
+)
+
+
+@s_mvpic.handle()
+async def _(
+    bot: Bot,
+    event: GroupMessageEvent,
+):
+    if not await PIC_AMDIN(bot, event):
+        await spic.finish("不支持选项 -m")
+
+    cmd = a_mvpic.parse(event.message.extract_plain_text())
+    if not cmd.matched:
+        await s_mvpic.finish(str(cmd.error_info) + "\n\n" + a_mvpic.get_help())
+    options = cmd.options
+    if not options:
+        await s_mvpic.finish("文件名呢？" + "\n\n" + a_mvpic.get_help())
+
+    sg = "globe" if list(options.keys())[0] == "g" else f"qq_group:{event.group_id}"
+    if len(options["g" if sg == "globe" else "l"].args.get("filename", [])) >= 2:
+        dg = sg
+    else:
+        dg = "globe" if sg != "globe" else f"qq_group:{event.group_id}"
+    if ("g" if dg == "globe" else "l") not in options:
+        await s_mvpic.finish("至多只有一个文件名哦？" + "\n\n" + a_mvpic.get_help())
+
+    sname = options["g" if sg == "globe" else "l"].args["filename"][0]
+    dname = options["g" if dg == "globe" else "l"].args["filename"][
+        1 if sg == dg else 0
+    ]
+    for c in INVALID_FILENAME_CHARACTERS:
+        sname = sname.replace(c, "-")
+        dname = dname.replace(c, "-")
+    if not sname.endswith((".jpg", ".png", ".gif")):
+        sname += ".jpg"
+    if not dname.endswith((".jpg", ".png", ".gif")):
+        dname += ".jpg"
+
+    try:
+        await rename(sname, dname, sg, dg)
+    except Exception as ex:
+        await spic.finish(str(ex))
+    await spic.finish("图片已重命名")

{nonebot_plugin_savepic-0.1.3 → nonebot_plugin_savepic-0.2.0}/nonebot_plugin_savepic/config.py

@@ -3,5 +3,7 @@ from pydantic import BaseModel, Extra
 
 class Config(BaseModel, extra=Extra.ignore):
     """Plugin Config Here"""
+
     savepic_admin: list[str] = []
     savepic_dir: str = "savepic"
+    savepic_sqlurl: str

nonebot_plugin_savepic-0.2.0/nonebot_plugin_savepic/ext_listener.py

@@ -0,0 +1,34 @@
+from nonebot import on_message
+from nonebot.adapters.onebot.v11.event import MessageEvent
+from nonebot.internal.adapter.bot import Bot
+from nonebot.adapters.onebot.v11.message import MessageSegment as V11Seg
+from nonebot.adapters.onebot.v11.event import GroupMessageEvent
+
+from .pic_sql import load_pic, select_pic
+
+
+async def endswith_pic(event: MessageEvent):
+    text = event.message.extract_plain_text().strip()
+    if " " in text:
+        return False
+    return text.endswith((".jpg", ".png", ".gif"))
+
+
+pic_listen = on_message(rule=endswith_pic)
+
+
+@pic_listen.handle()
+async def _(bot: Bot, event: MessageEvent):
+    name = event.message.extract_plain_text().strip()
+    group_id = (
+        "globe"
+        if not isinstance(event, GroupMessageEvent)
+        else f"qq_group:{event.group_id}"
+    )
+    try:
+        pic = await select_pic(name, group_id)
+        if pic:
+            file_ = await load_pic(pic.url)
+            await bot.send(event, V11Seg.image(file=file_))
+    except Exception as ex:
+        await pic_listen.finish(str(ex))

{nonebot_plugin_savepic-0.1.3 → nonebot_plugin_savepic-0.2.0}/nonebot_plugin_savepic/model.py

@@ -1,14 +1,18 @@
 from nonebot_plugin_datastore import get_plugin_data
 from sqlalchemy import TEXT
+from sqlalchemy.dialects.postgresql import BIT
 from sqlalchemy.orm import Mapped, mapped_column
 
 plugin_data = get_plugin_data()
 plugin_data.use_global_registry()
 Model = plugin_data.Model
 
+
 class PicData(Model):
     """消息记录"""
 
+    __tablename__ = "picdata"
+
     __table_args__ = {"extend_existing": True}
 
     id: Mapped[int] = mapped_column(primary_key=True)
@@ -17,4 +21,6 @@ class PicData(Model):
     group: Mapped[str] = mapped_column(TEXT)
     """ 所属群组 id """
     url: Mapped[str] = mapped_column(TEXT)
-    """ 图片目录 """
+    """ 图片目录 """
+    phash: Mapped[bytes] = mapped_column(BIT(256))
+    """ 图片的 phash 值 """

nonebot_plugin_savepic-0.2.0/nonebot_plugin_savepic/pic_sql.py

@@ -0,0 +1,219 @@
+import sqlalchemy as sa
+from sqlalchemy.ext.asyncio.session import AsyncSession
+from sqlalchemy.ext.asyncio import create_async_engine
+from sqlalchemy import select
+from nonebot import get_driver
+import os
+import random
+import csv
+import hashlib
+from sqlalchemy import cast
+
+from .model import PicData, BIT
+from .picture import load_pic, p_hash
+from .config import Config
+
+gdriver = get_driver()
+p_config = Config.parse_obj(gdriver.config)
+_async_database = None
+
+
+def AsyncDatabase():
+    if not _async_database:
+        raise RuntimeError("Database is not initialized")
+    return _async_database
+
+
+def del_pic(url: str):
+    if os.path.exists(url):
+        os.remove(url)
+
+
+async def write_pic(url: str, des_dir: str = None) -> str:
+    if not des_dir:
+        des_dir = "savepic"
+    if not os.path.exists(des_dir):
+        os.makedirs(des_dir)
+
+    byte = await load_pic(url)
+    filename = hashlib.sha256(byte).hexdigest()
+    while os.path.exists(os.path.join(des_dir, filename)):
+        filename += "_"
+    with open(os.path.join(des_dir, filename), "wb") as f:
+        f.write(byte)
+    return os.path.join(des_dir, filename)
+
+
+async def select_pic(filename: str, group: str):
+    async with AsyncSession(_async_database) as db_session:
+        pic = await db_session.scalar(
+            select(PicData)
+            .where(PicData.name == filename)
+            .where(PicData.group == group)
+        )
+        if pic:
+            return pic
+
+        pic = await db_session.scalar(
+            select(PicData)
+            .where(PicData.name == filename)
+            .where(PicData.group == "globe")
+        )
+        if pic:
+            return pic
+
+
+async def savepic(
+    filename: str,
+    url: str,
+    hash: bytes,
+    group_id: str = "globe",
+    collision_allow: bool = False,
+):
+    pic = PicData(
+        group=group_id,
+        name=filename,
+        url=url,
+        phash=hash,
+    )
+    async with AsyncSession(_async_database) as db_session:
+        # select the name == ""
+        despic = await select_pic(filename, group_id)
+        if despic and despic.group == group_id:
+            raise Exception("文件名已存在。")
+        despic = await db_session.scalar(
+            select(PicData)
+            .where(PicData.group == group_id)
+            .where(
+                sa.func.bit_count(PicData.phash.bitwise_xor(cast(hash, BIT(256)))) <= 7
+            )
+        )
+        if despic and not collision_allow:
+            raise Exception("相似图片已存在。" + "\n" + despic.name)
+
+        if random.randint(1, 10) == 1:
+            empty = await db_session.scalar(select(PicData).where(PicData.name == ""))
+        else:
+            empty = None
+
+        if empty:
+            empty.group = group_id
+            empty.url = url
+            empty.name = filename
+            empty.phash = pic.phash
+            await db_session.merge(empty)
+        else:
+            db_session.add(pic)
+        await db_session.commit()
+
+
+async def init_db():
+    # check if the table exists
+    global _async_database
+    _async_database = create_async_engine(
+        p_config.savepic_sqlurl, pool_pre_ping=True, pool_size=25, max_overflow=20
+    )
+
+    try:
+        metadata = sa.MetaData()
+        table = sa.Table(
+            "picdata",
+            metadata,
+            sa.Column("id", sa.Integer, primary_key=True),
+            sa.Column("name", sa.TEXT, nullable=False),
+            sa.Column("group", sa.TEXT, nullable=False),
+            sa.Column("url", sa.TEXT, nullable=False),
+            sa.Column("phash", BIT(256), nullable=False),
+        )
+        async with _async_database.begin() as conn:
+            await conn.run_sync(metadata.create_all)
+    except Exception:
+        pass
+
+
+@gdriver.on_startup
+async def _():
+    if not p_config.savepic_sqlurl:
+        raise Exception("请配置 savepic_sqlurl")
+
+    await init_db()
+    if os.path.exists("savepic_picdata.csv"):
+        # 加载旧版数据
+        print("加载旧版数据")
+        failed = []
+        with open("savepic_picdata.csv", "r") as f:
+            for i in csv.reader(f):
+                _, name, group, url = i
+                if not name or url == "url":
+                    continue
+                t = await select_pic(name, group)
+                if t and t.group == group:
+                    continue
+                p_hash_ = p_hash(await load_pic(url))
+                print(i)
+                try:
+                    await savepic(name, url, p_hash_, group, True)
+                except Exception as ex:
+                    print(ex)
+                    failed.append(i)
+        os.remove("savepic_picdata.csv")
+        with open("savepic.csv", "w+") as f:
+            writer = csv.writer(f)
+            writer.writerow(["id", "name", "group", "url"])
+            for i in failed:
+                writer.writerow(i)
+
+
+async def rename(ori: str, des: str, s_group: str, d_group: str):
+    async with AsyncSession(_async_database) as db_session:
+        pic = await db_session.scalar(
+            select(PicData)
+            .where(PicData.name == ori)
+            .where(sa.or_(PicData.group == s_group, PicData.group == "globe"))
+        )
+        if not pic:
+            raise Exception("重命名失败，没有找到图片")
+        despic = await db_session.scalar(
+            select(PicData).where(
+                sa.and_(PicData.name == des, PicData.group == d_group)
+            )
+        )
+        if despic:
+            raise Exception("重命名失败，目标文件名已存在")
+        pic.name = des
+        pic.group = d_group
+
+        await db_session.merge(pic)
+        await db_session.commit()
+
+
+async def delete(filename: str, group: str):
+    async with AsyncSession(_async_database) as db_session:
+        pic = await db_session.scalar(
+            select(PicData).where(
+                sa.and_(PicData.name == filename, PicData.group == group)
+            )
+        )
+        if pic:
+            del_pic(pic.url)
+            pic.name = ""
+            await db_session.merge(pic)
+            await db_session.commit()
+        else:
+            raise Exception("删除失败，没有找到图片")
+
+
+async def randpic(reg: str, group: str = "globe") -> PicData:
+    reg = reg.strip()
+    if not reg:
+        reg = ".*"
+    async with AsyncSession(_async_database) as db_session:
+        pic = await db_session.scalar(
+            select(PicData)
+            .where(sa.or_(PicData.group == group, PicData.group == "globe"))
+            .where(PicData.name != "")
+            .order_by(sa.func.random())
+            .where(PicData.name.regexp_match(reg))
+        )
+        if pic:
+            return pic

nonebot_plugin_savepic-0.2.0/nonebot_plugin_savepic/picture.py

@@ -0,0 +1,48 @@
+import scipy.fftpack as fft
+import numpy as np
+import httpx
+import os
+from PIL import Image
+from io import BytesIO
+
+_httpx_async = None
+
+
+def remove_alpha(im: Image) -> Image:
+    # Only process if image has transparency (http://stackoverflow.com/a/1963146)
+    if im.mode in ("RGBA", "LA") or (im.mode == "P" and "transparency" in im.info):
+        # Need to convert to RGBA if LA format due to a bug in PIL (http://stackoverflow.com/a/1963146)
+        alpha = im.convert("RGBA").split()[-1]
+
+        # Create a new background image of our matt color.
+        # Must be RGBA because paste requires both images have the same format
+        # (http://stackoverflow.com/a/8720632  and  http://stackoverflow.com/a/9459208)
+        bg = Image.new("RGBA", im.size, (255, 255, 255) + (255,))
+        bg.paste(im, mask=alpha)
+        return bg
+
+    else:
+        return im
+
+
+async def load_pic(url: str) -> bytes:
+    global _httpx_async
+    if url.startswith("http"):
+        if not _httpx_async:
+            _httpx_async = httpx.AsyncClient()
+        resp = await _httpx_async.get(url)
+        resp.raise_for_status()
+        return resp.content
+    if os.path.exists(url):
+        with open(url, "rb") as f:
+            return f.read()
+    raise Exception("不支持的 URL")
+
+
+def p_hash(img: bytes) -> bytes:
+    pic = remove_alpha(
+        Image.open(BytesIO(img)).resize((128, 128), Image.Resampling.LANCZOS)
+    ).convert("L")
+    dct = fft.dct(np.array(pic))
+    average = np.median(dct)
+    return np.packbits(dct[:16, :16] > average).tobytes()

{nonebot_plugin_savepic-0.1.3 → nonebot_plugin_savepic-0.2.0}/nonebot_plugin_savepic/rule.py

@@ -4,8 +4,8 @@ This module is used to define the permission of the bot.
 
 import nonebot
 from nonebot.adapters import Bot, Event
-from nonebot_plugin_datastore import get_plugin_data
 from nonebot.internal.permission import Permission
+
 from .config import Config
 
 global_config = nonebot.get_driver().config
@@ -32,4 +32,4 @@ class Savepic_Admin(Permission):
         )
 
 
-PIC_AMDIN = Permission(Savepic_Admin())
+PIC_AMDIN = Permission(Savepic_Admin())

{nonebot_plugin_savepic-0.1.3 → nonebot_plugin_savepic-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-plugin-savepic"
-version = "0.1.3"
+version = "0.2.0"
 description = "保存表情包（语录）与随机出图"
 authors = ["Yan <1964649083@qq.com>"]
 license = "MIT"
@@ -9,11 +9,15 @@ packages = [{include = "nonebot_plugin_savepic"}]
 homepage = "https://github.com/Yan-Zero/nonebot-plugin-savepic"
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.10, <3.13"
 nonebot2 = "^2.0.1"
 nonebot-plugin-datastore = "^1.1.0"
 asyncpg = "^0.28.0"
 nonebot-adapter-onebot = "^2.2.3"
+arclet-alconna = "^1.7.14"
+numpy = "^1.25.2"
+scipy = "^1.11.1"
+pillow = "^10.0.0"
 
 
 [build-system]

nonebot_plugin_savepic-0.1.3/nonebot_plugin_savepic/__init__.py

@@ -1,157 +0,0 @@
-from nonebot import require
-from nonebot import get_driver
-
-require("nonebot_plugin_datastore")
-
-from nonebot import on_command, on_message
-from nonebot.params import CommandArg, Arg
-from nonebot.adapters.onebot.v11.message import Message as V11Msg
-from nonebot.adapters.onebot.v11.message import MessageSegment as V11Seg
-from nonebot.adapters.onebot.v11 import Bot
-from nonebot.adapters.onebot.v11.event import MessageEvent
-from nonebot.adapters.onebot.v11.event import GroupMessageEvent
-from nonebot.matcher import Matcher
-from nonebot.typing import T_State
-
-from asyncpg.exceptions import InvalidRegularExpressionError
-
-from .config import Config
-from .pic_sql import savepic, rename, delete, write_pic, randpic, load_pic, select_pic
-from .rule import PIC_AMDIN
-
-from nonebot.plugin import PluginMetadata
-
-__plugin_meta__ = PluginMetadata(
-    name="Savepic",
-    description="表情包保存",
-    usage="""用法:
-/savepic <文件名> <图片>
-/savepic -g <文件名> <全局图片>
-/savepic -d <文件名> 删除图图片
-/savepic -m <原文件名> <新文件名> 重命名图片
-/randpic <关键词> 随机图片
-<文件名> 发送图片""",
-    config=Config,
-    homepage="https://github.com/Yan-Zero/nonebot-plugin-savepic",
-    type="application",
-    supported_adapters=[
-        '~onebot.v11'
-    ]
-)
-
-INVALID_FILENAME_CHARACTERS = r'\/:*?"<>|'
-
-global_config = get_driver().config
-p_config = Config.parse_obj(global_config)
-
-rpic = on_command("randpic", aliases={"随机图"}, priority=5)
-@rpic.handle()
-async def _(bot: Bot, event, args: V11Msg = CommandArg()):
-    reg = args.extract_plain_text().strip()
-    group_id = 'globe' if not isinstance(event, GroupMessageEvent) else f"qq_group:{event.group_id}"
-    try:
-        pic = await randpic(reg, group_id)
-        if pic:
-            file_ = await load_pic(pic.url)
-            await bot.send(event, V11Msg([pic.name + "\n", V11Seg.image(file=file_)]))
-    except InvalidRegularExpressionError:
-        await rpic.finish('正则表达式错误')
-    except Exception as ex:
-        await rpic.finish(str(ex))
-
-spic = on_command("savepic", aliases={"存图"}, priority=5)
-@spic.handle()
-async def _(bot: Bot, matcher: Matcher, event: GroupMessageEvent, state: T_State, args: V11Msg = CommandArg()):
-    if not args:
-        await spic.finish('''用法:
-/savepic <文件名> <图片>
-/savepic -g <文件名> <全局图片>
-/savepic -d <文件名> 删除图图片
-/savepic -m <原文件名> <新文件名> 重命名图片''')
-    params = args.extract_plain_text().strip().split()
-    state['savepiv_group'] = 'globe' if '-g' in params and await PIC_AMDIN(bot, event) else f"qq_group:{event.group_id}"
-    _d = '-d' in params
-    _m = '-m' in params
-    if _d:
-        params.remove('-d')
-    if _m:
-        params.remove('-m')
-    if '-g' in params:
-        params.remove('-g')
-
-    if not params:
-        await spic.finish("文件名？")
-    filename = params[0].strip()
-    for c in INVALID_FILENAME_CHARACTERS:
-        filename = filename.replace(c, "-")
-    if not filename.endswith(('.jpg', '.png', '.gif')):
-        filename += '.jpg'
-
-    if _d:
-        if not await PIC_AMDIN(bot, event):
-            await spic.finish('不支持选项 -d')
-        try:
-            await delete(filename, state['savepiv_group'])
-        except Exception as ex:
-            await spic.finish(str(ex))
-        await spic.finish('图片已删除')
-
-    if _m:
-        if not await PIC_AMDIN(bot, event):
-            await spic.finish('不支持选项 -m')
-        if len(params) <= 1:
-            await spic.finish("目标文件名？")
-        for c in INVALID_FILENAME_CHARACTERS:
-            params[1] = params[1].replace(c, "-")
-        if not params[1].endswith(('.jpg', '.png', '.gif')):
-            params[1] += '.jpg'
-
-        try:
-            await rename(filename, params[1],  f"qq_group:{event.group_id}", state['savepiv_group'])
-        except Exception as ex:
-            await spic.finish(str(ex))
-        await spic.finish('图片已重命名')
-
-    pic = await select_pic(filename, state['savepiv_group'])
-    if pic and pic.group == state['savepiv_group']:
-        spic.finish("图片已存在。")
-    picture = args.get('image')
-    state['savepiv_filename'] = filename
-    if not picture and event.reply:
-        picture = event.reply.message.get('image')
-    if picture:
-        matcher.set_arg('picture', picture)
-
-@spic.got('picture', "图呢？")
-async def _(bot: Bot, event: GroupMessageEvent, state: T_State, picture: V11Msg = Arg()):
-    picture = picture.get('image')
-    if not picture:
-        await spic.finish('6，这也不是图啊')
-    try:
-        dir = await write_pic(picture[0].data['url'], p_config.savepic_dir)
-    except Exception as ex:
-        await spic.finish("存图失败。" + '\n' + str(ex))
-    try:
-        await savepic(state['savepiv_filename'], dir, state['savepiv_group'])
-        await spic.send("保存成功")
-    except Exception as ex:
-        await spic.finish(str(ex))
-
-async def endswith_pic(event: MessageEvent):
-    text = event.message.extract_plain_text().strip()
-    if ' ' in text:
-        return False
-    return text.endswith(('.jpg', '.png', '.gif'))
-
-pic_listen = on_message(rule=endswith_pic)
-@pic_listen.handle()
-async def _(bot: Bot, event: MessageEvent):
-    name = event.message.extract_plain_text().strip()
-    group_id = 'globe' if not isinstance(event, GroupMessageEvent) else f"qq_group:{event.group_id}"
-    try:
-        pic = await select_pic(name, group_id)
-        if pic:
-            file_ = await load_pic(pic.url)
-            await bot.send(event, V11Seg.image(file=file_))
-    except Exception as ex:
-        await rpic.finish(str(ex))

nonebot_plugin_savepic-0.1.3/nonebot_plugin_savepic/pic_sql.py

@@ -1,150 +0,0 @@
-from nonebot_plugin_datastore import create_session
-import sqlalchemy as sa
-from sqlalchemy import select, update
-import hashlib
-import httpx
-import os
-import random
-from sqlalchemy.sql import func
-from nonebot_plugin_datastore.db import post_db_init
-
-from .model import PicData
-
-httpx_async = None
-
-async def load_pic(url: str)-> bytes:
-    global httpx_async
-    if url.startswith("http"):
-        if not httpx_async:
-            httpx_async = httpx.AsyncClient()
-        resp = await httpx_async.get(url)
-        resp.raise_for_status()
-        return resp.content
-    if os.path.exists(url):
-        with open(url, 'rb') as f:
-            return f.read()
-    raise Exception("不支持的统一资源定位器")
-
-def del_pic(url: str):
-    if os.path.exists(url):
-        os.remove(url)
-
-async def write_pic(url: str, des_dir: str = None) -> str:
-    if not des_dir:
-        des_dir = 'savepic'
-    if not os.path.exists(des_dir):
-        os.makedirs(des_dir)
-
-    byte = await load_pic(url)
-    filename = hashlib.sha256(byte).hexdigest()
-    while os.path.exists(os.path.join(des_dir, filename)):
-        filename = hashlib.sha256((filename + str(random.randint(0, 100000))).encode()).hexdigest()
-    with open(os.path.join(des_dir, filename), 'wb+') as f:
-        f.write(byte)
-    return os.path.join(des_dir, filename)
-
-async def select_pic(filename: str, group: str):
-    async with create_session() as db_session:
-        pic = await db_session.scalar(select(PicData)
-        .where(PicData.name == filename)
-        .where(PicData.group == group))
-        if pic:
-            return pic
-
-        pic = await db_session.scalar(select(PicData)
-        .where(PicData.name == filename)
-        .where(PicData.group == 'globe'))
-        if pic:
-            return pic
-
-async def savepic(filename: str, dir: str, group_id: str):
-    pic = PicData(
-        group = group_id,
-        name = filename,
-        url = dir,
-    )
-    async with create_session() as db_session:
-        # select the name == ""
-        despic = await select_pic(filename, group_id)
-        if despic and despic.group == group_id:
-            raise Exception("文件名已存在。")
-        
-        if random.randint(1, 10) == 1:
-            empty = await db_session.scalar(select(PicData).where(PicData.name == ""))
-        else:
-            empty = None
-
-        if empty:
-            empty.group = group_id
-            empty.url = dir
-            empty.name = filename
-            await db_session.merge(empty)
-        else:
-            db_session.add(pic)
-        await db_session.commit()
-
-@post_db_init
-async def init():
-    if not os.path.exists('history_savepic'):
-        return
-    for root, dirs, files in os.walk('history_savepic'):
-        group = root.split('/')[-1]
-        for file in files:
-            dir = os.path.join("savepic", file.replace(' ', ''))
-            if os.path.exists(dir):
-                dir = await write_pic(os.path.join(root, file))
-                os.remove(os.path.join(root, file))
-            else:
-                os.rename(os.path.join(root, file), dir)
-
-            try:
-                await savepic(file, dir, group)
-                print(f"save {file} to {group}")
-            except Exception as ex:
-                print(ex)
-                os.remove(dir)
-
-async def rename(ori: str, des: str, s_group: str, d_group: str):
-    async with create_session() as db_session:
-        pic = await db_session.scalar(select(PicData).where(
-            PicData.name == ori
-        ).where(sa.or_(PicData.group == s_group, PicData.group == "globe")))
-        if not pic:
-            raise Exception("重命名失败，没有找到图片")
-        despic = await db_session.scalar(select(PicData).where(
-            sa.and_(PicData.name == des, PicData.group == d_group)
-        ))
-        if despic:
-            raise Exception("重命名失败，目标文件名已存在")
-        pic.name = des
-        pic.group = d_group
-        
-        await db_session.merge(pic)
-        await db_session.commit()
-
-async def delete(filename: str, group: str):
-    async with create_session() as db_session:
-        pic = await db_session.scalar(select(PicData).where(
-            sa.and_(PicData.name == filename, PicData.group == group)
-        ))
-        if pic:
-            del_pic(pic.url)
-            pic.name = ""
-            await db_session.merge(pic)
-            await db_session.commit()
-        else:
-            raise Exception("删除失败，没有找到图片")
-
-async def randpic(reg: str, group: str = "globe") -> PicData:
-    reg = reg.strip()
-    if not reg:
-        reg = ".*"
-    async with create_session() as db_session:
-        pic = await db_session.scalar(select(PicData)
-        .where(sa.or_(PicData.group == group, PicData.group == "globe"))
-        .where(PicData.name != "")
-        .order_by(func.random())
-        .where(PicData.name.regexp_match(reg))
-        )
-        if pic:
-            return pic