Add re-check video #661, YouTube warning #662, matplotlib failure check #663

Author: A S Lewis

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.047 (21 Oct 2024)**
+Development release: **v2.5.053 (28 Oct 2024)**
 
 Official packages (also available from the `Github release page <https://github.com/axcore/tartube/releases>`__):
 

VERSION

@@ -1 +1 @@
-2.5.047
+2.5.053

nsis/tartube_install_64bit.nsi

@@ -1,4 +1,4 @@
-# Tartube v2.5.047 installer script for MS Windows
+# Tartube v2.5.053 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.047-64bit.exe"
+    OutFile "install-tartube-2.5.053-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.047"
+#        "DisplayVersion" "2.5.053"
 
     # Create uninstaller
     WriteUninstaller "$INSTDIR\Uninstall.exe"

pack/bin/no_download/tartube

@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.5.047'
-__date__ = '21 Oct 2024'
+__version__ = '2.5.053'
+__date__ = '28 Oct 2024'
 __copyright__ = 'Copyright \xa9 2019-2024 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2024 A S Lewis.

pack/bin/pkg/tartube

@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.5.047'
-__date__ = '21 Oct 2024'
+__version__ = '2.5.053'
+__date__ = '28 Oct 2024'
 __copyright__ = 'Copyright \xa9 2019-2024 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2024 A S Lewis.

pack/bin/strict/tartube

@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.5.047'
-__date__ = '21 Oct 2024'
+__version__ = '2.5.053'
+__date__ = '28 Oct 2024'
 __copyright__ = 'Copyright \xa9 2019-2024 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2024 A S Lewis.

pack/tartube.1

@@ -1,4 +1,4 @@
-.TH man 1 "21 Oct 2024" "2.5.047" "tartube man page"
+.TH man 1 "28 Oct 2024" "2.5.053" "tartube man page"
 .SH NAME
 tartube \- GUI front-end for youtube-dl and yt-dlp
 .SH SYNOPSIS

setup.py

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

tartube/config.py

@@ -52,10 +52,14 @@
 
 
 # Import matplotlib stuff
+# try..except works around matplotlib problems described in Git #592, #66
 if mainapp.HAVE_MATPLOTLIB_FLAG:
-    from matplotlib.backends.backend_gtk3agg import FigureCanvasGTK3Agg
-    from matplotlib.figure import Figure
-    from matplotlib.ticker import MaxNLocator
+    try:
+        from matplotlib.backends.backend_gtk3agg import FigureCanvasGTK3Agg
+        from matplotlib.figure import Figure
+        from matplotlib.ticker import MaxNLocator
+    except:
+        mainapp.HAVE_MATPLOTLIB_FLAG = False
 
 # Classes
 
@@ -684,6 +688,83 @@ def add_combos_for_graphs(self, grid, row):
         return combo, combo2, combo3, combo4, combo5
 
 
