Clone/zspotify
1
0
Fork 0
mirror of https://github.com/THIS-IS-NOT-A-BACKUP/zspotify.git synced 2024-12-02 12:33:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplifed the crash catching code a lot

Browse Source
This commit is contained in:
Footsiefat 2021-10-21 14:41:22 +13:00
parent 775d7cf3b6
commit a66848fe8e
1 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
zspotify.py
View File

@ -468,34 +468,33 @@ def get_saved_tracks(access_token):
def download_track(track_id_str: str, extra_paths=""): def download_track(track_id_str: str, extra_paths=""):
""" Downloads raw song audio from Spotify """ """ Downloads raw song audio from Spotify """
global ROOT_PATH, SKIP_EXISTING_FILES, MUSIC_FORMAT, RAW_AUDIO_AS_IS global ROOT_PATH, SKIP_EXISTING_FILES, MUSIC_FORMAT, RAW_AUDIO_AS_IS
try:
track_id = TrackId.from_base62(track_id_str)
artists, album_name, name, image_url, release_year, disc_number, track_number, scraped_song_id, is_playable = get_song_info( artists, album_name, name, image_url, release_year, disc_number, track_number, scraped_song_id, is_playable = get_song_info(
track_id_str) track_id_str)
song_name = artists[0] + " - " + name song_name = artists[0] + " - " + name
filename = ROOT_PATH + extra_paths + song_name + '.' + MUSIC_FORMAT filename = ROOT_PATH + extra_paths + song_name + '.' + MUSIC_FORMAT
except Exception as e:
print("### SKIPPING SONG - FAILED TO QUERY METADATA ###")
# print(e)
else:
try:
if not is_playable: if not is_playable:
print("### SKIPPING:", song_name, "(SONG IS UNAVAILABLE) ###") print("### SKIPPING:", song_name,
"(SONG IS UNAVAILABLE) ###")
else: else:
if os.path.isfile(filename) and SKIP_EXISTING_FILES: if os.path.isfile(filename) and SKIP_EXISTING_FILES:
print("### SKIPPING:", song_name, "(SONG ALREADY EXISTS) ###") print("### SKIPPING:", song_name,
"(SONG ALREADY EXISTS) ###")
else: else:
if track_id_str != scraped_song_id: if track_id_str != scraped_song_id:
print("### APPLYING PATCH TO LET SONG DOWNLOAD ###")
track_id_str = scraped_song_id track_id_str = scraped_song_id
track_id = TrackId.from_base62(track_id_str)
track_id = TrackId.from_base62(track_id_str)
print("### FOUND SONG:", song_name, " ###") print("### FOUND SONG:", song_name, " ###")
try:
stream = SESSION.content_feeder().load( stream = SESSION.content_feeder().load(
track_id, VorbisOnlyAudioQuality(QUALITY), False, None) track_id, VorbisOnlyAudioQuality(QUALITY), False, None)
except:
print("### SKIPPING:", song_name,
"(GENERAL DOWNLOAD ERROR) ###")
else:
print("### DOWNLOADING RAW AUDIO ###") print("### DOWNLOADING RAW AUDIO ###")
if not os.path.isdir(ROOT_PATH + extra_paths): if not os.path.isdir(ROOT_PATH + extra_paths):
@ -505,17 +504,17 @@ def download_track(track_id_str: str, extra_paths=""):
# Try's to download the entire track at once now to be more efficient. # Try's to download the entire track at once now to be more efficient.
byte = stream.input_stream.stream().read(-1) byte = stream.input_stream.stream().read(-1)
file.write(byte) file.write(byte)
if not RAW_AUDIO_AS_IS: if not RAW_AUDIO_AS_IS:
try:
convert_audio_format(filename) convert_audio_format(filename)
except:
os.remove(filename)
print("### SKIPPING:", song_name,
"(GENERAL CONVERSION ERROR) ###")
else:
set_audio_tags(filename, artists, name, album_name, set_audio_tags(filename, artists, name, album_name,
release_year, disc_number, track_number) release_year, disc_number, track_number)
set_music_thumbnail(filename, image_url) set_music_thumbnail(filename, image_url)
except:
print("### SKIPPING:", song_name,
"(GENERAL DOWNLOAD ERROR) ###")
if os.path.exists(filename):
os.remove(filename)
def download_album(album): def download_album(album):