LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-09-21 03:08:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix attributes not being inferred for open()ed files

Browse Source
This commit is contained in:
Lonami Exo 2018-07-31 12:14:13 +02:00
parent f0a26d7c76
commit 638eeb3c82
1 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
telethon/utils.py
View File

@ -419,47 +419,41 @@ def get_attributes(file, *, attributes=None, mime_type=None,
Get a list of attributes for the given file and Get a list of attributes for the given file and
the mime type as a tuple ([attribute], mime_type). the mime type as a tuple ([attribute], mime_type).
""" """
if isinstance(file, str): name = file if isinstance(file, str) else getattr(file, 'name', 'unnamed')
# Determine mime-type and attributes if mime_type is None:
# Take the first element by using [0] since it returns a tuple mime_type = mimetypes.guess_type(name)[0]
if mime_type is None:
mime_type = mimetypes.guess_type(file)[0]
attr_dict = {types.DocumentAttributeFilename: attr_dict = {types.DocumentAttributeFilename:
types.DocumentAttributeFilename(os.path.basename(file))} types.DocumentAttributeFilename(os.path.basename(name))}
if is_audio(file) and hachoir is not None: if is_audio(file) and hachoir is not None:
with hachoir.parser.createParser(file) as parser:
m = hachoir.metadata.extractMetadata(parser)
attr_dict[types.DocumentAttributeAudio] = \
types.DocumentAttributeAudio(
voice=voice_note,
title=m.get('title') if m.has('title') else None,
performer=m.get('author') if m.has('author') else None,
duration=int(m.get('duration').seconds
if m.has('duration') else 0)
)
if not force_document and is_video(file):
if hachoir:
with hachoir.parser.createParser(file) as parser: with hachoir.parser.createParser(file) as parser:
m = hachoir.metadata.extractMetadata(parser) m = hachoir.metadata.extractMetadata(parser)
attr_dict[types.DocumentAttributeAudio] = \
types.DocumentAttributeAudio(
voice=voice_note,
title=m.get('title') if m.has('title') else None,
performer=m.get('author') if m.has('author') else None,
duration=int(m.get('duration').seconds
if m.has('duration') else 0)
)
if not force_document and is_video(file):
if hachoir:
with hachoir.parser.createParser(file) as parser:
m = hachoir.metadata.extractMetadata(parser)
doc = types.DocumentAttributeVideo(
round_message=video_note,
w=m.get('width') if m.has('width') else 0,
h=m.get('height') if m.has('height') else 0,
duration=int(m.get('duration').seconds
if m.has('duration') else 0)
)
else:
doc = types.DocumentAttributeVideo( doc = types.DocumentAttributeVideo(
0, 1, 1, round_message=video_note) round_message=video_note,
w=m.get('width') if m.has('width') else 0,
h=m.get('height') if m.has('height') else 0,
duration=int(m.get('duration').seconds
if m.has('duration') else 0)
)
else:
doc = types.DocumentAttributeVideo(
0, 1, 1, round_message=video_note)
attr_dict[types.DocumentAttributeVideo] = doc attr_dict[types.DocumentAttributeVideo] = doc
else:
attr_dict = {types.DocumentAttributeFilename:
types.DocumentAttributeFilename(
os.path.basename(getattr(file, 'name', None) or 'unnamed'))}
if voice_note: if voice_note:
if types.DocumentAttributeAudio in attr_dict: if types.DocumentAttributeAudio in attr_dict: