From e3c4e05f445801d2f58c8c389dddc070037f125a Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 29 Apr 2022 11:10:51 -0400 Subject: [PATCH] ran linter --- src/ytdl_sub/entries/soundcloud.py | 5 ++--- src/ytdl_sub/entries/variables/soundcloud_variables.py | 3 ++- tests/unit/entries/test_soundcloud_entries.py | 10 +++++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/ytdl_sub/entries/soundcloud.py b/src/ytdl_sub/entries/soundcloud.py index 2d283a9b..0e72f01d 100644 --- a/src/ytdl_sub/entries/soundcloud.py +++ b/src/ytdl_sub/entries/soundcloud.py @@ -33,7 +33,6 @@ class SoundcloudAlbumTrack(SoundcloudTrack): album_year: int, total_tracks: int, playlist_metadata: PlaylistMetadata, - ): """ Initialize the album track using album metadata and ytdl metadata for the specific track. @@ -113,7 +112,7 @@ class SoundcloudAlbum(Entry): album=self.title, album_year=self.album_year, soundcloud_track=track, - total_tracks = self.track_count, + total_tracks=self.track_count, playlist_metadata=PlaylistMetadata( playlist_id=self.uid, playlist_extractor=self.extractor, @@ -129,7 +128,7 @@ class SoundcloudAlbum(Entry): def album_year(self) -> int: """Returns the album's year, computed by the max upload year amongst all album tracks""" return max(track.upload_year for track in self._single_tracks) - + @property def track_count(self) -> int: return self.kwargs("playlist_count") diff --git a/src/ytdl_sub/entries/variables/soundcloud_variables.py b/src/ytdl_sub/entries/variables/soundcloud_variables.py index 076e5d7e..0fe592e6 100644 --- a/src/ytdl_sub/entries/variables/soundcloud_variables.py +++ b/src/ytdl_sub/entries/variables/soundcloud_variables.py @@ -34,7 +34,8 @@ class SoundcloudVariables(EntryVariables): """ if self.kwargs_contains("total_tracks"): return self.kwargs("total_tracks") - return 1 #i.e. single does not contain total_tracks + return 1 # i.e. single does not contain total_tracks + @property def album(self) -> str: """ diff --git a/tests/unit/entries/test_soundcloud_entries.py b/tests/unit/entries/test_soundcloud_entries.py index ea1d1c0d..1bf82933 100644 --- a/tests/unit/entries/test_soundcloud_entries.py +++ b/tests/unit/entries/test_soundcloud_entries.py @@ -12,10 +12,12 @@ def track_number(): def track_number_padded(): return "01" + @pytest.fixture def track_count(): return 1 + @pytest.fixture def url(): return "soundcloud.com/artist/track-asdfasdf" @@ -25,10 +27,12 @@ def url(): def is_premiere(): return False + @pytest.fixture() def total_tracks(): return 1 + @pytest.fixture def mock_soundcloud_track_to_dict( mock_entry_to_dict, @@ -37,7 +41,7 @@ def mock_soundcloud_track_to_dict( track_number, track_number_padded, is_premiere, - total_tracks + total_tracks, ): return dict( mock_entry_to_dict, @@ -47,7 +51,7 @@ def mock_soundcloud_track_to_dict( "album": title, "sanitized_album": title, "album_year": upload_year, - "total_tracks": total_tracks + "total_tracks": total_tracks, } ) @@ -70,7 +74,7 @@ def validate_soundcloud_track_properties( track_number, track_number_padded, is_premiere, - total_tracks + total_tracks, ): def _validate_soundcloud_track_properties(soundcloud_track: SoundcloudTrack): assert validate_entry_properties(soundcloud_track)