Fix python error when downloading clips using FFmpeg

README.rst

@@ -68,7 +68,7 @@ For a full list of new features and fixes, see `recent changes <CHANGES>`__.
 
 Stable release: **v2.4.260 (2 Mar 2023)**
 
-Development release: **v2.4.269 (12 Mar 2023)**
+Development release: **v2.4.273 (15 Mar 2023)**
 
 Official packages (also available from the `Github release page <https://github.com/axcore/tartube/releases>`__):
 

VERSION

@@ -1 +1 @@
-2.4.269
+2.4.273

nsis/tartube_install_64bit.nsi

@@ -1,4 +1,4 @@
-# Tartube v2.4.269 installer script for MS Windows
+# Tartube v2.4.273 installer script for MS Windows
 #
 # Copyright (C) 2019-2023 A S Lewis
 #
@@ -294,7 +294,7 @@
 
     ;Name and file
     Name "Tartube"
-    OutFile "install-tartube-2.4.269-64bit.exe"
+    OutFile "install-tartube-2.4.273-64bit.exe"
 
     ;Default installation folder
     InstallDir "$LOCALAPPDATA\Tartube"
@@ -397,7 +397,7 @@ Section "Tartube" SecClient
 #        "Publisher" "A S Lewis"
 #    WriteRegStr HKLM \
 #        "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \
-#        "DisplayVersion" "2.4.269"
+#        "DisplayVersion" "2.4.273"
 
     # Create uninstaller
     WriteUninstaller "$INSTDIR\Uninstall.exe"

pack/bin/no_download/tartube

@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.4.269'
-__date__ = '12 Mar 2023'
+__version__ = '2.4.273'
+__date__ = '15 Mar 2023'
 __copyright__ = 'Copyright \xa9 2019-2023 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2023 A S Lewis.

pack/bin/pkg/tartube

@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.4.269'
-__date__ = '12 Mar 2023'
+__version__ = '2.4.273'
+__date__ = '15 Mar 2023'
 __copyright__ = 'Copyright \xa9 2019-2023 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2023 A S Lewis.

pack/bin/strict/tartube

@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.4.269'
-__date__ = '12 Mar 2023'
+__version__ = '2.4.273'
+__date__ = '15 Mar 2023'
 __copyright__ = 'Copyright \xa9 2019-2023 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2023 A S Lewis.

pack/tartube.1

@@ -1,4 +1,4 @@
-.TH man 1 "12 Mar 2023" "2.4.269" "tartube man page"
+.TH man 1 "15 Mar 2023" "2.4.273" "tartube man page"
 .SH NAME
 tartube \- GUI front-end for youtube-dl and yt-dlp
 .SH SYNOPSIS

setup.py

@@ -186,7 +186,7 @@
 # Setup
 setuptools.setup(
     name = 'tartube',
-    version = '2.4.269',
+    version = '2.4.273',
     description = 'GUI front-end for youtube-dl, yt-dlp and other compatible' \
     + ' video downloaders',
     long_description = long_description,

tartube/downloads.py

@@ -3436,7 +3436,7 @@ def do_download(self):
         # ...and the downloader log (if required)
         if app_obj.ytdl_log_system_cmd_flag:
             app_obj.write_downloader_log(' '.join(cmd_list))
-
+            
         # Create a new child process using that command...
         self.create_child_process(cmd_list)
         # ...and set up the PipeReader objects to read from the child process
@@ -4791,7 +4791,7 @@ def confirm_sim_video(self, json_dict):
             app_obj.write_downloader_log(
                 '[' + video_obj.parent_obj.name + '] <' \
                 + _('Simulated download of:') + ' \'' + filename + '\'>',
-            )
+            )            
 
         # If a new media.Video object was created (or if a video whose name is
         #   unknown, now has a name), register the simulated download with
@@ -6075,7 +6075,7 @@ def read_child_process(self):
 
             # Write output to the downloader log (if required)
             if app_obj.ytdl_log_stderr_flag:
