Fix niceness / executeCommand logger

bin/ffx.py

@@ -28,7 +28,7 @@ from ffx.constants import DEFAULT_QUALITY, DEFAULT_AV1_PRESET
 from ffx.constants import DEFAULT_STEREO_BANDWIDTH, DEFAULT_AC3_BANDWIDTH, DEFAULT_DTS_BANDWIDTH, DEFAULT_7_1_BANDWIDTH
 
 
-VERSION='0.2.1'
+VERSION='0.2.2'
 
 # 0.1.1
 # Bugfixes, TMBD identify shows
@@ -40,6 +40,8 @@ VERSION='0.2.1'
 # Tests, Config-File
 # 0.2.1
 # Signature, Tags cleaning, Bugfixes, Refactoring
+# 0.2.2
+# CLI-Overrides
 
 
 @click.group()
@@ -166,6 +168,10 @@ def unmux(ctx,
     existingSourcePaths = [p for p in paths if os.path.isfile(p)]
     ctx.obj['logger'].debug(f"\nUnmuxing {len(existingSourcePaths)} files")
 
+    ctx.obj['resource_limits'] = {}
+    ctx.obj['resource_limits']['niceness'] = nice
+    ctx.obj['resource_limits']['cpu_percent'] = cpu
+
     for sourcePath in existingSourcePaths:
 
         fp = FileProperties(ctx.obj, sourcePath)
@@ -198,8 +204,8 @@ def unmux(ctx,
                     
                     if unmuxSequence:
                         if not ctx.obj['dry_run']:
-                            ctx.obj['logger'].debug(f"Executing unmuxing sequence: {' '.join(unmuxSequence)}")
-                            out, err, rc = executeProcess(unmuxSequence, niceness=nice, cpu_percent=cpu)
+                            ctx.obj['logger'].debug(f"Executing unmuxing sequence")
+                            out, err, rc = executeProcess(unmuxSequence, context = ctx.obj)
                             if rc:
                                 ctx.obj['logger'].error(f"Unmuxing of stream {trackDescriptor.getIndex()} failed with error ({rc}) {err}")        
                     else:

bin/ffx/ffx_controller.py

@@ -269,10 +269,10 @@ class FfxController():
             commandSequence += self.generateOutputTokens(targetPath,
                                                         targetFormat)
 
-            self.__logger.debug(f"FfxController.runJob() commandSequence:{' '.join(commandSequence)}")
+            self.__logger.debug(f"FfxController.runJob(): Running command sequence")
 
             if not self.__context['dry_run']:
-                executeProcess(commandSequence, niceness=self.__niceness, cpu_percent=self.__cpuPercent)
+                executeProcess(commandSequence, context = self.__context)
 
 
         if videoEncoder == VideoEncoder.VP9:
@@ -294,13 +294,13 @@ class FfxController():
 
             commandSequence1 += FfxController.NULL_TOKENS
 
-            self.__logger.debug(f"FfxController.runJob() commandSequence1:{' '.join(commandSequence1)}")
-
             if os.path.exists(FfxController.TEMP_FILE_NAME):
                 os.remove(FfxController.TEMP_FILE_NAME)
 
+            self.__logger.debug(f"FfxController.runJob(): Running command sequence 1")
+
             if not self.__context['dry_run']:
-                executeProcess(commandSequence1, niceness=self.__niceness, cpu_percent=self.__cpuPercent)
+                executeProcess(commandSequence1, context = self.__context)
 
             commandSequence2 = (commandTokens
                                 + self.__targetMediaDescriptor.getImportFileTokens()
@@ -319,10 +319,10 @@ class FfxController():
             commandSequence2 += self.generateOutputTokens(targetPath,
                                                             targetFormat)
 
-            self.__logger.debug(f"FfxController.runJob() commandSequence2:{' '.join(commandSequence2)}")
+            self.__logger.debug(f"FfxController.runJob(): Running command sequence 2")
 
             if not self.__context['dry_run']:            
-                out, err, rc = executeProcess(commandSequence2, niceness=self.__niceness, cpu_percent=self.__cpuPercent)
+                out, err, rc = executeProcess(commandSequence2, context = self.__context)
                 if rc:
                     raise click.ClickException(f"Command resulted in error: rc={rc} error={err}")
 
@@ -349,4 +349,4 @@ class FfxController():
                             str(length),
                             path]
 
-        out, err, rc = executeProcess(commandTokens, niceness=self.__niceness, cpu_percent=self.__cpuPercent)
+        out, err, rc = executeProcess(commandTokens, context = self.__context)

bin/ffx/file_properties.py

@@ -101,7 +101,8 @@ class FileProperties():
                                                         "-hide_banner",
                                                         "-show_format",
                                                         "-of", "json",
-                                                        self.__sourcePath])
+                                                        self.__sourcePath],
+                                                        context = self.context)
 
         if 'Invalid data found when processing input' in ffprobeError:
             raise Exception(f"File {self.__sourcePath} does not contain valid stream data")
@@ -160,7 +161,8 @@ class FileProperties():
                                                         "-hide_banner",
                                                         "-show_streams",
                                                         "-of", "json",
-                                                        self.__sourcePath])
+                                                        self.__sourcePath],
+                                                        context = self.context)
 
         if 'Invalid data found when processing input' in ffprobeError:
             raise Exception(f"File {self.__sourcePath} does not contain valid stream data")

bin/ffx/process.py

@@ -1,27 +1,30 @@
-import subprocess, click
+import subprocess, logging
 from typing import List
 
-def executeProcess(commandSequence: List[str], directory: str = None, niceness: int = 99, cpu_percent: int = 0):
+def executeProcess(commandSequence: List[str], directory: str = None, context: dict = None):
     """
     niceness -20 bis +19
     cpu_percent: 1 bis 99
     """
 
-    nice = int(niceness)
-    cpu = int(cpu_percent)
-
-    click.echo(f"nice {nice} cpu {cpu}")
+    logger = (context['logger'] if not context is None
+                else logging.getLogger('FFX').addHandler(logging.NullHandler()))
 
     niceSequence = []
 
-    if nice >= -20 and nice <= 19:
-        niceSequence += ['nice', '-n', str(nice)]
-    if cpu >= 1 and cpu <= 99:
-        niceSequence += ['cpulimit', '-l', str(cpu), '--']
+    niceness = (int(context['resource_limits']['niceness'])
+                        if 'resource_limits' in context.keys() and 'niceness' in context['resource_limits'].keys() else 99)
+    cpu_percent = (int(context['resource_limits']['cpu_percent'])
+                        if 'resource_limits' in context.keys() and 'cpu_percent' in context['resource_limits'].keys() else 0)
+
+    if niceness >= -20 and niceness <= 19:
+        niceSequence += ['nice', '-n', str(niceness)]
+    if cpu_percent >= 1:
+        niceSequence += ['cpulimit', '-l', str(cpu_percent), '--']
 
     niceCommand = niceSequence + commandSequence
 
-    click.echo(f"executeProcess(): {' '.join(niceCommand)}")
+    logger.debug(f"executeProcess() command sequence: {' '.join(niceCommand)}")
 
     process = subprocess.Popen(niceCommand, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding='utf-8', cwd = directory)
     output, error = process.communicate()

bin/ffx/test/helper.py

@@ -255,10 +255,9 @@ def createMediaTestFile(mediaDescriptor: MediaDescriptor,
     commandTokens += [outputPath]
 
 
-    if not logger is None:
-        logger.debug(f"createMediaTestFile(): Command sequence: {commandTokens}")
+    ctx = {'logger': logger}
 
-    out, err, rc = executeProcess(commandTokens)
+    out, err, rc = executeProcess(commandTokens, context = ctx)
 
     if not logger is None:
         if out:

bin/ffx/test/scenario_1.py

@@ -109,16 +109,10 @@ class Scenario1(Scenario):
             commandSequence += ['--label', variantFilenameLabel]
 
 
-        # if not testContext['use_jellyfin']:
-        #     commandSequence += ['--no-jellyfin']
-
         commandSequence += ['--no-pattern']
         commandSequence += ['--no-tmdb']
 
-
-        self._logger.debug(f"{variantLabel}: Test sequence: {commandSequence}")
-
-        out, err, rc = executeProcess(commandSequence, directory = self._testDirectory, niceness=self._niceness, cpu_percent=self._cpuPercent)
+        out, err, rc = executeProcess(commandSequence, directory = self._testDirectory, context = self._context)
 
         if out and self._context['verbosity'] >= 9:
             self._logger.debug(f"{variantLabel}: Process output: {out}")

bin/ffx/test/scenario_2.py

@@ -97,13 +97,7 @@ class Scenario2(Scenario):
                             '--no-prompt',
                             '--no-signature']
 
-        # if not testContext['use_jellyfin']:
-        #     commandSequence += ['--no-jellyfin']
-
-
-        self._logger.debug(f"{variantLabel}: Test sequence: {commandSequence}")
-
-        out, err, rc = executeProcess(commandSequence, directory = self._testDirectory, niceness=self._niceness, cpu_percent=self._cpuPercent)
+        out, err, rc = executeProcess(commandSequence, directory = self._testDirectory, context = self._context)
 
         if out and self._context['verbosity'] >= 9:
             self._logger.debug(f"{variantLabel}: Process output: {out}")

bin/ffx/test/scenario_4.py

@@ -182,12 +182,7 @@ class Scenario4(Scenario):
 
         commandSequence += ['--no-prompt', '--no-signature']
 
-        # if not testContext['use_jellyfin']:
-        #     commandSequence += ['--no-jellyfin']
-
-        self._logger.debug(f"{variantLabel}: Test sequence: {commandSequence}")
-
-        out, err, rc = executeProcess(commandSequence, directory = self._testDirectory, niceness=self._niceness, cpu_percent=self._cpuPercent)
+        out, err, rc = executeProcess(commandSequence, directory = self._testDirectory, context = self._context)
 
         if out and self._context['verbosity'] >= 9:
             self._logger.debug(f"{variantLabel}: Process output: {out}")