Skip to content

Commit 18b3ca1

Browse files
committed
Simplify mime types guessing and remove unused code
1 parent 29fa3ec commit 18b3ca1

2 files changed

Lines changed: 6 additions & 35 deletions

File tree

pyrogram/client.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,12 +1045,8 @@ async def get_file(
10451045
else:
10461046
return file_name
10471047

1048-
def guess_mime_type(self, filename: str):
1049-
extension = os.path.splitext(filename)[1]
1050-
return self.extensions_to_mime_types.get(extension)
1048+
def guess_mime_type(self, filename: str) -> Optional[str]:
1049+
return self.mimetypes.guess_type(filename)[0]
10511050

1052-
def guess_extension(self, mime_type: str):
1053-
extensions = self.mime_types_to_extensions.get(mime_type)
1054-
1055-
if extensions:
1056-
return extensions.split(" ")[0]
1051+
def guess_extension(self, mime_type: str) -> Optional[str]:
1052+
return self.mimetypes.guess_extension(mime_type)

pyrogram/scaffold.py

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import platform
2222
import re
2323
import sys
24+
from mimetypes import MimeTypes
2425
from pathlib import Path
2526

2627
import pyrogram
@@ -45,33 +46,7 @@ class Scaffold:
4546

4647
PARSE_MODES = ["combined", "markdown", "md", "html", None]
4748

48-
MEDIA_TYPE_ID = {
49-
0: "photo_thumbnail",
50-
1: "chat_photo",
51-
2: "photo",
52-
3: "voice",
53-
4: "video",
54-
5: "document",
55-
8: "sticker",
56-
9: "audio",
57-
10: "animation",
58-
13: "video_note",
59-
14: "document_thumbnail"
60-
}
61-
62-
mime_types_to_extensions = {}
63-
extensions_to_mime_types = {}
64-
65-
with open(f"{os.path.dirname(__file__)}/mime.types", "r", encoding="UTF-8") as f:
66-
for match in re.finditer(r"^([^#\s]+)\s+(.+)$", f.read(), flags=re.M):
67-
mime_type, extensions = match.groups()
68-
69-
extensions = [f".{ext}" for ext in extensions.split(" ")]
70-
71-
for ext in extensions:
72-
extensions_to_mime_types[ext] = mime_type
73-
74-
mime_types_to_extensions[mime_type] = " ".join(extensions)
49+
mimetypes = MimeTypes((f"{os.path.dirname(__file__)}/mime.types",))
7550

7651
def __init__(self):
7752
try:

0 commit comments

Comments
 (0)