-                app_obj.write_downloader_log(data)
+                app_obj.write_downloader_log(data)            
 
         # Either (or both) of STDOUT and STDERR were non-empty
         self.queue.task_done()
@@ -6778,7 +6778,7 @@ def do_download_clips(self):
             # ...and the downloader log (if required)
             if app_obj.ytdl_log_system_cmd_flag:
                 app_obj.write_downloader_log(' '.join(cmd_list))
-
+            
             # Write an additional message in the Output tab, in the same style
             #   as those produced by youtube-dl/FFmpeg (and therefore not
             #   translated)
@@ -7041,7 +7041,7 @@ def do_download_remove_slices(self):
             # ...and the downloader log (if required)
             if app_obj.ytdl_log_system_cmd_flag:
                 app_obj.write_downloader_log(' '.join(cmd_list))
-
+            
             # Write an additional message in the Output tab, in the same style
             #   as those produced by youtube-dl/FFmpeg (and therefore not
             #   translated)
@@ -7210,7 +7210,7 @@ def do_download_remove_slices(self):
                 # ...and the downloader log (if required)
                 if app_obj.ytdl_log_system_cmd_flag:
                     app_obj.write_downloader_log(' '.join(cmd_list))
-
+                    
                 # Create a new child process using that command...
                 self.create_child_process(cmd_list)
                 # ...and set up the PipeReader objects to read from the child
@@ -8036,7 +8036,7 @@ def read_child_process(self):
             # Write output to the downloader log (if required)
             if app_obj.ytdl_log_stderr_flag:
                 app_obj.write_downloader_log(data)
-
+                
         # Either (or both) of STDOUT and STDERR were non-empty
         self.queue.task_done()
         return True
@@ -9293,7 +9293,7 @@ def show_cmd(self, cmd):
         # Display the message in the downloader log, if allowed
         if app_obj.ytdl_log_system_cmd_flag:
             app_obj.write_downloader_log(cmd)
-
+            
 
     def show_msg(self, msg):
 
@@ -9331,7 +9331,7 @@ def show_msg(self, msg):
         # Write the message to the downloader log, if allowed
         if app_obj.ytdl_log_stdout_flag:
             app_obj.write_downloader_log(msg)
-
+            
 
     def show_error(self, msg):
 
@@ -9370,7 +9370,7 @@ def show_error(self, msg):
         # Write the message to the downloader log (if required)
         if app_obj.ytdl_log_stderr_flag:
             app_obj.write_downloader_log(msg)
-
+               
 
     def stop(self):
 

tartube/mainapp.py

@@ -4190,14 +4190,14 @@ def write_downloader_log(self, msg):
         Args:
 
             msg (str): The text to write
