Possible fix for failed thumbnail embedding, #626

axcore · Oct 21, 2024 · ff76b75 · ff76b75
1 parent 118eb44
commit ff76b75
Show file tree

Hide file tree

Showing 12 changed files with 224 additions and 145 deletions.
diff --git a/README.rst b/README.rst
@@ -46,7 +46,7 @@ Problems can be reported at `our GitHub page <https://github.com/axcore/tartube/
 
 Stable release: **v2.5.040 (31 Aug 2024)**
 
-Development release: **v2.5.040 (31 Aug 2024)**
+Development release: **v2.5.047 (21 Oct 2024)**
 
 Official packages (also available from the `Github release page <https://github.com/axcore/tartube/releases>`__):
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.040
+2.5.047
diff --git a/nsis/tartube_install_64bit.nsi b/nsis/tartube_install_64bit.nsi
@@ -1,4 +1,4 @@
-# Tartube v2.5.040 installer script for MS Windows
+# Tartube v2.5.047 installer script for MS Windows
 #
 # Copyright (C) 2019-2024 A S Lewis
 #
@@ -294,7 +294,7 @@
 
     ;Name and file
     Name "Tartube"
-    OutFile "install-tartube-2.5.040-64bit.exe"
+    OutFile "install-tartube-2.5.047-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.5.040"
+#        "DisplayVersion" "2.5.047"
 
     # Create uninstaller
     WriteUninstaller "$INSTDIR\Uninstall.exe"

diff --git a/pack/bin/no_download/tartube b/pack/bin/no_download/tartube
@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.5.040'
-__date__ = '31 Aug 2024'
+__version__ = '2.5.047'
+__date__ = '21 Oct 2024'
 __copyright__ = 'Copyright \xa9 2019-2024 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2024 A S Lewis.

diff --git a/pack/bin/pkg/tartube b/pack/bin/pkg/tartube
@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.5.040'
-__date__ = '31 Aug 2024'
+__version__ = '2.5.047'
+__date__ = '21 Oct 2024'
 __copyright__ = 'Copyright \xa9 2019-2024 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2024 A S Lewis.

diff --git a/pack/bin/strict/tartube b/pack/bin/strict/tartube
@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.5.040'
-__date__ = '31 Aug 2024'
+__version__ = '2.5.047'
+__date__ = '21 Oct 2024'
 __copyright__ = 'Copyright \xa9 2019-2024 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2024 A S Lewis.

diff --git a/pack/tartube.1 b/pack/tartube.1
@@ -1,4 +1,4 @@
-.TH man 1 "31 Aug 2024" "2.5.040" "tartube man page"
+.TH man 1 "21 Oct 2024" "2.5.047" "tartube man page"
 .SH NAME
 tartube \- GUI front-end for youtube-dl and yt-dlp
 .SH SYNOPSIS

diff --git a/setup.py b/setup.py
@@ -164,7 +164,7 @@
 # Setup
 setuptools.setup(
     name = 'tartube',
-    version = '2.5.040',
+    version = '2.5.047',
     description = 'GUI front-end for youtube-dl and yt-dlp',
     long_description = long_description,
     long_description_content_type = 'text/plain',

diff --git a/tartube/config.py b/tartube/config.py
@@ -27247,8 +27247,6 @@ def setup_options_dl_list_tab(self, inner_notebook):
         )
         label.set_hexpand(True)
 
-        # !!! DEBUG: Clicking the button creates a positional argument error
-        # !!!       for no obvious reason
         button8 = Gtk.Button()
         grid2.attach(button8, 6, 0, 1, 1)
         button8.set_label(_('Refresh list'))
@@ -27258,7 +27256,7 @@ def setup_options_dl_list_tab(self, inner_notebook):
         )
 
 
-    def setup_options_dl_list_tab_update_treeview(self):
+    def setup_options_dl_list_tab_update_treeview(self, button=None):
 
         """Can be called by anything.
 

diff --git a/tartube/ffmpeg_tartube.py b/tartube/ffmpeg_tartube.py
@@ -72,7 +72,7 @@ def __init__(self, app_obj):
     # Public class methods
 
 
-    def convert_webp(self, thumbnail_filename):
+    def convert_webp(self, thumbnail_filename, retain_flag=False):
 
         """Called by mainapp.TartubeApp.update_video_when_file_found(),
         downloads.VideoDownloader.confirm_sim_video() and
@@ -96,6 +96,12 @@ def convert_webp(self, thumbnail_filename):
             thumbnail_filename (str): Full path to the webp file to be
                 converted to jpg
 
+        Optional args:
+
+            retain_flag (bool): True if the original 'thumbnail_filename' file
+                should be retained after the conversion, regardless of the
+                value of mainapp.TartubeApp settings
+
         Return values:
 
             False if an attempted conversion fails, or True otherwise
@@ -112,8 +118,6 @@ def convert_webp(self, thumbnail_filename):
         if self.app_obj.ffmpeg_convert_webp_flag \
         and self.app_obj.ffmpeg_retain_webp_flag:
             retain_flag = True
-        else:
-            retain_flag = False
 
         # Correct extension for .webp files with the wrong extension
         #   (youtube-dl #25687, #25717)