karaolidis/fbchat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mimetypes.guess_type (#471)

Browse Source 
`mimetypes.guess_type` fails if the url is something like `http://example.com/file.zip?u=10`.

Backported from 6bffb66
This commit is contained in:
Asiel Díaz Benítez
2019-09-08 09:56:27 -04:00
committed by Mads Marquart
parent 3d28c958d3
commit bb1f7d9294
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fbchat/_util.py
View File

@@ -219,11 +219,12 @@ def get_files_from_urls(file_urls):
r = requests.get(file_url) r = requests.get(file_url)
# We could possibly use r.headers.get('Content-Disposition'), see # We could possibly use r.headers.get('Content-Disposition'), see
# https://stackoverflow.com/a/37060758 # https://stackoverflow.com/a/37060758
file_name = basename(file_url).split("?")[0].split("#")[0]
files.append( files.append(
( (
basename(file_url).split("?")[0].split("#")[0], file_name,
r.content, r.content,
r.headers.get("Content-Type") or guess_type(file_url)[0], r.headers.get("Content-Type") or guess_type(file_name)[0],
) )
) )
return files return files