From d11681817205574afd3fdfbcc5ec14ca0accb2df Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 29 Apr 2022 18:42:16 -0400 Subject: [PATCH] track_number returns 1, PlaylistMeta data now contains playlist_count, and added tmp and vs folders to .gitignore --- .gitignore | 5 +++++ src/ytdl_sub/entries/base_entry.py | 1 + src/ytdl_sub/entries/soundcloud.py | 7 +++---- src/ytdl_sub/entries/variables/soundcloud_variables.py | 4 +--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 06b77552..5a4d370b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,11 @@ __pycache__/ # C extensions *.so +# VSCODE files +.vscode +# Build files +tmp/ + # Distribution / packaging .Python build/ diff --git a/src/ytdl_sub/entries/base_entry.py b/src/ytdl_sub/entries/base_entry.py index b0b5188b..05554bbd 100644 --- a/src/ytdl_sub/entries/base_entry.py +++ b/src/ytdl_sub/entries/base_entry.py @@ -14,6 +14,7 @@ class PlaylistMetadata: playlist_index: int playlist_id: str playlist_extractor: str + playlist_count: int class BaseEntry(ABC): diff --git a/src/ytdl_sub/entries/soundcloud.py b/src/ytdl_sub/entries/soundcloud.py index 0e72f01d..ed83498a 100644 --- a/src/ytdl_sub/entries/soundcloud.py +++ b/src/ytdl_sub/entries/soundcloud.py @@ -31,7 +31,6 @@ class SoundcloudAlbumTrack(SoundcloudTrack): working_directory: str, album: str, album_year: int, - total_tracks: int, playlist_metadata: PlaylistMetadata, ): """ @@ -41,7 +40,6 @@ class SoundcloudAlbumTrack(SoundcloudTrack): self._album = album self._album_year = album_year self._playlist_metadata = playlist_metadata - self._total_tracks = total_tracks @property def track_number(self) -> int: @@ -56,7 +54,7 @@ class SoundcloudAlbumTrack(SoundcloudTrack): @property def total_tracks(self) -> int: """Returns the entry's total tracks in album for singles this is 1, fetched from its internal album""" - return self._total_tracks + return self._playlist_metadata.playlist_count @property def album_year(self) -> int: @@ -116,7 +114,8 @@ class SoundcloudAlbum(Entry): playlist_metadata=PlaylistMetadata( playlist_id=self.uid, playlist_extractor=self.extractor, - playlist_index=track.kwargs("playlist_index"), + playlist_index= track.kwargs("playlist_index"), + playlist_count = self.track_count ), ) for track in tracks diff --git a/src/ytdl_sub/entries/variables/soundcloud_variables.py b/src/ytdl_sub/entries/variables/soundcloud_variables.py index 0fe592e6..7ea7a778 100644 --- a/src/ytdl_sub/entries/variables/soundcloud_variables.py +++ b/src/ytdl_sub/entries/variables/soundcloud_variables.py @@ -32,9 +32,7 @@ class SoundcloudVariables(EntryVariables): ------- The total tracks in album. For singles, it will always be 1. """ - if self.kwargs_contains("total_tracks"): - return self.kwargs("total_tracks") - return 1 # i.e. single does not contain total_tracks + return 1 @property def album(self) -> str: