Move transcoding logic to separate class

src/main.py

@@ -1,6 +1,8 @@
 import argparse
+from os.path import realpath
 from pathlib import Path
 from transcode import Transcoder
+from log import Log
 
 def get_args():
     parser = argparse.ArgumentParser()
@@ -11,9 +13,11 @@ def get_args():
 
 
 def main(input_dir: Path, output_dir: Path, encoder: Path, out_extension: str = 'opus'):
+    wd = Path(realpath(__file__)).parent.parent
+    log_path = wd / "logs"
     if encoder.parts[-1] == "qaac64.exe":
         out_extension = "m4a"
-    transcoder = Transcoder(encoder, out_extension, input_dir, output_dir)
+    transcoder = Transcoder(encoder, out_extension, input_dir, output_dir, log_path)
     transcoder.transcode()
 
 

src/transcode/__init__.py

@@ -1,2 +1,3 @@
 from .file import File
+from .worker import Worker
 from .transcoder import Transcoder

src/transcode/transcoder.py

@@ -1,96 +1,61 @@
 from pathlib import Path
-import shutil
+from multiprocessing import Pool, Manager, set_start_method
-import subprocess
+from log import Log, LogCat
-from multiprocessing import Pool
+from . import Worker
-from . import File
 
 
 class Transcoder:
-    def __init__(self, encoder: Path, extension: str, input_root: Path, output_root: Path):
+    def __init__(self, encoder: Path, extension: str, input_root: Path, output_root: Path, log_path: Path):
         self.encoder = encoder
         self.extension = extension
         self.input_root = input_root
         self.output_root = output_root
 
+        self.log_path = log_path
+        self.__log = Log(log_path)
+        self.log = LogCat(self.__log.queue, "TCD")
+
     def transcode(self):
         transcode_list = []
-        for artist in self.input_root.iterdir():
+        try:
-            if artist.is_dir():
+            for artist in self.input_root.iterdir():
-                for album in artist.iterdir():
+                if artist.is_dir():
-                    if album.is_dir():
+                    for album in artist.iterdir():
-                        for file in album.iterdir():
+                        if album.is_dir():
-                            if file.is_file():
+                            for file in album.iterdir():
-                                transcode_list.append(File(file))
+                                if file.is_file():
-                    else:
+                                    transcode_list.append(file)
-                        print(f"Warning, skipping non-dir '{album}' found in artist '{artist.parts[-1]}'")
+                        else:
-                        continue
+                            self.log.warning("TRK", f"Warning, skipping non-dir '{album}' found in artist '{artist.parts[-1]}'")
-            else:
+                            continue
-                print(f"Warning, skipping non-dir '{artist}' found in root")
+                else:
-                continue
+                    self.log.warning("TRK", f"Warning, skipping non-dir '{artist}' found in root")
-        self._transcode(transcode_list, self.encoder)
+                    continue
+            self._transcode(transcode_list, self.encoder)
+        finally:
+            self.__log.stop()
 
     def _transcode(self, transcode_list: list, encoder: Path, workers=16):
-        worker_args = [(track, encoder) for track in transcode_list]
+        manager = Manager()
-        with Pool(workers) as p:
+        queue = manager.Queue()
-            results = p.starmap_async(self.transcode_worker, worker_args)
+        log = Log(self.log_path, queue)
-            p.close()
+        logcat = LogCat(log.queue, "TCD")
-            p.join()
+        args = [(str(self.output_root), self.extension, track, encoder, logcat) for track in transcode_list]
-            for result in results.get():
+        with Pool(workers) as pool:
-                print(result)
+            pool.starmap(self.worker, args)
+            pool.close()
+            pool.join()
+        log.stop()
 
     def _transcode_single_thread(self, transcode_list: list, encoder: Path):
+        log = Log(self.log_path)
+        logcat = LogCat(log.queue, "TCD")
         worker_args = [(track, encoder) for track in transcode_list]
-        for args in worker_args:
+        for track, encoder in worker_args:
-            print(self.transcode_worker(*args))
+            self.worker(str(self.output_root), self.extension, track, encoder, logcat)
+        log.stop()
 
-
+    @staticmethod
-    def transcode_worker(self, track, encoder):
+    def worker(output_root, extension, track, encoder, log):
-        if track.is_art:
+        w = Worker(output_root, extension)
-            return self.copy_album_art(track)
+        w.transcode_worker(track, encoder, log)
-        elif track.is_audio:
-            return self.transcode_audio(track, encoder)
-        else:
-            return f"File {track.path} ignored"
-
-    def copy_album_art(self, file: File):
-        self.create_directories(file)
-        output_path = file.output_file(self.output_root, file.extension[1:])
-        if output_path.exists():
-            return f"Skipped {output_path}"
-        try:
-            shutil.copy(file.path, output_path)
-            return f"Successfully copied {output_path}"
-        except FileExistsError:
-            pass
-        except Exception:
-            return f"{file.path} failed to copy"
-
-    def transcode_audio(self, track, encoder):
-        enc_filename = encoder.parts[-1]
-        track_output = track.output_file(self.output_root, self.extension)
-        if track_output.exists():
-            return f"Skipped {track_output}"
-        self.create_directories(track)
-        if enc_filename == "opusenc.exe":
-            additional_args = ('--bitrate', '128', '--music')
-            subprocess_args = (str(encoder),) + additional_args + (str(track.path), str(track_output))
-        elif enc_filename == "qaac64.exe":
-            additional_args = (str(track), '-o', str(track_output), '--threading')
-            subprocess_args = (str(encoder),) + additional_args
-        try:
-            subprocess.run(subprocess_args, capture_output=True, text=True, check=True)
-            return f"Transcoded '{track}' successfully."
-        except Exception:
-            return f"ERROR: Transcoding of '{track}' failed."
-
-    def create_directories(self, track: File):
-        if not track.artist_out(self.output_root).exists():
-            try:
-                track.artist_out(self.output_root).mkdir()
-            except FileExistsError:
-                pass
-        if not track.album_out(self.output_root).exists():
-            try:
-                track.album_out(self.output_root).mkdir()
-            except FileExistsError:
-                pass

src/transcode/worker.py

@@ -0,0 +1,63 @@
+import shutil
+import subprocess
+from . import File
+from pathlib import Path
+
+class Worker:
+    def __init__(self, output_root, extension):
+        self.output_root = Path(output_root)
+        self.extension = extension
+
+    def transcode_worker(self, track, encoder, log):
+        track = File(track)
+        if track.is_art:
+            return self.copy_album_art(track, log)
+        elif track.is_audio:
+            return self.transcode_audio(track, encoder, log)
+        else:
+            log.info("WRK", f"File {track.path} ignored")
+
+    def copy_album_art(self, file: File, log):
+        self.create_directories(file)
+        output_path = file.output_file(self.output_root, file.extension[1:])
+        if output_path.exists():
+            log.info("ART", f"Skipped {output_path}")
+            return
+        try:
+            shutil.copy(file.path, output_path)
+            log.info("ART", f"Successfully copied {output_path}")
+        except FileExistsError:
+            pass
+        except Exception:
+            log.error("ART", f"{file.path} failed to copy")
+
+    def transcode_audio(self, track, encoder, log):
+        enc_filename = encoder.parts[-1]
+        track_output = track.output_file(self.output_root, self.extension)
+        if track_output.exists():
+            log.info("AUD", f"Skipped {track_output}")
+            return
+        self.create_directories(track)
+        if enc_filename == "opusenc.exe":
+            additional_args = ('--bitrate', '128', '--music')
+            subprocess_args = (str(encoder),) + additional_args + (str(track.path), str(track_output))
+        elif enc_filename == "qaac64.exe":
+            additional_args = (str(track), '-o', str(track_output), '--threading')
+            subprocess_args = (str(encoder),) + additional_args
+        try:
+            subprocess.run(subprocess_args, capture_output=True, text=True, check=True)
+            log.info("AUD", f"Transcoded '{track}' successfully.")
+        except Exception:
+            log.error("AUD", f"ERROR: Transcoding of '{track}' failed.")
+
+    def create_directories(self, track: File):
+        if not track.artist_out(self.output_root).exists():
+            try:
+                track.artist_out(self.output_root).mkdir()
+            except FileExistsError:
+                pass
+        if not track.album_out(self.output_root).exists():
+            try:
+                track.album_out(self.output_root).mkdir()
+            except FileExistsError:
+                pass