Merge branch 'main' into special-character-fix

requirements.txt

@@ -4,5 +4,5 @@ music_tag
 Pillow
 protobuf
 pwinput
-tabulate
+tabulate[widechars]
 tqdm

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = zotify
-version = 0.6.13
+version = 0.6.14
 author = Zotify Contributors
 description = A highly customizable music and podcast downloader
 long_description = file: README.md
@@ -22,7 +22,7 @@ install_requires =
     Pillow
     protobuf==3.20.1
     pwinput
-    tabulate
+    tabulate[widechars]
     tqdm
 
 [options.package_data]

zotify/playlist.py

@@ -49,7 +49,7 @@ def get_playlist_info(playlist_id):
 def download_playlist(playlist):
     """Downloads all the songs from a playlist"""
 
-    playlist_songs = [song for song in get_playlist_songs(playlist[ID]) if song[TRACK][ID]]
+    playlist_songs = [song for song in get_playlist_songs(playlist[ID]) if song[TRACK] is not None and song[TRACK][ID]]
     p_bar = Printer.progress(playlist_songs, unit='song', total=len(playlist_songs), unit_scale=True)
     enum = 1
     for song in p_bar:

zotify/track.py

@@ -280,7 +280,7 @@ def download_track(mode: str, track_id: str, extra_keys=None, disable_progressba
                     if not check_id:
                         add_to_directory_song_ids(filedir, scraped_song_id, PurePath(filename).name, artists[0], name)
 
-                    if not Zotify.CONFIG.get_bulk_wait_time():
+                    if Zotify.CONFIG.get_bulk_wait_time():
                         time.sleep(Zotify.CONFIG.get_bulk_wait_time())
         except Exception as e:
             Printer.print(PrintChannel.ERRORS, '###   SKIPPING: ' + song_name + ' (GENERAL DOWNLOAD ERROR)   ###')