Update to v2.5.164

A S Lewis · A S Lewis · commit 1363c15d0b7e · 2025-08-01T13:40:34.000+01:00
diff --git a/CHANGES b/CHANGES
@@ -1,7 +1,18 @@
+v2.5.164 (1 Aug 2025)
+-------------------------------------------------------------------------------
+
+MAJOR FIXES
+- Fixed broken virtual environment configuration on some MS Windows systems
+    (again, as the fix in the previous release did not work as intended)
+- The MS Windows installer will no longer overwrite Tartube's settings file
+    (settings.json) when Tartube is reinstalled
+- Fixed failure to update the Tartube database with a remuxed video, again
+    (Git #714)
+
 v2.5.156 (17 Jul 2025)
 -------------------------------------------------------------------------------
 
-MAJOR NEW FEATURES
+MAJOR FIXES
 - Fixed broken virtual environment configuration on some MS Windows systems
 - Also added a 'repair' shell script which will repair the configuration, in
     case you tweak the settings yourself. The existing shell scripts will also
diff --git a/README.rst b/README.rst
@@ -44,16 +44,16 @@ Problems can be reported at `our GitHub page <https://github.com/axcore/tartube/
 3 Downloads
 ===========
 
-Stable release: **v2.5.156 (10 Jul 2025)**
+Stable release: **v2.5.164 (1 Aug 2025)**
 
-Development release: **v2.5.156 (10 Jul 2025)**
+Development release: **v2.5.164 (1 Aug 2025)**
 
 Official packages (also available from the `Github release page <https://github.com/axcore/tartube/releases>`__):
 
-- `MS Windows (64-bit) installer <https://sourceforge.net/projects/tartube/files/v2.5.156/install-tartube-2.5.156-64bit.exe/download>`__, `MS Windows (64-bit) and FFmpeg installer <https://sourceforge.net/projects/tartube/files/v2.5.156/install-tartube-with-ffmpeg-2.5.156-64bit.exe/download>`__ and `portable edition <https://sourceforge.net/projects/tartube/files/v2.5.156/tartube-2.5.156-64bit-mswin-portable.zip/download>`__ from Sourceforge
+- `MS Windows (64-bit) installer <https://sourceforge.net/projects/tartube/files/v2.5.164/install-tartube-2.5.164-64bit.exe/download>`__, `MS Windows (64-bit) and FFmpeg installer <https://sourceforge.net/projects/tartube/files/v2.5.164/install-tartube-with-ffmpeg-2.5.164-64bit.exe/download>`__ and `portable edition <https://sourceforge.net/projects/tartube/files/v2.5.164/tartube-2.5.164-64bit-mswin-portable.zip/download>`__ from Sourceforge
 - Tartube is no longer supported on older versions of MS Windows - see `7.24 Doesn't work on 32-bit Windows / Windows 7 / Windows 8`_
-- `DEB package (for Debian-based distros, e.g. Ubuntu, Linux Mint) <https://sourceforge.net/projects/tartube/files/v2.5.156/python3-tartube_2.5.156.deb/download>`__ from Sourceforge
-- `RPM package (for RHEL-based distros, e.g. Fedora) <https://sourceforge.net/projects/tartube/files/v2.5.156/tartube-2.5.156.rpm/download>`__ from Sourceforge
+- `DEB package (for Debian-based distros, e.g. Ubuntu, Linux Mint) <https://sourceforge.net/projects/tartube/files/v2.5.164/python3-tartube_2.5.164.deb/download>`__ from Sourceforge
+- `RPM package (for RHEL-based distros, e.g. Fedora) <https://sourceforge.net/projects/tartube/files/v2.5.164/tartube-2.5.164.rpm/download>`__ from Sourceforge
 
 Official 'Strict' packages:
 
@@ -70,7 +70,7 @@ Semi-official packages (Linux):
 
 Source code:
 
-- `Source code <https://sourceforge.net/projects/tartube/files/v2.5.156/tartube_v2.5.156.tar.gz/download>`__ from Sourceforge
+- `Source code <https://sourceforge.net/projects/tartube/files/v2.5.164/tartube_v2.5.164.tar.gz/download>`__ from Sourceforge
 - `Source code <https://github.com/axcore/tartube>`__ and `support <https://github.com/axcore/tartube/issues>`__ from GitHub
 - In case this Github repository is taken down, there is an official backup `here <https://gitlab.com/axcore/tartube>`__
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.156
+2.5.164
diff --git a/nsis/tartube_install_64bit.nsi b/nsis/tartube_install_64bit.nsi
@@ -1,4 +1,4 @@
-# Tartube v2.5.156 installer script for MS Windows
+﻿# Tartube v2.5.164 installer script for MS Windows
 #
 # Copyright (C) 2019-2025 A S Lewis
 #
@@ -340,7 +340,7 @@
 
     ;Name and file
     Name "Tartube"
-    OutFile "install-tartube-2.5.156-64bit.exe"
+    OutFile "install-tartube-2.5.164-64bit.exe"
 
     ;Default installation folder
     InstallDir "$LOCALAPPDATA\Tartube"
@@ -387,10 +387,11 @@
     !insertmacro MUI_PAGE_INSTFILES
 
     !define MUI_FINISHPAGE_RUN "$INSTDIR\msys64\home\user\tartube\tartube_64bit.bat"
-    !define MUI_FINISHPAGE_RUN_TEXT "Run Tartube"
+#   !define MUI_FINISHPAGE_RUN_TEXT "Run Tartube"
+    !define MUI_FINISHPAGE_RUN_TEXT "$(RunTartube)"
     !define MUI_FINISHPAGE_RUN_NOTCHECKED
-    !define MUI_FINISHPAGE_LINK "Visit the Tartube website for the latest news \
-        and support"
+#   !define MUI_FINISHPAGE_LINK "Visit the Tartube website for the latest news and support"
+    !define MUI_FINISHPAGE_LINK "$(VisitTartubeSite)"
     !define MUI_FINISHPAGE_LINK_LOCATION "http://tartube.sourceforge.io/"
     !insertmacro MUI_PAGE_FINISH
 
@@ -401,6 +402,15 @@
 # -------------------------------
 
     !insertmacro MUI_LANGUAGE "English"
+    !insertmacro MUI_LANGUAGE "Italian"
+
+    LangString RunTartube        ${LANG_ENGLISH} "Run Tartube"
+    LangString VisitTartubeSite  ${LANG_ENGLISH} "Visit the Tartube website for the latest news and support"
+    LangString UninstallTartube  ${LANG_ENGLISH} "Uninstall Tartube"
+
+    LangString RunTartube        ${LANG_ITALIAN} "Esegui Tartube"
+    LangString VisitTartubeSite  ${LANG_ITALIAN} "Visita il sito web di Tartube per le ultime novità ed il supporto"
+    LangString UninstallTartube  ${LANG_ITALIAN} "Disinstalla Tartube"
 
 # Installer sections
 # -------------------------------
@@ -411,39 +421,18 @@ Section "Tartube" SecClient
     SetOutPath "$INSTDIR"
 
     File "tartube_icon.ico"
-    File /r msys64
+    File /r /x settings.json msys64
 
     SetOutPath "$INSTDIR\msys64\home\user\tartube"
 
     # Start Menu
     CreateDirectory "$SMPROGRAMS\Tartube"
-    CreateShortCut "$SMPROGRAMS\Tartube\Tartube.lnk" \
-        "$INSTDIR\msys64\home\user\tartube\tartube_64bit.bat" \
-        "" "$INSTDIR\tartube_icon.ico" "" SW_SHOWMINIMIZED
-    CreateShortCut "$SMPROGRAMS\Tartube\Uninstall Tartube.lnk" \
-        "$INSTDIR\Uninstall.exe" \
-        "" "$INSTDIR\tartube_icon.ico"
+    CreateShortCut "$SMPROGRAMS\Tartube\Tartube.lnk" "$INSTDIR\msys64\home\user\tartube\tartube_64bit.bat" "" "$INSTDIR\tartube_icon.ico" "" SW_SHOWMINIMIZED
+#   CreateShortCut "$SMPROGRAMS\Tartube\Uninstall Tartube.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\tartube_icon.ico"
+    CreateShortCut "$SMPROGRAMS\Tartube\$(UninstallTartube).lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\tartube_icon.ico"
 
     # Desktop icon
-    CreateShortcut "$DESKTOP\Tartube.lnk" \
-        "$INSTDIR\msys64\home\user\tartube\tartube_64bit.bat" \
-        "" "$INSTDIR\tartube_icon.ico" "" SW_SHOWMINIMIZED
-
-    # Store installation folder
-    # Commented out since v1.5.0; these instructions don't work, and probably
-    #   aren't necessary anyway
-#    WriteRegStr HKLM \
-#        "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \
-#        "DisplayName" "Tartube"
-#    WriteRegStr HKLM \
-#        "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \
-#        "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
-#    WriteRegStr HKLM \
-#        "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \
-#        "Publisher" "A S Lewis"
-#    WriteRegStr HKLM \
-#        "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \
-#        "DisplayVersion" "2.5.156"
+    CreateShortcut "$DESKTOP\Tartube.lnk" "$INSTDIR\msys64\home\user\tartube\tartube_64bit.bat" "" "$INSTDIR\tartube_icon.ico" "" SW_SHOWMINIMIZED
 
     # Create uninstaller
     WriteUninstaller "$INSTDIR\Uninstall.exe"
@@ -464,7 +453,6 @@ Section "Uninstall"
     RMDir /r "$INSTDIR"
     Delete "$INSTDIR\Uninstall.exe"
 
-    DeleteRegKey HKLM \
-        "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube"
+    DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube"
 
 SectionEnd
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.156'
-__date__ = '17 Jul 2025'
+__version__ = '2.5.164'
+__date__ = '1 Aug 2025'
 __copyright__ = 'Copyright \xa9 2019-2025 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2025 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.156'
-__date__ = '17 Jul 2025'
+__version__ = '2.5.164'
+__date__ = '1 Aug 2025'
 __copyright__ = 'Copyright \xa9 2019-2025 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2025 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.156'
-__date__ = '17 Jul 2025'
+__version__ = '2.5.164'
+__date__ = '1 Aug 2025'
 __copyright__ = 'Copyright \xa9 2019-2025 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2025 A S Lewis.
diff --git a/pack/tartube.1 b/pack/tartube.1
@@ -1,4 +1,4 @@
-.TH man 1 "17 Jul 2025" "2.5.156" "tartube man page"
+.TH man 1 "1 Aug 2025" "2.5.164" "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
@@ -175,7 +175,7 @@
 # Setup
 setuptools.setup(
     name = 'tartube',
-    version = '2.5.156',
+    version = '2.5.164',
     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
@@ -4409,6 +4409,51 @@ def confirm_old_video(self, dir_path, filename, extension):
             self.stop_now_flag = True
 
 
+    def confirm_remuxed_video(self, dir_path, filename, extension):
+
+        """Called by self.extract_stdout_data().
+
+        Written to handle problems described in Git #714.
+
+        When youtube-dl reports a video has been remuxed, make sure that the
+        media.Video object has its file extension updated.
+
+        If no matching video can be found, call .confirm_old_video() to handle
+        it.
+
+        Args:
+
+            dir_path (str): The full path to the directory in which the video
+                is saved, e.g. '/home/yourname/tartube/downloads/Videos'
+
+            filename (str): The video's filename, e.g. 'My Video'
+
+            extension (str): The video's extension, e.g. '.mp4'
+
+        """
+
+        if DEBUG_FUNC_FLAG:
+            ttutils.debug_time('dld 4197 confirm_remuxed_video')
+
+        # Create shortcut variables (for convenience)
+        app_obj = self.download_manager_obj.app_obj
+        media_data_obj = self.download_item_obj.media_data_obj
+
+        # Find the matching video, and update its file extension
+        if isinstance(media_data_obj, media.Video):
+            video_obj = media_data_obj
+
+        else:
+            video_obj = media_data_obj.find_matching_video(app_obj, filename)
+
+        if video_obj:
+            video_obj.set_file_ext(extension)
+
+        else:
+            # No matching video found, so let .confirm_old_video() handle it
+            return confirm_old_video(self, dir_path, filename, extension)
+
+
     def confirm_sim_video(self, json_dict):
 
         """Called by self.extract_stdout_data().
@@ -5684,7 +5729,7 @@ def extract_stdout_data(self, stdout):
                 dl_stat_dict['extension'] = extension
                 self.reset_temp_destination()
 
-                self.confirm_new_video(path, filename, extension)
+                self.confirm_remuxed_video(path, filename, extension)
 
             elif (
                 isinstance(media_data_obj, media.Channel)
diff --git a/tartube/mainapp.py b/tartube/mainapp.py
@@ -2699,6 +2699,20 @@ def __init__(self, *args, **kwargs):
             '--hls-split-discontinuity': False,
         }
 
+        # Strings used in the NSIS installation script
+        # This IV is not used by Tartube code, but should be registered by
+        #   Weblate, so that translators can provide translations
+        self.extra_translation_list = [
+            # Used in the current version (v2.5.161)
+            _('Run Tartube'),
+            _('Visit the Tartube website for the latest news and support'),
+            _('Uninstall Tartube'),
+            # (Used in the current version, may be added later)
+            _('Gtk graphics test'),
+            _('Tartube installer'),
+            _('Tartube v{1} Setup'),
+        ]
+
 
     def do_startup(self):
 
diff --git a/tartube/tartube b/tartube/tartube
@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.5.156'
-__date__ = '17 Jul 2025'
+__version__ = '2.5.164'
+__date__ = '1 Aug 2025'
 __copyright__ = 'Copyright \xa9 2019-2025 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2025 A S Lewis.
diff --git a/tartube_mswin.sh b/tartube_mswin.sh
@@ -1,21 +1,21 @@
 #!/bin/bash
-# Shell script to start Tartube on MS Windows, using the MSYS2 environment
-#   provided by the Tartube installer
+# Shell script to start Tartube on MS Windows, using the MSYS2 environment provided by the Tartube
+#   installer
+# Thanks to @a0ivanov for getting it working
 
 #echo "tartube_mswin.sh: Starting re-configuration of Python's virtual environment (venv)..."
 
-# Get the directory for this script...
-#SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURE[0]}")" && pwd)"
-# ...and the directory for the python venv that was created for the Tartube
-#   installer
-#VENV_DIR="$SCRIPT_DIR/ytdl-venv"
+# Prepare system environment
+export PATH="/mingw64/bin:/usr/local/bin:/usr/bin:/bin"
+# Ensure working directory is /home/user, not /home/[current Windows account name] 
+cd /home/user/tartube
+
+# Get the directory for the python venv that was created for the Tartube installer
 VENV_DIR="../ytdl-venv"
 
-# The venv contains file paths that were correct, when the installer was
-#   created; we need to convert them to the equivalent paths for the
-#   installation
-# This means overwriting the .../ytdl-venv/pyvenv.cfg and
-#   .../ytdl-venv/bin/activate files
+# The venv contains file paths that were correct, when the installer was created; we need to convert
+#   them to the equivalent paths for the installation
+# This means overwriting the files .../ytdl-venv/pyvenv.cfg and .../ytdl-venv/bin/activate
 
 # Relative path to pyvenv.cfg file
 cfg_file="$VENV_DIR/pyvenv.cfg"
@@ -29,7 +29,7 @@ if [[ -f "$cfg_file" ]] ; then
 	bin_path_mswin="$(cygpath -m "$bin_path")"
 	python_path_mswin="$(cygpath -m "$python_path")"
 	venv_dir_mswin="$(cygpath -m "$VENV_DIR")"
-		
+    		
 	# Overwrite the contents of the file to set correct paths
 	sed -i "/^home = /s|.*|home = $bin_path_mswin|" "$cfg_file"
 	sed -i "/^executable = /s|.*|executable = $python_path_mswin|" "$cfg_file"
@@ -58,7 +58,7 @@ if [[ -f "$act_file" ]] ; then
 
 #else
 
-#	echo "tartube_portable.sh: could not find file: $act_file"
+#	echo "tartube_mswin.sh: could not find file: $act_file"
 
 fi
 
@@ -71,7 +71,7 @@ export PATH="$VENV_DIR/bin:$PATH"
 #alias pip="$VENV_DIR/bin/pip.exe"
 
 # Activate the venv
-source ~/ytdl-venv/bin/activate 
+source /home/user/ytdl-venv/bin/activate 
 
 # Start Tartube
 cd /home/user/tartube
diff --git a/tartube_mswin_repair.sh b/tartube_mswin_repair.sh
diff --git a/tartube_portable.sh b/tartube_portable.sh
diff --git a/tartube_repair.sh b/tartube_repair.sh

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.TH man 1 "17 Jul 2025" "2.5.156" "tartube man page"`
	`1`	`+.TH man 1 "1 Aug 2025" "2.5.164" "tartube man page"`
`2`	`2`	`.SH NAME`
`3`	`3`	`tartube \- GUI front-end for youtube-dl and yt-dlp`
`4`	`4`	`.SH SYNOPSIS`