Version 2.6.3 (#72)

* Fixing #71 #26 encoding issues in video files (thanks to -L0Lock-)
* Fixing tempfile issue with recursion on cleanup
* Fixing SVT AV1 command building raising errors on bad crop

CHANGES

@@ -1,6 +1,13 @@
 Changelog
 ---------
 
+Version 2.6.3
+~~~~~~~~~~~~~
+
+* Fixing #71 #26 encoding issues in video files (thanks to -L0Lock-)
+* Fixing tempfile issue with recursion on cleanup
+* Fixing SVT AV1 command building raising errors on bad crop
+
 Version 2.6.2
 ~~~~~~~~~~~~~
 

fastflix/gui.py

@@ -78,7 +78,9 @@ def main():
                 if file.is_file() and file.name.lower() in ("ffprobe", "ffprobe.exe"):
                     ffprobe = file
 
-    logger.addHandler(logging.FileHandler(log_dir / f"flix_{datetime.now().isoformat().replace(':', '.')}"))
+    logger.addHandler(
+        logging.FileHandler(log_dir / f"flix_{datetime.now().isoformat().replace(':', '.')}", encoding="utf-8")
+    )
 
     config_file = Path(data_path, "fastflix.json")
     if not config_file.exists():

fastflix/plugins/svt_av1/command_builder.py

@@ -62,12 +62,14 @@ def build(
                 assert crop_check[0] % 8 == 0
                 assert crop_check[1] % 8 == 0
             except AssertionError:
-                raise FlixError("CROP BAD: Video height and main_width must be divisible by 8")
+                logger.error("CROP BAD: Video height and main_width must be divisible by 8")
+                return []
         else:
             crop_height = height % 8
             crop_width = width % 8
             if crop_height or crop_width:
-                raise FlixError("CROP BAD: Video height and main_width must be divisible by 8")
+                logger.error("CROP BAD: Video height and main_width must be divisible by 8")
+                return []
 
     assert height <= 2160
     assert width <= 4096

fastflix/version.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-__version__ = "2.6.2"
+__version__ = "2.6.3"
 __author__ = "Chris Griffith"

fastflix/widgets/command_runner.py

@@ -8,6 +8,7 @@
 from subprocess import Popen, PIPE, STDOUT
 import os
 import signal
+import secrets
 
 import reusables
 
@@ -23,7 +24,8 @@
 class CommandRunner(QtCore.QThread):
     def __init__(self, parent, command_list, work_dir):
         super().__init__(parent)
-        self.tempdir = tempfile.TemporaryDirectory(prefix="temp_", dir=work_dir)
+        self.tempdir = str(Path(work_dir) / f"temp_{secrets.token_hex(12)}")
+        os.makedirs(self.tempdir, exist_ok=True)
         self.app = parent
         self.command_list = command_list
         self.process = None
@@ -37,21 +39,21 @@ def replace_temps(self, command):
         file_numbers = set(self.re_tempfile.findall(command))
         for num, ext in file_numbers:
             if num not in self.temp_files:
-                self.temp_files[num] = Path(self.tempdir.name, f"{uuid4().hex}.{ext}")
+                self.temp_files[num] = Path(self.tempdir, f"{uuid4().hex}.{ext}")
             command = command.replace(f"<tempfile.{num}.{ext}>", str(self.temp_files[num]))
         for num in set(self.re_tempdir.findall(command)):
             if num not in self.temp_dirs:
-                self.temp_dirs[num] = Path(tempfile.mkdtemp(prefix=f"{num}_", dir=self.tempdir.name))
+                self.temp_dirs[num] = Path(tempfile.mkdtemp(prefix=f"{num}_", dir=self.tempdir))
             command = command.replace(f"<tempdir.{num}>", str(self.temp_dirs[num]))
         return command
 
     def loop_creates(self, dirs, files):
         for num, ext in files:
             if num not in self.temp_files:
-                self.temp_files[num] = Path(self.tempdir.name, f"{uuid4().hex}.{ext}")
+                self.temp_files[num] = Path(self.tempdir, f"{uuid4().hex}.{ext}")
         for num in dirs:
             if num not in self.temp_dirs:
-                self.temp_dirs[num] = Path(tempfile.mkdtemp(prefix=f"{num}_", dir=self.tempdir.name))
+                self.temp_dirs[num] = Path(tempfile.mkdtemp(prefix=f"{num}_", dir=self.tempdir))
 
     @staticmethod
     def replace_loop_args(command, index, items):
@@ -116,7 +118,6 @@ def run(self):
         try:
             for command in self.command_list:
                 if self.killed:
-                    self.tempdir.cleanup()
                     return
                 if command.ensure_paths:
                     for path in command.ensure_paths:
@@ -135,25 +136,14 @@ def run(self):
                                 return self.app.completed.emit(str(code))
         except Exception as err:
             logger.exception(f"Could not run commands - {err}")
-            self.tempdir.cleanup()
             if not self.killed:
                 self.app.completed.emit(1)
         else:
-            self.tempdir.cleanup()
             if not self.killed:
                 self.app.completed.emit(0)
 
     def start_exec(self, command):
-        return Popen(
-            command,
-            shell=True,
-            cwd=self.tempdir.name,
-            stdin=PIPE,
-            stdout=PIPE,
-            stderr=STDOUT,
-            universal_newlines=True,
-            preexec_fn=os.setsid if not reusables.win_based else None,
-        )
+        return Popen(command, shell=True, cwd=self.tempdir, stdout=PIPE, stderr=STDOUT, encoding="utf-8")
 
     def is_alive(self):
         if not self.process:
@@ -164,13 +154,8 @@ def kill(self):
         logger.info(f"Killing worker process {self.process.pid}")
         if self.process:
             try:
-                if reusables.win_based:
-                    os.kill(self.process.pid, signal.CTRL_C_EVENT)
-                else:
-                    os.killpg(os.getpgid(self.process.pid), signal.SIGTERM)
                 self.process.terminate()
             except Exception as err:
                 logger.exception(f"Couldn't terminate process: {err}")
         self.killed = True
         self.app.cancelled.emit()
-        self.exit()

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastflix"
-version = "2.6.2"
+version = "2.6.3"
 description = "Easy to use video encoder GUI wrapper"
 authors = ["Chris Griffith <[email protected]>"]
 license = "MIT"