Merge remote-tracking branch 'warry-github/master' into feature/json-downloaded
# Conflicts: # README.md
This commit is contained in:
+17
-3
@@ -409,7 +409,7 @@ class Download:
|
||||
with path_file.open("wb") as f_target:
|
||||
for dl_segment_result in dl_segment_results:
|
||||
with dl_segment_result.path_segment.open("rb") as f_segment:
|
||||
# Read and write junks, which gives better HDD write performance
|
||||
# Read and write chunks, which gives better HDD write performance
|
||||
while segment := f_segment.read(CHUNK_SIZE):
|
||||
f_target.write(segment)
|
||||
|
||||
@@ -1270,7 +1270,7 @@ class Download:
|
||||
response: requests.Response = requests.get(url, timeout=REQUESTS_TIMEOUT_SEC)
|
||||
result = response.content
|
||||
except Exception as e:
|
||||
# TODO: Implement propper logging.
|
||||
# TODO: Implement proper logging.
|
||||
print(e)
|
||||
finally:
|
||||
response.close()
|
||||
@@ -1279,7 +1279,7 @@ class Download:
|
||||
with open(path_file, "rb") as f:
|
||||
result = f.read()
|
||||
except OSError as e:
|
||||
# TODO: Implement propper logging.
|
||||
# TODO: Implement proper logging.
|
||||
print(e)
|
||||
|
||||
return result
|
||||
@@ -1733,15 +1733,22 @@ class Download:
|
||||
pathlib.Path: Path to the converted MP4 file.
|
||||
"""
|
||||
path_file_out: pathlib.Path = path_file.with_suffix(AudioExtensions.MP4)
|
||||
|
||||
self.fn_logger.debug(f"Converting video: {path_file.name} -> {path_file_out.name}")
|
||||
|
||||
ffmpeg = (
|
||||
FFmpeg(executable=self.settings.data.path_binary_ffmpeg)
|
||||
.option("y")
|
||||
.option("hide_banner")
|
||||
.option("nostdin")
|
||||
.input(url=path_file)
|
||||
.output(url=path_file_out, codec="copy", map=0, loglevel="quiet")
|
||||
)
|
||||
|
||||
ffmpeg.execute()
|
||||
|
||||
self.fn_logger.debug(f"Video conversion complete: {path_file_out.name}")
|
||||
|
||||
return path_file_out
|
||||
|
||||
def _extract_flac(self, path_media_src: pathlib.Path) -> pathlib.Path:
|
||||
@@ -1754,8 +1761,13 @@ class Download:
|
||||
pathlib.Path: Path to the extracted FLAC file.
|
||||
"""
|
||||
path_media_out = path_media_src.with_suffix(AudioExtensions.FLAC)
|
||||
|
||||
self.fn_logger.debug(f"Extracting FLAC: {path_media_src.name} -> {path_media_out.name}")
|
||||
|
||||
ffmpeg = (
|
||||
FFmpeg(executable=self.settings.data.path_binary_ffmpeg)
|
||||
.option("hide_banner")
|
||||
.option("nostdin")
|
||||
.input(url=path_media_src)
|
||||
.output(
|
||||
url=path_media_out,
|
||||
@@ -1769,6 +1781,8 @@ class Download:
|
||||
|
||||
ffmpeg.execute()
|
||||
|
||||
self.fn_logger.debug(f"FLAC extraction complete: {path_media_out.name}")
|
||||
|
||||
return path_media_out
|
||||
|
||||
def _extract_video_stream(self, m3u8_variant: m3u8.M3U8, quality: int) -> tuple[m3u8.M3U8 | bool, str]:
|
||||
|
||||
Reference in New Issue
Block a user