Fix 'is a livestream' button in Classic Mode, #643

axcore · Jul 22, 2024 · d5d8a05 · d5d8a05
1 parent adaed3f
commit d5d8a05
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 17 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.0 (3 Jan 2024)**
 
-Development release: **v2.5.021 (4 Jun 2024)**
+Development release: **v2.5.024 (22 Jul 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.021
+2.5.024
diff --git a/nsis/tartube_install_64bit.nsi b/nsis/tartube_install_64bit.nsi
@@ -1,4 +1,4 @@
-# Tartube v2.5.021 installer script for MS Windows
+# Tartube v2.5.024 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.021-64bit.exe"
+    OutFile "install-tartube-2.5.024-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.021"
+#        "DisplayVersion" "2.5.024"
 
     # 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.021'
-__date__ = '4 Jun 2024'
+__version__ = '2.5.024'
+__date__ = '22 Jul 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.021'
-__date__ = '4 Jun 2024'
+__version__ = '2.5.024'
+__date__ = '22 Jul 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.021'
-__date__ = '4 Jun 2024'
+__version__ = '2.5.024'
+__date__ = '22 Jul 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 "4 Jun 2024" "2.5.021" "tartube man page"
+.TH man 1 "22 Jul 2024" "2.5.024" "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.021',
+    version = '2.5.024',
     description = 'GUI front-end for youtube-dl and yt-dlp',
     long_description = long_description,
     long_description_content_type = 'text/plain',

diff --git a/tartube/downloads.py b/tartube/downloads.py
@@ -5366,7 +5366,7 @@ def extract_stdout_data(self, stdout):
                 self.confirm_archived_video(match.group(1))
                 self.download_manager_obj.register_video('other')
                 return dl_stat_dict
-                
+
         # Likewise for the frame messages from youtube-dl direct downloads
         match = re.search(
             r'^frame.*size\=\s*([\S]+).*bitrate\=\s*([\S]+)',
@@ -9985,6 +9985,7 @@ def choose_path(self):
         else:
 
             # Retrieve the user's preferred file extension
+            file_ext = None
             if video_obj.dummy_format is not None:
                 convert_flag, file_ext, resolution \
                 = utils.extract_dummy_format(video_obj.dummy_format)

diff --git a/tartube/mainapp.py b/tartube/mainapp.py
@@ -168,7 +168,7 @@ def __init__(self, *args, **kwargs):
         self.debug_ignore_lockfile_flag = False
         # In the main window's menu, show a menu item for adding a set of
         #   media data objects for testing
-        self.debug_test_media_menu_flag = False
+        self.debug_test_media_menu_flag = True
         # In the main window's menu, show a menu item for executing some
         #   arbitrary test code (by calling testing.run_test_code())
         self.debug_test_code_menu_flag = False

diff --git a/tartube/mainwin.py b/tartube/mainwin.py
@@ -11183,6 +11183,7 @@ def video_catalogue_update_video(self, video_obj):
         #   currently selected in the Video Index? If not, the video is not
         #   currently displayed in the Video Catalogue
         if self.video_index_current_dbid is None \
+        or video_obj.parent_obj is None \
         or not (
             self.video_index_current_dbid == video_obj.parent_obj.dbid
             or self.video_index_current_dbid == app_obj.fixed_all_folder.dbid

diff --git a/tartube/tartube b/tartube/tartube
@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.5.021'
-__date__ = '4 Jun 2024'
+__version__ = '2.5.024'
+__date__ = '22 Jul 2024'
 __copyright__ = 'Copyright \xa9 2019-2024 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2024 A S Lewis.