Skip to content

Commit 6f85448

Browse files
committed
使用 filetype 替代 imghdr
1 parent 7eb7f43 commit 6f85448

3 files changed

Lines changed: 21 additions & 9 deletions

File tree

nonebot_plugin_memes_api/matchers/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import imghdr
21
import tempfile
32
from datetime import datetime
43
from io import BytesIO
54
from pathlib import Path
65
from typing import Annotated
76
from zipfile import ZIP_BZIP2, ZipFile
87

8+
import filetype
99
from nonebot.adapters import Bot, Event
1010
from nonebot.matcher import Matcher
1111
from nonebot.params import Depends
@@ -94,7 +94,7 @@ def zip_images(files: list[bytes]):
9494
output = BytesIO()
9595
with ZipFile(output, "w", ZIP_BZIP2) as zip_file:
9696
for i, file in enumerate(files):
97-
ext = imghdr.what(None, h=file)
97+
ext = filetype.guess_extension(file)
9898
zip_file.writestr(f"{i}.{ext}", file)
9999
return output
100100

poetry.lock

Lines changed: 18 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ nonebot-plugin-orm = ">=0.7.0,<1.0.0"
1818
httpx = ">=0.20.0,<1.0.0"
1919
pyyaml = "^6.0"
2020
python-dateutil = "^2.8.2"
21+
filetype = "^1.2.0"
2122

2223
[tool.poetry.group.dev.dependencies]
2324
nonebot2 = { extras = ["fastapi"], version = "^2.3.0" }

0 commit comments

Comments
 (0)