Skip to content

Commit 1363c15

Browse files
author
A S Lewis
committed
Update to v2.5.164
1 parent 5974d20 commit 1363c15

File tree

16 files changed

+216
-234
lines changed

16 files changed

+216
-234
lines changed

CHANGES

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1+
v2.5.164 (1 Aug 2025)
2+
-------------------------------------------------------------------------------
3+
4+
MAJOR FIXES
5+
- Fixed broken virtual environment configuration on some MS Windows systems
6+
(again, as the fix in the previous release did not work as intended)
7+
- The MS Windows installer will no longer overwrite Tartube's settings file
8+
(settings.json) when Tartube is reinstalled
9+
- Fixed failure to update the Tartube database with a remuxed video, again
10+
(Git #714)
11+
112
v2.5.156 (17 Jul 2025)
213
-------------------------------------------------------------------------------
314

4-
MAJOR NEW FEATURES
15+
MAJOR FIXES
516
- Fixed broken virtual environment configuration on some MS Windows systems
617
- Also added a 'repair' shell script which will repair the configuration, in
718
case you tweak the settings yourself. The existing shell scripts will also

README.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ Problems can be reported at `our GitHub page <https://github.com/axcore/tartube/
4444
3 Downloads
4545
===========
4646

47-
Stable release: **v2.5.156 (10 Jul 2025)**
47+
Stable release: **v2.5.164 (1 Aug 2025)**
4848

49-
Development release: **v2.5.156 (10 Jul 2025)**
49+
Development release: **v2.5.164 (1 Aug 2025)**
5050

5151
Official packages (also available from the `Github release page <https://github.com/axcore/tartube/releases>`__):
5252

53-
- `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
53+
- `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
5454
- 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`_
55-
- `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
56-
- `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
55+
- `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
56+
- `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
5757

5858
Official 'Strict' packages:
5959

@@ -70,7 +70,7 @@ Semi-official packages (Linux):
7070

7171
Source code:
7272

73-
- `Source code <https://sourceforge.net/projects/tartube/files/v2.5.156/tartube_v2.5.156.tar.gz/download>`__ from Sourceforge
73+
- `Source code <https://sourceforge.net/projects/tartube/files/v2.5.164/tartube_v2.5.164.tar.gz/download>`__ from Sourceforge
7474
- `Source code <https://github.com/axcore/tartube>`__ and `support <https://github.com/axcore/tartube/issues>`__ from GitHub
7575
- In case this Github repository is taken down, there is an official backup `here <https://gitlab.com/axcore/tartube>`__
7676

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.156
1+
2.5.164

nsis/tartube_install_64bit.nsi

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Tartube v2.5.156 installer script for MS Windows
1+
# Tartube v2.5.164 installer script for MS Windows
22
#
33
# Copyright (C) 2019-2025 A S Lewis
44
#
@@ -340,7 +340,7 @@
340340

341341
;Name and file
342342
Name "Tartube"
343-
OutFile "install-tartube-2.5.156-64bit.exe"
343+
OutFile "install-tartube-2.5.164-64bit.exe"
344344

345345
;Default installation folder
346346
InstallDir "$LOCALAPPDATA\Tartube"
@@ -387,10 +387,11 @@
387387
!insertmacro MUI_PAGE_INSTFILES
388388

389389
!define MUI_FINISHPAGE_RUN "$INSTDIR\msys64\home\user\tartube\tartube_64bit.bat"
390-
!define MUI_FINISHPAGE_RUN_TEXT "Run Tartube"
390+
# !define MUI_FINISHPAGE_RUN_TEXT "Run Tartube"
391+
!define MUI_FINISHPAGE_RUN_TEXT "$(RunTartube)"
391392
!define MUI_FINISHPAGE_RUN_NOTCHECKED
392-
!define MUI_FINISHPAGE_LINK "Visit the Tartube website for the latest news \
393-
and support"
393+
# !define MUI_FINISHPAGE_LINK "Visit the Tartube website for the latest news and support"
394+
!define MUI_FINISHPAGE_LINK "$(VisitTartubeSite)"
394395
!define MUI_FINISHPAGE_LINK_LOCATION "http://tartube.sourceforge.io/"
395396
!insertmacro MUI_PAGE_FINISH
396397

@@ -401,6 +402,15 @@
401402
# -------------------------------
402403

403404
!insertmacro MUI_LANGUAGE "English"
405+
!insertmacro MUI_LANGUAGE "Italian"
406+
407+
LangString RunTartube ${LANG_ENGLISH} "Run Tartube"
408+
LangString VisitTartubeSite ${LANG_ENGLISH} "Visit the Tartube website for the latest news and support"
409+
LangString UninstallTartube ${LANG_ENGLISH} "Uninstall Tartube"
410+
411+
LangString RunTartube ${LANG_ITALIAN} "Esegui Tartube"
412+
LangString VisitTartubeSite ${LANG_ITALIAN} "Visita il sito web di Tartube per le ultime novità ed il supporto"
413+
LangString UninstallTartube ${LANG_ITALIAN} "Disinstalla Tartube"
404414

405415
# Installer sections
406416
# -------------------------------
@@ -411,39 +421,18 @@ Section "Tartube" SecClient
411421
SetOutPath "$INSTDIR"
412422

413423
File "tartube_icon.ico"
414-
File /r msys64
424+
File /r /x settings.json msys64
415425

416426
SetOutPath "$INSTDIR\msys64\home\user\tartube"
417427

418428
# Start Menu
419429
CreateDirectory "$SMPROGRAMS\Tartube"
420-
CreateShortCut "$SMPROGRAMS\Tartube\Tartube.lnk" \
421-
"$INSTDIR\msys64\home\user\tartube\tartube_64bit.bat" \
422-
"" "$INSTDIR\tartube_icon.ico" "" SW_SHOWMINIMIZED
423-
CreateShortCut "$SMPROGRAMS\Tartube\Uninstall Tartube.lnk" \
424-
"$INSTDIR\Uninstall.exe" \
425-
"" "$INSTDIR\tartube_icon.ico"
430+
CreateShortCut "$SMPROGRAMS\Tartube\Tartube.lnk" "$INSTDIR\msys64\home\user\tartube\tartube_64bit.bat" "" "$INSTDIR\tartube_icon.ico" "" SW_SHOWMINIMIZED
431+
# CreateShortCut "$SMPROGRAMS\Tartube\Uninstall Tartube.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\tartube_icon.ico"
432+
CreateShortCut "$SMPROGRAMS\Tartube\$(UninstallTartube).lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\tartube_icon.ico"
426433

427434
# Desktop icon
428-
CreateShortcut "$DESKTOP\Tartube.lnk" \
429-
"$INSTDIR\msys64\home\user\tartube\tartube_64bit.bat" \
430-
"" "$INSTDIR\tartube_icon.ico" "" SW_SHOWMINIMIZED
431-
432-
# Store installation folder
433-
# Commented out since v1.5.0; these instructions don't work, and probably
434-
# aren't necessary anyway
435-
# WriteRegStr HKLM \
436-
# "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \
437-
# "DisplayName" "Tartube"
438-
# WriteRegStr HKLM \
439-
# "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \
440-
# "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
441-
# WriteRegStr HKLM \
442-
# "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \
443-
# "Publisher" "A S Lewis"
444-
# WriteRegStr HKLM \
445-
# "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \
446-
# "DisplayVersion" "2.5.156"
435+
CreateShortcut "$DESKTOP\Tartube.lnk" "$INSTDIR\msys64\home\user\tartube\tartube_64bit.bat" "" "$INSTDIR\tartube_icon.ico" "" SW_SHOWMINIMIZED
447436

448437
# Create uninstaller
449438
WriteUninstaller "$INSTDIR\Uninstall.exe"
@@ -464,7 +453,6 @@ Section "Uninstall"
464453
RMDir /r "$INSTDIR"
465454
Delete "$INSTDIR\Uninstall.exe"
466455

467-
DeleteRegKey HKLM \
468-
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube"
456+
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube"
469457

470458
SectionEnd

pack/bin/no_download/tartube

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ import mainapp
4444

4545
# 'Global' variables
4646
__packagename__ = 'tartube'
47-
__version__ = '2.5.156'
48-
__date__ = '17 Jul 2025'
47+
__version__ = '2.5.164'
48+
__date__ = '1 Aug 2025'
4949
__copyright__ = 'Copyright \xa9 2019-2025 A S Lewis'
5050
__license__ = """
5151
Copyright \xa9 2019-2025 A S Lewis.

pack/bin/pkg/tartube

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ import mainapp
4444

4545
# 'Global' variables
4646
__packagename__ = 'tartube'
47-
__version__ = '2.5.156'
48-
__date__ = '17 Jul 2025'
47+
__version__ = '2.5.164'
48+
__date__ = '1 Aug 2025'
4949
__copyright__ = 'Copyright \xa9 2019-2025 A S Lewis'
5050
__license__ = """
5151
Copyright \xa9 2019-2025 A S Lewis.

pack/bin/strict/tartube

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ import mainapp
4444

4545
# 'Global' variables
4646
__packagename__ = 'tartube'
47-
__version__ = '2.5.156'
48-
__date__ = '17 Jul 2025'
47+
__version__ = '2.5.164'
48+
__date__ = '1 Aug 2025'
4949
__copyright__ = 'Copyright \xa9 2019-2025 A S Lewis'
5050
__license__ = """
5151
Copyright \xa9 2019-2025 A S Lewis.

pack/tartube.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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"
22
.SH NAME
33
tartube \- GUI front-end for youtube-dl and yt-dlp
44
.SH SYNOPSIS

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
# Setup
176176
setuptools.setup(
177177
name = 'tartube',
178-
version = '2.5.156',
178+
version = '2.5.164',
179179
description = 'GUI front-end for youtube-dl and yt-dlp',
180180
long_description = long_description,
181181
long_description_content_type = 'text/plain',

tartube/downloads.py

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4409,6 +4409,51 @@ def confirm_old_video(self, dir_path, filename, extension):
44094409
self.stop_now_flag = True
44104410

44114411

4412+
def confirm_remuxed_video(self, dir_path, filename, extension):
4413+
4414+
"""Called by self.extract_stdout_data().
4415+
4416+
Written to handle problems described in Git #714.
4417+
4418+
When youtube-dl reports a video has been remuxed, make sure that the
4419+
media.Video object has its file extension updated.
4420+
4421+
If no matching video can be found, call .confirm_old_video() to handle
4422+
it.
4423+
4424+
Args:
4425+
4426+
dir_path (str): The full path to the directory in which the video
4427+
is saved, e.g. '/home/yourname/tartube/downloads/Videos'
4428+
4429+
filename (str): The video's filename, e.g. 'My Video'
4430+
4431+
extension (str): The video's extension, e.g. '.mp4'
4432+
4433+
"""
4434+
4435+
if DEBUG_FUNC_FLAG:
4436+
ttutils.debug_time('dld 4197 confirm_remuxed_video')
4437+
4438+
# Create shortcut variables (for convenience)
4439+
app_obj = self.download_manager_obj.app_obj
4440+
media_data_obj = self.download_item_obj.media_data_obj
4441+
4442+
# Find the matching video, and update its file extension
4443+
if isinstance(media_data_obj, media.Video):
4444+
video_obj = media_data_obj
4445+
4446+
else:
4447+
video_obj = media_data_obj.find_matching_video(app_obj, filename)
4448+
4449+
if video_obj:
4450+
video_obj.set_file_ext(extension)
4451+
4452+
else:
4453+
# No matching video found, so let .confirm_old_video() handle it
4454+
return confirm_old_video(self, dir_path, filename, extension)
4455+
4456+
44124457
def confirm_sim_video(self, json_dict):
44134458

44144459
"""Called by self.extract_stdout_data().
@@ -5684,7 +5729,7 @@ def extract_stdout_data(self, stdout):
56845729
dl_stat_dict['extension'] = extension
56855730
self.reset_temp_destination()
56865731

5687-
self.confirm_new_video(path, filename, extension)
5732+
self.confirm_remuxed_video(path, filename, extension)
56885733

56895734
elif (
56905735
isinstance(media_data_obj, media.Channel)

0 commit comments

Comments
 (0)