+    def add_youtube_warning(self, grid, x, y, wid, hei):
+
+        """Can be called by any config window tab, especially those that
+        provide a way to pass user credentials to the website (such as
+        --username/--password, imported browser cookies, .netrc files etc).
+
+        As of October 2024, some methods will not work, and some may even
+        cause the deletion of a YouTube account. The user should consult the
+        latest yt-dlp warnings about this issue, before downloading restricted
+        videos:
+
+        https://github.com/yt-dlp/yt-dlp/issues/3766
+                Return values:
+
+        Args:
+
+            grid (Gtk.Grid): The grid on which widgets are arranged in their
+                tab
+
+            x, y, wid, hei (int): Position on the grid at which the warning is
+                placed
+
+        Return values:
+
+            The new Gtk.Grid on which the warning is placed
+
+        """
+
+        # (To avoid messing up the neat format of the rows above, add a
+        #   secondary grid, and put the next set of widgets inside it)
+        grid2 = self.add_secondary_grid(grid, x, y, wid, hei)
+
+        frame = self.add_pixbuf(grid2,
+            'attention_large',
+            0, 0, 1, 1,
+        )
+        frame.set_hexpand(False)
+        frame.set_border_width(self.spacing_size)
+        frame.set_size_request(75, -1)
+
+        frame2 = Gtk.Frame()
+        grid2.attach(frame2, 1, 0, 1, 1)
+
+        grid3 = Gtk.Grid()
+        frame2.add(grid3)
+        grid3.set_border_width(self.spacing_size * 2)
+        grid3.set_column_spacing(self.spacing_size * 2)
+        grid3.set_row_spacing(self.spacing_size)
+
+        label = Gtk.Label()
+        grid3.attach(label, 0, 0, 1, 1)
+        label.set_markup(
+            _(
+                'WARNING! YouTube is trying to block applications like' \
+                + ' Tartube!',
+            ),
+        )
+        label.set_hexpand(True)
+        label.set_alignment(0, 0.5)
+
+        label2 = Gtk.Label()
+        grid3.attach(label2, 0, 1, 1, 1)
+        label2.set_markup(
+            '<a href="' \
+            + html.escape('https://github.com/yt-dlp/yt-dlp/issues/3766') \
+            + '" title="' \
+            + _('yt-dlp Known Issues FAQ') \
+            + '">' \
+            + _('Before trying to download restricted videos, read the FAQ!') \
+            + '</a>',
+        )
+        label2.set_hexpand(True)
+        label2.set_alignment(0, 0.5)
+
+        return grid2
+
+
     def get_options_applied_text(self, options_obj):
 
         """ Called by OptionsEditWin.setup_name_tab() and
@@ -901,6 +982,7 @@ def ytdlp_only(self):
             The formatted string 'yt-dlp only'
 
         """
+
         return ' <b>[' + _('yt-dlp only') + ']</b>'
 
 
@@ -7951,6 +8033,8 @@ def setup_advanced_authentication_tab(self, inner_notebook):
         )
         self.add_tooltip('--ap-password PASSWORD', label7, entry7)
 
+        self.add_youtube_warning(grid, 0, 8, 2, 1)
+
 
     def setup_advanced_netrc_tab(self, inner_notebook):
 
@@ -8031,6 +8115,8 @@ def setup_advanced_netrc_tab(self, inner_notebook):
             textbuffer.set_text(str.join('', line_list))
             entry.set_text(netrc_path)
 
+        self.add_youtube_warning(grid, 0, 4, grid_width, 1)
+
         # (Signal connect from above)
         button.connect(
             'clicked',

tartube/downloads.py

@@ -2648,7 +2648,8 @@ def create_item(self, media_data_obj, scheduled_obj=None,
         and media_data_obj.priv_flag:
             return empty_list
 
-        # Don't download videos that we already have
+        # Don't download videos that we already have (but do check a video
+        #   that's already been downloaded)
         # Don't download videos if they're in a channel or playlist (since
         #   downloading the channel/playlist downloads the videos it contains)
         # (Exception: download a single video if that's what the calling code
@@ -2666,6 +2667,7 @@ def create_item(self, media_data_obj, scheduled_obj=None,
         if isinstance(media_data_obj, media.Video):
 
             if media_data_obj.dl_flag \
+            and operation_type != 'sim' \
             and not media_data_obj.dbid \
             in self.app_obj.temp_stamp_buffer_dict \
             and not media_data_obj.dbid in self.app_obj.temp_slice_buffer_dict:
@@ -4693,8 +4695,12 @@ def confirm_sim_video(self, json_dict):
             if video_obj in self.missing_video_check_list:
                 self.missing_video_check_list.remove(video_obj)
 
+            # A media.Video object that already exists is not displayed in the
+            #   Results list (unless it's a downloaded video that is being
+            #   re-checked)
             if video_obj.file_name \
-            and video_obj.name != app_obj.default_video_name:
+            and video_obj.name != app_obj.default_video_name \
+            and not video_obj.dl_flag:
 
                 # This video must not be displayed in the Results List, and
                 #   counts towards the limit (if any) specified by