Skip to content

Enable the -n (maxtracks) option functionality #532

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 1 commit into
base: master
Choose a base branch
from
Open

Enable the -n (maxtracks) option functionality #532

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions scdl/scdl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,8 @@ def download_url(client: SoundCloud, kwargs: SCDLArgs) -> None:
item = client.resolve(url)
logger.debug(item)
offset = kwargs.get("offset", 0)
stop = offset+int(kwargs.get("n")) if kwargs.get("n") else None

if item is None:
logger.error("URL is not valid")
sys.exit(1)
Expand All @@ -578,7 +580,7 @@ def download_url(client: SoundCloud, kwargs: SCDLArgs) -> None:
if kwargs.get("f"):
logger.info(f"Retrieving all likes of user {user.username}...")
likes = client.get_user_likes(user.id, limit=1000)
for i, like in itertools.islice(enumerate(likes, 1), offset, None):
for i, like in itertools.islice(enumerate(likes, 1), offset, stop):
logger.info(f"like n°{i} of {user.likes_count}")
if isinstance(like, TrackLike):
download_track(
Expand All @@ -599,7 +601,7 @@ def download_url(client: SoundCloud, kwargs: SCDLArgs) -> None:
elif kwargs.get("C"):
logger.info(f"Retrieving all commented tracks of user {user.username}...")
comments = client.get_user_comments(user.id, limit=1000)
for i, comment in itertools.islice(enumerate(comments, 1), offset, None):
for i, comment in itertools.islice(enumerate(comments, 1), offset, stop):
logger.info(f"comment n°{i} of {user.comments_count}")
track = client.get_track(comment.track.id)
assert track is not None
Expand All @@ -613,14 +615,14 @@ def download_url(client: SoundCloud, kwargs: SCDLArgs) -> None:
elif kwargs.get("t"):
logger.info(f"Retrieving all tracks of user {user.username}...")
tracks = client.get_user_tracks(user.id, limit=1000)
for i, track in itertools.islice(enumerate(tracks, 1), offset, None):
for i, track in itertools.islice(enumerate(tracks, 1), offset, stop):
logger.info(f"track n°{i} of {user.track_count}")
download_track(client, track, kwargs, exit_on_fail=kwargs["strict_playlist"])
logger.info(f"Downloaded all tracks of user {user.username}!")
elif kwargs.get("a"):
logger.info(f"Retrieving all tracks & reposts of user {user.username}...")
items = client.get_user_stream(user.id, limit=1000)
for i, stream_item in itertools.islice(enumerate(items, 1), offset, None):
for i, stream_item in itertools.islice(enumerate(items, 1), offset, stop):
logger.info(
f"item n°{i} of "
f"{user.track_count + user.reposts_count if user.reposts_count else '?'}",
Expand Down Expand Up @@ -649,7 +651,7 @@ def download_url(client: SoundCloud, kwargs: SCDLArgs) -> None:
elif kwargs.get("r"):
logger.info(f"Retrieving all reposts of user {user.username}...")
reposts = client.get_user_reposts(user.id, limit=1000)
for i, repost in itertools.islice(enumerate(reposts, 1), offset, None):
for i, repost in itertools.islice(enumerate(reposts, 1), offset, stop):
logger.info(f"item n°{i} of {user.reposts_count or '?'}")
if isinstance(repost, TrackStreamRepostItem):
download_track(
Expand Down
Loading