stryan/saintnet_stickers
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make magic optional

Browse Source
This commit is contained in:
Tulir Asokan 2020-09-20 14:01:29 +03:00
parent 14059764a8
commit e073f6972c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sticker/pack.py
View File

@ -5,13 +5,18 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
from typing import Dict, Optional from typing import Dict, Optional
from hashlib import sha256 from hashlib import sha256
import mimetypes
import argparse import argparse
import os.path import os.path
import asyncio import asyncio
import string import string
import json import json
try:
import magic import magic
except ImportError:
print("[Warning] Magic is not installed, using file extensions to guess mime types")
magic = None
from .lib import matrix, util from .lib import matrix, util
@ -31,7 +36,11 @@ async def upload_sticker(file: str, directory: str, old_stickers: Dict[str, matr
path = os.path.join(directory, file) path = os.path.join(directory, file)
if not os.path.isfile(path): if not os.path.isfile(path):
return None return None
if magic:
mime = magic.from_file(path, mime=True) mime = magic.from_file(path, mime=True)
else:
mime, _ = mimetypes.guess_type(file)
if not mime.startswith("image/"): if not mime.startswith("image/"):
return None return None