-
+            
         """
 
         path = os.path.abspath(os.path.join(self.data_dir, self.ytdl_log_name))
         with open(path, 'a') as outfile:
             outfile.write(msg + '\n')
 
-
+    
     # (Config/database files load/save)
 
 
@@ -4482,7 +4482,7 @@ def load_config(self):
             self.drag_error_source_flag = json_dict['drag_error_source_flag']
             self.drag_error_name_flag = json_dict['drag_error_name_flag']
             self.drag_error_msg_flag = json_dict['drag_error_msg_flag']
-
+            
         if version >= 1003024 and 'show_status_icon_flag' in json_dict:
             self.show_status_icon_flag = json_dict['show_status_icon_flag']
         if version >= 2003504 and 'open_in_tray_flag' in json_dict:
@@ -4643,7 +4643,7 @@ def load_config(self):
             self.ytdl_log_ignore_progress_flag \
             = json_dict['ytdl_log_ignore_progress_flag']
             self.ytdl_log_stderr_flag = json_dict['ytdl_log_stderr_flag']
-
+            
         self.ytdl_write_verbose_flag = json_dict['ytdl_write_verbose_flag']
         # Removed v2.3.565
 #       if version >= 2002179:
@@ -5695,7 +5695,7 @@ def save_config(self):
             'drag_video_name_flag': self.drag_video_name_flag,
             'drag_video_msg_flag': self.drag_video_msg_flag,
             'drag_thumb_path_flag': self.drag_thumb_path_flag,
-
+            
             'drag_error_separator_flag': self.drag_error_separator_flag,
             'drag_error_path_flag': self.drag_error_path_flag,
             'drag_error_source_flag': self.drag_error_source_flag,
@@ -5788,7 +5788,7 @@ def save_config(self):
             'ytdl_write_ignore_progress_flag': \
             self.ytdl_write_ignore_progress_flag,
             'ytdl_write_stderr_flag': self.ytdl_write_stderr_flag,
-
+            
             'ytdl_log_system_cmd_flag': self.ytdl_log_system_cmd_flag,
             'ytdl_log_stdout_flag': self.ytdl_log_stdout_flag,
             'ytdl_log_ignore_json_flag': self.ytdl_log_ignore_json_flag,
@@ -26388,23 +26388,23 @@ def set_drag_error_msg_flag(self, flag):
         else:
             self.drag_error_msg_flag = True
 
-
+            
     def set_drag_error_name_flag(self, flag):
 
         if not flag:
             self.drag_error_name_flag = False
         else:
             self.drag_error_name_flag = True
 
-
+            
     def set_drag_error_path_flag(self, flag):
 
         if not flag:
             self.drag_error_path_flag = False
         else:
             self.drag_error_path_flag = True
 
-
+            
     def set_drag_error_separator_flag(self, flag):
 
         if not flag:
@@ -26419,8 +26419,8 @@ def set_drag_error_source_flag(self, flag):
             self.drag_error_source_flag = False
         else:
             self.drag_error_source_flag = True
-
-
+            
+            
     def set_drag_thumb_path_flag(self, flag):
 
         if not flag:
@@ -26436,7 +26436,7 @@ def set_drag_video_msg_flag(self, flag):
         else:
             self.drag_video_msg_flag = True
 
-
+            
     def set_drag_video_name_flag(self, flag):
 
         if not flag:
@@ -26460,7 +26460,7 @@ def set_drag_video_separator_flag(self, flag):
         else:
             self.drag_video_separator_flag = True
 
-
+            
     def set_drag_video_source_flag(self, flag):
 
         if not flag:
@@ -27669,39 +27669,39 @@ def set_ytdl_fork_no_dependency_flag(self, flag):
             self.ytdl_fork_no_dependency_flag = True
 
 
-    def set_ytdl_log_ignore_json_flag(self, flag):
+    def set_ytdl_log_ignore_json_flag(self, flag): 
 
         if not flag:
             self.ytdl_log_ignore_json_flag = False
         else:
             self.ytdl_log_ignore_json_flag = True
 
 
-    def set_ytdl_log_ignore_progress_flag(self, flag):
+    def set_ytdl_log_ignore_progress_flag(self, flag): 
 
         if not flag:
             self.ytdl_log_ignore_progress_flag = False
         else:
             self.ytdl_log_ignore_progress_flag = True
 
 
-    def set_ytdl_log_stderr_flag(self, flag):
+    def set_ytdl_log_stderr_flag(self, flag): 
 
         if not flag:
             self.ytdl_log_stderr_flag = False
         else:
             self.ytdl_log_stderr_flag = True
 
 
-    def set_ytdl_log_stdout_flag(self, flag):
+    def set_ytdl_log_stdout_flag(self, flag): 
 
         if not flag:
             self.ytdl_log_stdout_flag = False
         else:
             self.ytdl_log_stdout_flag = True
 
 
-    def set_ytdl_log_system_cmd_flag(self, flag):
+    def set_ytdl_log_system_cmd_flag(self, flag): 
 
         if not flag:
             self.ytdl_log_system_cmd_flag = False