Merge branch 'main' into special-character-fix

This commit is contained in:
Zotify 2024-09-01 08:44:24 +02:00
commit 6ca553a513
4 changed files with 5 additions and 5 deletions

View file

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

View file

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

View file

@ -49,7 +49,7 @@ def get_playlist_info(playlist_id):
def download_playlist(playlist): def download_playlist(playlist):
"""Downloads all the songs from a 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) p_bar = Printer.progress(playlist_songs, unit='song', total=len(playlist_songs), unit_scale=True)
enum = 1 enum = 1
for song in p_bar: for song in p_bar:

View file

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