JDM170/deezspot-spotizerr-dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

housekeeping after debloating

Browse Source
This commit is contained in:
Xoconoch
2025-06-03 16:19:41 -06:00
parent 75f619102d
commit 932f27711e
3 changed files with 65 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@@ -1 +1,11 @@
.venv .venv
deezspot/libutils/__pycache__
deezspot/models/__pycache__
deezspot/spotloader/__pycache__
.cache
credentials.json
test.py
downloads/
deezspot/__pycache__
deezspot/deezloader/__pycache__
deezspot/libutils/__pycache__

2
deezspot/libutils/others_settings.py
View File

@@ -21,5 +21,5 @@ stock_recursive_quality = False
stock_recursive_download = False stock_recursive_download = False
stock_not_interface = False stock_not_interface = False
stock_zip = False stock_zip = False
stock_real_time_dl = True stock_real_time_dl = False
stock_save_cover = False # Default for saving cover image stock_save_cover = False # Default for saving cover image

79
deezspot/spotloader/__download__.py
View File

@@ -212,33 +212,43 @@ class EASY_DW:
def __convert_audio(self) -> None: def __convert_audio(self) -> None:
# First, handle Spotify's OGG to standard format conversion (always needed) # First, handle Spotify's OGG to standard format conversion (always needed)
temp_filename = self.__song_path.replace(".ogg", ".tmp") # self.__song_path is initially the path for the .ogg file (e.g., song.ogg)
os_replace(self.__song_path, temp_filename) og_song_path_for_ogg_output = self.__song_path
temp_filename = og_song_path_for_ogg_output.replace(".ogg", ".tmp")
# Register the temporary file
register_active_download(temp_filename) # Move original .ogg to .tmp
os_replace(og_song_path_for_ogg_output, temp_filename)
register_active_download(temp_filename) # CURRENT_DOWNLOAD = temp_filename
try: try:
# Step 1: First convert the OGG file to standard format # Step 1: First convert the OGG file to standard format (copy operation)
ffmpeg_cmd = f"ffmpeg -y -hide_banner -loglevel error -i \"{temp_filename}\" -c:a copy \"{self.__song_path}\"" # Output is og_song_path_for_ogg_output
system(ffmpeg_cmd) ffmpeg_cmd = f'ffmpeg -y -hide_banner -loglevel error -i "{temp_filename}" -c:a copy "{og_song_path_for_ogg_output}"'
system(ffmpeg_cmd) # Creates/overwrites og_song_path_for_ogg_output
# Register the new output file and unregister the temp file # temp_filename has been processed. Unregister and remove it.
register_active_download(self.__song_path) # CURRENT_DOWNLOAD was temp_filename.
unregister_active_download(temp_filename) # CURRENT_DOWNLOAD should become None.
# Remove the temporary file
if os.path.exists(temp_filename): if os.path.exists(temp_filename):
remove(temp_filename) remove(temp_filename)
unregister_active_download(temp_filename)
# Step 2: Convert to requested format if specified # The primary file is now og_song_path_for_ogg_output. Register it.
# Ensure self.__song_path reflects this, as it might be used by other parts of the class or returned.
self.__song_path = og_song_path_for_ogg_output
register_active_download(self.__song_path) # CURRENT_DOWNLOAD = self.__song_path (the .ogg)
# Step 2: Convert to requested format if specified (e.g., MP3, FLAC)
conversion_to_another_format_occurred_and_cleared_state = False
if self.__convert_to: if self.__convert_to:
format_name, bitrate = parse_format_string(self.__convert_to) format_name, bitrate = parse_format_string(self.__convert_to)
if format_name: if format_name:
try: try:
# Convert to the requested format using our standardized converter # convert_audio is expected to handle its own input/output registration/unregistration.
# Input to convert_audio is self.__song_path (the .ogg path).
# On success, convert_audio should unregister its input and its output,
# leaving CURRENT_DOWNLOAD as None.
converted_path = convert_audio( converted_path = convert_audio(
self.__song_path, self.__song_path, # Current .ogg path
format_name, format_name,
bitrate, bitrate,
register_active_download, register_active_download,
@@ -247,24 +257,41 @@ class EASY_DW:
if converted_path != self.__song_path: if converted_path != self.__song_path:
# Update the path to the converted file # Update the path to the converted file
self.__song_path = converted_path self.__song_path = converted_path
self.__c_track.song_path = converted_path self.__c_track.song_path = converted_path # Ensure track object has the final path
conversion_to_another_format_occurred_and_cleared_state = True
except Exception as conv_error: except Exception as conv_error:
# Log conversion error but continue with original file # Conversion to a different format failed.
logger.error(f"Audio conversion error: {str(conv_error)}") # self.__song_path (the .ogg) is still the latest valid file and is registered.
# We want to keep it, so CURRENT_DOWNLOAD should remain set to this .ogg path.
logger.error(f"Audio conversion to {format_name} error: {str(conv_error)}")
# conversion_to_another_format_occurred_and_cleared_state remains False.
# else: format_name was None after parsing __convert_to. No specific conversion attempt.
# conversion_to_another_format_occurred_and_cleared_state remains False.
# If no conversion to another format was requested, or if it was requested but didn't effectively run
# (e.g. format_name was None), or if convert_audio failed to clear state (which would be its bug),
# then self.__song_path (the .ogg from Step 1) is the final successfully processed file for this method's scope.
# It is currently registered. Unregister it as its processing is complete.
if not conversion_to_another_format_occurred_and_cleared_state:
unregister_active_download(self.__song_path) # Clears CURRENT_DOWNLOAD if it was self.__song_path
except Exception as e: except Exception as e:
# In case of failure, try to restore the original file # This outer try/except handles errors primarily from Step 1 (OGG copy)
if os.path.exists(temp_filename) and not os.path.exists(self.__song_path): # or issues during the setup for Step 2 before convert_audio is deeply involved.
os_replace(temp_filename, self.__song_path) # In case of failure, try to restore the original file from temp if Step 1 didn't complete.
if os.path.exists(temp_filename) and not os.path.exists(og_song_path_for_ogg_output):
os_replace(temp_filename, og_song_path_for_ogg_output)
# Clean up temp files # Clean up temp_filename. unregister_active_download is safe:
# it only clears CURRENT_DOWNLOAD if CURRENT_DOWNLOAD == temp_filename.
if os.path.exists(temp_filename): if os.path.exists(temp_filename):
remove(temp_filename)
unregister_active_download(temp_filename) unregister_active_download(temp_filename)
remove(temp_filename)
# Re-throw the exception # Re-throw the exception. If a file (like og_song_path_for_ogg_output) was registered
# and an error occurred, it remains registered for atexit cleanup, which is intended.
raise e raise e
def get_no_dw_track(self) -> Track: def get_no_dw_track(self) -> Track:
return self.__c_track return self.__c_track