6FPS/tidal-dl
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ Added some error handling for file merge.

Browse Source
This commit is contained in:
Robert Honz
2024-11-14 08:07:54 +01:00
parent 84b777ca0a
commit d3dedc0b6f
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tidal_dl_ng/download.py
+7 -5
View File
@@ -105,6 +105,7 @@ class Download:
path_base: pathlib.Path = path_file.parent path_base: pathlib.Path = path_file.parent
result_segments: bool = True result_segments: bool = True
dl_segment_results: [DownloadSegmentResult] = [] dl_segment_results: [DownloadSegmentResult] = []
result_merge: bool = False
# Get urls for media. # Get urls for media.
if isinstance(media, Track): if isinstance(media, Track):
@@ -179,14 +180,16 @@ class Download:
if result_segments: if result_segments:
# Bring list into right order, so segments can be easily merged. # Bring list into right order, so segments can be easily merged.
dl_segment_results.sort(key=lambda x: x.id_segment) dl_segment_results.sort(key=lambda x: x.id_segment)
reult_merge: bool = self._segments_merge(path_file, dl_segment_results) result_merge: bool = self._segments_merge(path_file, dl_segment_results)
if reult_merge and isinstance(media, Track) and stream_manifest.is_encrypted: if not result_merge:
self.fn_logger.error(f"Something went wrong while writing to {media_name}. File is corrupt!")
elif result_merge and isinstance(media, Track) and stream_manifest.is_encrypted:
key, nonce = decrypt_security_token(stream_manifest.encryption_key) key, nonce = decrypt_security_token(stream_manifest.encryption_key)
tmp_path_file_decrypted = path_file.with_suffix("_decrypted") tmp_path_file_decrypted = path_file.with_suffix("_decrypted")
decrypt_file(path_file, tmp_path_file_decrypted, key, nonce) decrypt_file(path_file, tmp_path_file_decrypted, key, nonce)
return result_segments, tmp_path_file_decrypted return result_merge, tmp_path_file_decrypted
def _segments_merge(self, path_file, dl_segment_results) -> bool: def _segments_merge(self, path_file, dl_segment_results) -> bool:
result: bool result: bool
@@ -195,7 +198,6 @@ class Download:
try: try:
with path_file.open("wb") as f_target: with path_file.open("wb") as f_target:
for dl_segment_result in dl_segment_results: for dl_segment_result in dl_segment_results:
if dl_segment_result.result:
with dl_segment_result.path_segment.open("rb") as f_segment: with dl_segment_result.path_segment.open("rb") as f_segment:
# Read and write junks, which gives better HDD write performance # Read and write junks, which gives better HDD write performance
while segment := f_segment.read(CHUNK_SIZE): while segment := f_segment.read(CHUNK_SIZE):
@@ -205,7 +207,7 @@ class Download:
dl_segment_result.path_segment.unlink() dl_segment_result.path_segment.unlink()
result = True result = True
except: except Exception:
result = False result = False
return result return result