flyingrub
/
scdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefer original file extension over mimetype guess

master
7x11x13 2021-11-29 05:36:26 -05:00
parent da8b9c2d86
commit cc22faf121
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scdl/__init__.py
View File

@ -2,4 +2,4 @@
"""Python Soundcloud Music Downloader."""
__version__ = "v2.3.2"
__version__ = "v2.3.3"

6
scdl/scdl.py
View File

@ -452,7 +452,7 @@ def get_filename(track: BasicTrack, original_filename=None, aac=False, playlist_
def download_original_file(client: SoundCloud, track: BasicTrack, title: str, playlist_info=None, **kwargs):
logger.info("Downloading the original file.")
# Get the requests stream
url = client.get_track_original_download(track.id, track.secret_token)
@ -472,19 +472,17 @@ def download_original_file(client: SoundCloud, track: BasicTrack, title: str, pl
# Find filename
header = r.headers.get("content-disposition")
_, params = cgi.parse_header(header)
print(header)
if "filename" in params:
filename = urllib.parse.unquote(params["filename"], encoding="utf-8")
else:
raise SoundCloudException(f"Could not get filename from content-disposition header: {header}")
print(filename)
if not kwargs.get("original_name"):
filename, ext = os.path.splitext(filename)
# Find file extension
mime = r.headers.get("content-type")
ext = mimetypes.guess_extension(mime) or ext
ext = ext or mimetypes.guess_extension(mime)
filename += ext
filename = get_filename(track, filename, playlist_info=playlist_info, **kwargs)