diff --git a/src/main.py b/src/main.py index 8e212b3..c1c4826 100644 --- a/src/main.py +++ b/src/main.py @@ -31,7 +31,7 @@ def skip_album(path: Path): return False -def transcode(transcode_list: list, encoder: Path, workers=8): +def transcode(transcode_list: list, encoder: Path, workers=16): worker_args = [(row[0], row[1], encoder) for row in transcode_list] with Pool(workers) as p: results = p.starmap_async(transcode_worker, worker_args) @@ -42,22 +42,30 @@ def transcode(transcode_list: list, encoder: Path, workers=8): def transcode_worker(in_track, out_track, encoder): - additional_args = ('--bitrate', '128', '--music') - subprocess_args = (str(encoder),) + additional_args + (in_track, out_track) + enc_filename = encoder.parts[-1] + if enc_filename == "opusenc.exe": + additional_args = ('--bitrate', '128', '--music') + subprocess_args = (str(encoder),) + additional_args + (in_track, out_track) + elif enc_filename == "qaac64.exe": + additional_args = (in_track, '-o', out_track, '--threading') + subprocess_args = (str(encoder),) + additional_args try: subprocess.run(subprocess_args, capture_output=True, text=True, check=True) return f"Transcoded '{in_track}' successfully." - except CalledProcessError: + except Exception: return f"ERROR: Transcoding of '{in_track}' failed." -def main(input_dir: Path, output_dir: Path, encoder: Path): +def main(input_dir: Path, output_dir: Path, encoder: Path, out_extension: str = 'opus'): + enc_filename = encoder.parts[-1] + if enc_filename == "qaac64.exe": + out_extension = "m4a" transcode_list = [] file_whitelist = ['.jpg', '.jpeg', '.png'] for artist in input_dir.iterdir(): if artist.is_dir(): artist_out = Path(output_dir) / artist.name - if skip_all_albums(artist): + if False: #skip_all_albums(artist): print(f"Skipping '{artist.parts[-1]}'") continue else: @@ -65,7 +73,7 @@ def main(input_dir: Path, output_dir: Path, encoder: Path): for album in artist.iterdir(): if album.is_dir(): album_out = artist_out / album.parts[-1] - if skip_album(album): + if album_out.exists(): print(f"Skipping '{artist.parts[-1]} / {album.parts[-1]}'") else: album_out.mkdir() @@ -73,7 +81,7 @@ def main(input_dir: Path, output_dir: Path, encoder: Path): open(done_file, 'a').close() for file in album.iterdir(): if file.is_file() and file.suffix.lower() == '.flac': - transcode_list.append((str(file), str(album_out / f"{file.stem}.opus"))) + transcode_list.append((str(file), str(album_out / f"{file.stem}.{out_extension}"))) elif file.is_file() and file.suffix.lower() in file_whitelist: shutil.copy(file, album_out / file.name) else: