alpha 0.0.1

bin/ffx/ffx_controller.py

@@ -349,10 +349,10 @@ class FfxController():
     def runJob(self,
                 sourcePath,
                 targetPath,
-                videoEncoder : VideoEncoder = VideoEncoder.VP9,
-                quality : int = DEFAULT_QUALITY,
-                preset : int = DEFAULT_AV1_PRESET,
-                denoise : bool = False):
+                videoEncoder: VideoEncoder = VideoEncoder.VP9,
+                quality: int = DEFAULT_QUALITY,
+                preset: int = DEFAULT_AV1_PRESET,
+                denoise: bool = False):
 
 
         commandTokens = FfxController.COMMAND_TOKENS + ['-i', sourcePath]
@@ -366,9 +366,12 @@ class FfxController():
 
             if not self.__sourceMediaDescriptor is None:
                 commandSequence += self.generateMetadataTokens()
-            
+
+            if denoise:
+                commandSequence += self.generateDenoiseTokens()
+
             commandSequence += (self.generateAudioEncodingTokens()
-                                + self.generateAV1Tokens(quality, preset)
+                                + self.generateAV1Tokens(int(quality), int(preset))
                                 + self.generateAudioEncodingTokens())
 
             if self.__context['perform_crop']:
@@ -388,7 +391,7 @@ class FfxController():
 
             commandSequence1 = (commandTokens
                                     + self.__targetMediaDescriptor.getInputMappingTokens()
-                                    + self.generateVP9Pass1Tokens(quality))
+                                    + self.generateVP9Pass1Tokens(int(quality)))
 
             if self.__context['perform_crop']:
                 commandSequence1 += FfxController.generateCropTokens()
@@ -414,7 +417,7 @@ class FfxController():
             if denoise:
                 commandSequence2 += self.generateDenoiseTokens()
 
-            commandSequence2 += self.generateVP9Pass2Tokens(quality) + self.generateAudioEncodingTokens()
+            commandSequence2 += self.generateVP9Pass2Tokens(int(quality)) + self.generateAudioEncodingTokens()
 
             if self.__context['perform_crop']:
                 commandSequence2 += FfxController.generateCropTokens()

bin/ffx/file_properties.py

@@ -186,12 +186,12 @@ class FileProperties():
         return int(self.__episode)
 
 
-    def assembleTargetFilename(self,
+    def assembleTargetFileBasename(self,
                                 label: str = "",
                                 quality: int = -1,
                                 fileIndex: int = -1,
                                 indexDigits: int = DEFAULT_INDEX_DIGITS,
-                                extension: str = None):
+                                extraTokens: list = []):
 
         if 'show_descriptor' in self.context.keys():
             season_digits = self.context['show_descriptor'][ShowDescriptor.INDICATOR_SEASON_DIGITS_KEY]
@@ -202,7 +202,7 @@ class FileProperties():
 
         targetFilenameTokens = []
 
-        targetFilenameExtension = FfxController.DEFAULT_FILE_EXTENSION if extension is None else str(extension)
+        # targetFilenameExtension = FfxController.DEFAULT_FILE_EXTENSION if extension is None else str(extension)
 
         if not label:
             targetFilenameTokens = [self.__sourceFileBasename]
@@ -220,8 +220,9 @@ class FileProperties():
             targetFilenameTokens += [f"q{quality}"]
 
         # In case source and target filenames are the same add an extension to distinct output from input
-        if not label and self.__sourceFilenameExtension == targetFilenameExtension:
-            targetFilenameTokens += ['ffx']
+        #if not label and self.__sourceFilenameExtension == targetFilenameExtension:
+        #    targetFilenameTokens += ['ffx']
+        targetFilenameTokens += extraTokens
 
         targetFilename = '_'.join(targetFilenameTokens)
 

bin/ffx/tmdb_controller.py

@@ -37,8 +37,11 @@ class TmdbController():
         
         tmdbUrl = f"https://api.themoviedb.org/3/tv/{showId}/season/{season}/episode/{episode}{urlParams}"
 
-        return requests.get(tmdbUrl).json()
-
+        #TODO Check for result
+        try:
+            return requests.get(tmdbUrl).json()
+        except:
+            return {}
 
     def getEpisodeFileBasename(self,
                             showName,