Skip to content

Add --onlyhq option #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Add --onlyhq option #424

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8cacd75
Add --onlyhq option
tommiekerssies Jun 2, 2022
080014a
Update scdl.py
tommiekerssies Jun 4, 2022
ec8d827
Update scdl.py
tommiekerssies Jun 4, 2022
8783cd7
Update scdl.py
tommiekerssies Jun 6, 2022
cbfd4d4
Merge pull request #1 from tommiekerssies/master
tommiekerssies Jun 6, 2022
3dce97e
Update scdl.py
tommiekerssies Jun 6, 2022
cbaa7ff
Update scdl.py
tommiekerssies Jun 6, 2022
a071339
utf-8 to ascii
tommiekerssies Jun 14, 2022
925deee
Merge pull request #2 from tommiekerssies/master
tommiekerssies Jun 14, 2022
e5c2370
Merge branch 'master' into patch-1
7x11x13 Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 27 additions & 26 deletions scdl/scdl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[--download-archive <file>][--sync <file>][--extract-artist][--flac][--original-art]
[--original-name][--no-original][--only-original][--name-format <format>]
[--strict-playlist][--playlist-name-format <format>][--client-id <id>]
[--auth-token <token>][--overwrite][--no-playlist]
[--auth-token <token>][--overwrite][--no-playlist][--onlyhq]

scdl -h | --help
scdl --version
Expand Down Expand Up @@ -64,6 +64,7 @@
--overwrite Overwrite file if it already exists
--strict-playlist Abort playlist downloading if one track fails to download
--no-playlist Skip downloading playlists
--onlyhq Skip downloading track if it is only available in 128kbps mp3
"""

import cgi
Expand Down Expand Up @@ -428,8 +429,8 @@ def sync(client: SoundCloud, playlist: BasicAlbumPlaylist, playlist_info, **kwar
fileToKeep.append(get_filename(client.get_track(track_id), playlist_info=playlist_info, **kwargs))

if not (add or rem):
logger.info("No changes found. Exiting...")
sys.exit(0)
logger.info("No changes found")
return

if rem:
remove_files()
Expand All @@ -443,8 +444,7 @@ def sync(client: SoundCloud, playlist: BasicAlbumPlaylist, playlist_info, **kwar
if add:
return [track for track in playlist.tracks if track.id in add]
else:
logger.info('No tracks to download. Exiting...')
sys.exit(0)
logger.info('No tracks to download')

def download_playlist(client: SoundCloud, playlist: BasicAlbumPlaylist, **kwargs):
"""
Expand All @@ -453,8 +453,8 @@ def download_playlist(client: SoundCloud, playlist: BasicAlbumPlaylist, **kwargs
if kwargs.get("no_playlist"):
logger.info("Skipping playlist...")
return
playlist_name = playlist.title.encode("utf-8", "ignore")
playlist_name = playlist_name.decode("utf-8")
playlist_name = playlist.title.encode("ascii", "ignore")
playlist_name = playlist_name.decode("ascii")
playlist_name = sanitize_filename(playlist_name)
playlist_info = {
"author": playlist.user.username,
Expand All @@ -479,20 +479,21 @@ def download_playlist(client: SoundCloud, playlist: BasicAlbumPlaylist, **kwargs
playlist.tracks = sync(client, playlist, playlist_info, **kwargs)
else:
logger.error(f'Invalid sync archive file {kwargs.get("sync")}')
sys.exit(1)

tracknumber_digits = len(str(len(playlist.tracks)))
for counter, track in itertools.islice(enumerate(playlist.tracks, 1), kwargs.get("playlist_offset", 0), None):
logger.debug(track)
logger.info(f"Track n°{counter}")
playlist_info["tracknumber"] = str(counter).zfill(tracknumber_digits)
if isinstance(track, MiniTrack):
if playlist.secret_token:
track = client.get_tracks([track.id], playlist.id, playlist.secret_token)[0]
else:
track = client.get_track(track.id)

download_track(client, track, playlist_info, kwargs.get("strict_playlist"), **kwargs)
return

if playlist.tracks is not None:
tracknumber_digits = len(str(len(playlist.tracks)))
for counter, track in itertools.islice(enumerate(playlist.tracks, 1), kwargs.get("playlist_offset", 0), None):
logger.debug(track)
logger.info(f"Track n°{counter}")
playlist_info["tracknumber"] = str(counter).zfill(tracknumber_digits)
if isinstance(track, MiniTrack):
if playlist.secret_token:
track = client.get_tracks([track.id], playlist.id, playlist.secret_token)[0]
else:
track = client.get_track(track.id)

download_track(client, track, playlist_info, kwargs.get("strict_playlist"), **kwargs)
finally:
if not kwargs.get("no_playlist_folder"):
os.chdir("..")
Expand All @@ -506,7 +507,7 @@ def try_utime(path, filetime):
def get_filename(track: BasicTrack, original_filename=None, aac=False, playlist_info=None, **kwargs):

username = track.user.username
title = track.title.encode("utf-8", "ignore").decode("utf-8")
title = track.title.encode("ascii", "ignore").decode("ascii")

if kwargs.get("addtofile"):
if username not in title and "-" not in title:
Expand All @@ -525,7 +526,7 @@ def get_filename(track: BasicTrack, original_filename=None, aac=False, playlist_

ext = ".m4a" if aac else ".mp3" # contain aac in m4a to write metadata
if original_filename is not None:
original_filename = original_filename.encode("utf-8", "ignore").decode("utf-8")
original_filename = original_filename.encode("ascii", "ignore").decode("ascii")
ext = os.path.splitext(original_filename)[1]
filename = limit_filename_length(title, ext)
filename = sanitize_filename(filename)
Expand Down Expand Up @@ -663,7 +664,7 @@ def download_hls(client: SoundCloud, track: BasicTrack, title: str, playlist_inf
if not kwargs.get("onlymp3") and aac_transcoding:
transcoding = aac_transcoding
aac = True
elif mp3_transcoding:
elif not kwargs.get("onlyhq") and mp3_transcoding:
transcoding = mp3_transcoding

if not transcoding:
Expand Down Expand Up @@ -696,7 +697,7 @@ def download_track(client: SoundCloud, track: BasicTrack, playlist_info=None, ex
"""
try:
title = track.title
title = title.encode("utf-8", "ignore").decode("utf-8")
title = title.encode("ascii", "ignore").decode("ascii")
logger.info(f"Downloading {title}")

# Not streamable
Expand Down Expand Up @@ -951,7 +952,7 @@ def set_metadata(track: BasicTrack, filename: str, playlist_info=None, **kwargs)
audio.save()

def limit_filename_length(name: str, ext: str, max_bytes=255):
while len(name.encode("utf-8")) + len(ext.encode("utf-8")) > max_bytes:
while len(name.encode("ascii")) + len(ext.encode("ascii")) > max_bytes:
name = name[:-1]
return name + ext

Expand Down