Skip to content

Commit 23725e7

Browse files
committed
- Cleanup ffmpeg calls
- Fix errors when decoding ffmpeg output
1 parent 514b65a commit 23725e7

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

convert-music-library.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def getLogFileName(basename, logdir=os.getcwd()):
174174

175175
def getAudioFileCoverFormat(audio_file):
176176
if os.path.exists(audio_file) and os.path.isfile(audio_file):
177-
result_probe_format = subprocess.run(["ffprobe", "-hide_banner", "-select_streams", "v:0", "-show_entries", "stream=codec_name", "-loglevel", "quiet", audio_file], capture_output=True, text=True)
177+
result_probe_format = subprocess.run(["ffprobe", "-hide_banner", "-loglevel", "quiet", "-select_streams", "v:0", "-show_entries", "stream=codec_name", audio_file], capture_output=True, text=False)
178178
in_stream_section = False
179179
codec_name = ""
180180

@@ -294,15 +294,15 @@ def convertCover(input_file, output_filename, convert_cover=True, cover_size=0):
294294
new_cover_filename = os.path.join(tmpdir, "tmp_newcover")
295295

296296
#Extract the cover using ffmpeg
297-
result_extract_cover = subprocess.run(["ffmpeg", "-i", originalfilepath, "-c:v", "copy", "-loglevel", "quiet", "-f", "image2", extracted_cover_filename], capture_output=True, text=False)
297+
result_extract_cover = subprocess.run(["ffmpeg", "-hide_banner", "-loglevel", "quiet", "-i", originalfilepath, "-c:v", "copy", "-f", "image2", extracted_cover_filename], capture_output=True, text=False)
298298

299299
#Check if the extraction process was successful
300300
if result_extract_cover.returncode == 0:
301301
#Convert cover according to set settings
302302
convertCover(extracted_cover_filename, new_cover_filename, settings["convert_cover"], settings["cover_scale"])
303303

304304
#Re-insert cover into audio file using ffmpeg
305-
result_replace_cover = subprocess.run(["ffmpeg","-i", originalfilepath, "-f", "image2", "-i", new_cover_filename, "-c", "copy", "-map", "0:a", "-map", "1:v", "-write_xing", "0", newfilepath], capture_output=True, text=True)
305+
result_replace_cover = subprocess.run(["ffmpeg", "-hide_banner", "-loglevel", "quiet", "-i", originalfilepath, "-f", "image2", "-i", new_cover_filename, "-c", "copy", "-map", "0:a", "-map", "1:v", "-write_xing", "0", newfilepath], capture_output=True, text=False)
306306

307307
if result_replace_cover.returncode == 0:
308308
print(term.green("SUCCESS (CONVERT)"))
@@ -367,14 +367,14 @@ def convertCover(input_file, output_filename, convert_cover=True, cover_size=0):
367367
new_cover_filename = os.path.join(tmpdir, "tmp_newcover")
368368

369369
#Extract the cover using ffmpeg
370-
result_extract_cover = subprocess.run(["ffmpeg", "-i", originalfilepath, "-c:v", "copy", "-loglevel", "quiet", "-f", "image2", extracted_cover_filename], capture_output=True, text=False)
370+
result_extract_cover = subprocess.run(["ffmpeg", "-hide_banner", "-loglevel", "quiet", "-i", originalfilepath, "-c:v", "copy", "-f", "image2", extracted_cover_filename], capture_output=True, text=False)
371371

372372
#Check if the extraction process was successful
373373
if result_extract_cover.returncode == 0:
374374
#Convert cover according to set settings
375375
convertCover(extracted_cover_filename, new_cover_filename, settings["convert_cover"], settings["cover_scale"])
376376

377-
result_convert_file = subprocess.run(["ffmpeg", "-i", originalfilepath, "-f", "image2", "-i", new_cover_filename, "-hide_banner", "-loglevel", "quiet", "-c:v", "copy", "-map", "0:a", "-map", "1:v", "-c:a", "mp3", "-b:a", "320k", "-map_metadata", "0", "-id3v2_version", "3", "-write_xing", "0", newfilepath], capture_output=True, text=True)
377+
result_convert_file = subprocess.run(["ffmpeg", "-hide_banner", "-loglevel", "quiet", "-i", originalfilepath, "-f", "image2", "-i", new_cover_filename, "-c:v", "copy", "-map", "0:a", "-map", "1:v", "-c:a", "mp3", "-b:a", "320k", "-map_metadata", "0", "-id3v2_version", "3", "-write_xing", "0", newfilepath], capture_output=True, text=False)
378378

379379
if result_convert_file.returncode == 0:
380380
print(term.green("SUCCESS (CONVERT)"))
@@ -399,7 +399,7 @@ def convertCover(input_file, output_filename, convert_cover=True, cover_size=0):
399399
if os.path.exists(new_cover_filename):
400400
os.remove(new_cover_filename)
401401
else:
402-
result_convert_file = subprocess.run(["ffmpeg", "-i", originalfilepath, "-hide_banner", "-loglevel", "quiet", "-c:v", "copy", "-b:a", "320k", "-map_metadata", "0", "-c:a", "mp3", "-id3v2_version", "3", "-write_xing", "0", newfilepath], capture_output=True)
402+
result_convert_file = subprocess.run(["ffmpeg", "-hide_banner", "-loglevel", "quiet", "-i", originalfilepath, "-c:v", "copy", "-b:a", "320k", "-map_metadata", "0", "-c:a", "mp3", "-id3v2_version", "3", "-write_xing", "0", newfilepath], capture_output=True, text=False)
403403

404404
if result_convert_file.returncode == 0:
405405
print(term.green("SUCCESS (TO MP3 ONLY)"))

0 commit comments

Comments
 (0)