From cfb4ba4ee6ce70a173ee9125d5a2dc48508c4a2a Mon Sep 17 00:00:00 2001 From: A S Lewis Date: Wed, 30 Sep 2020 18:05:12 +0100 Subject: [PATCH] Fix config file reader --- README.rst | 14 +++++++------- nsis/tartube_install_32bit.nsi | 6 +++--- nsis/tartube_install_64bit.nsi | 6 +++--- pack/bin/tartube | 2 +- pack/bin_strict/tartube | 2 +- pack/tartube.1 | 2 +- pack/tartube.desktop | 2 +- setup.py | 2 +- tartube/mainapp.py | 3 ++- tartube/tartube | 2 +- 10 files changed, 21 insertions(+), 20 deletions(-) diff --git a/README.rst b/README.rst index e309209f..7a44d576 100644 --- a/README.rst +++ b/README.rst @@ -55,14 +55,14 @@ For a full list of new features and fixes, see `recent changes `__. 3 Downloads =========== -Latest version: **v2.2.0 (30 Sep 2020)** +Latest version: **v2.2.003 (30 Sep 2020)** Official packages (also available from the `Github release page `__): -- `MS Windows (64-bit) installer `__ and `portable edition `__ from Sourceforge -- `MS Windows (32-bit) installer `__ and `portable edition `__ from Sourceforge -- `DEB package (for Debian-based distros, e.g. Ubuntu, Linux Mint) `__ from Sourceforge -- `RPM package (for RHEL-based distros, e.g. Fedora) `__ from Sourceforge +- `MS Windows (64-bit) installer `__ and `portable edition `__ from Sourceforge +- `MS Windows (32-bit) installer `__ and `portable edition `__ from Sourceforge +- `DEB package (for Debian-based distros, e.g. Ubuntu, Linux Mint) `__ from Sourceforge +- `RPM package (for RHEL-based distros, e.g. Fedora) `__ from Sourceforge There are also some DEB/RPM packages marked STRICT. In these packages, updates to **youtube-dl** from within **Tartube** have been disabled. If **Tartube** is uploaded to a repository with lots of rules, such as the official Debian repository, then you should probably use the STRICT packages. @@ -73,7 +73,7 @@ Semi-official packages: Source code: -- `Source code `__ from Sourceforge +- `Source code `__ from Sourceforge - `Source code `__ and `support `__ from GitHub 4 Quick start guide @@ -587,7 +587,7 @@ Then repeat that process to create a folder called **Music**. You can then drag- Once you've finished adding videos, channels, playlists and folders, you can make **Tartube** do something. **Tartube** offers the following operations: -- **Check** - Fetches information about videos, but don't download them +- **Check** - Fetches information about videos, but doesn't download them - **Download** - Actually downloads the videos. If you have disabled downloads for a particular item, **Tartube** will just fetch information about it instead - **Custom download** - Downloads videos in a non-standard way; see `6.13 Custom downloads`_ - **Refresh** - Examines your filesystem. If you have manually copied any videos into **Tartube**'s data directory, those videos are added to **Tartube**'s database diff --git a/nsis/tartube_install_32bit.nsi b/nsis/tartube_install_32bit.nsi index e7614de4..093f28b4 100644 --- a/nsis/tartube_install_32bit.nsi +++ b/nsis/tartube_install_32bit.nsi @@ -1,4 +1,4 @@ -# Tartube v2.2.0 installer script for MS Windows +# Tartube v2.2.003 installer script for MS Windows # # Copyright (C) 2019-2020 A S Lewis # @@ -244,7 +244,7 @@ ;Name and file Name "Tartube" - OutFile "install-tartube-2.2.0-32bit.exe" + OutFile "install-tartube-2.2.003-32bit.exe" ;Default installation folder InstallDir "$LOCALAPPDATA\Tartube" @@ -347,7 +347,7 @@ Section "Tartube" SecClient # "Publisher" "A S Lewis" # WriteRegStr HKLM \ # "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \ -# "DisplayVersion" "2.2.0" +# "DisplayVersion" "2.2.003" # Create uninstaller WriteUninstaller "$INSTDIR\Uninstall.exe" diff --git a/nsis/tartube_install_64bit.nsi b/nsis/tartube_install_64bit.nsi index 998aa51a..7fda0833 100644 --- a/nsis/tartube_install_64bit.nsi +++ b/nsis/tartube_install_64bit.nsi @@ -1,4 +1,4 @@ -# Tartube v2.2.0 installer script for MS Windows +# Tartube v2.2.003 installer script for MS Windows # # Copyright (C) 2019-2020 A S Lewis # @@ -244,7 +244,7 @@ ;Name and file Name "Tartube" - OutFile "install-tartube-2.2.0-64bit.exe" + OutFile "install-tartube-2.2.003-64bit.exe" ;Default installation folder InstallDir "$LOCALAPPDATA\Tartube" @@ -347,7 +347,7 @@ Section "Tartube" SecClient # "Publisher" "A S Lewis" # WriteRegStr HKLM \ # "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \ -# "DisplayVersion" "2.2.0" +# "DisplayVersion" "2.2.003" # Create uninstaller WriteUninstaller "$INSTDIR\Uninstall.exe" diff --git a/pack/bin/tartube b/pack/bin/tartube index 7302ba87..14c03377 100644 --- a/pack/bin/tartube +++ b/pack/bin/tartube @@ -42,7 +42,7 @@ import mainapp # 'Global' variables __packagename__ = 'tartube' -__version__ = '2.2.0' +__version__ = '2.2.003' __date__ = '30 Sep 2020' __copyright__ = 'Copyright \xa9 2019-2020 A S Lewis' __license__ = """ diff --git a/pack/bin_strict/tartube b/pack/bin_strict/tartube index 25b74c82..1c324003 100644 --- a/pack/bin_strict/tartube +++ b/pack/bin_strict/tartube @@ -42,7 +42,7 @@ import mainapp # 'Global' variables __packagename__ = 'tartube' -__version__ = '2.2.0' +__version__ = '2.2.003' __date__ = '30 Sep 2020' __copyright__ = 'Copyright \xa9 2019-2020 A S Lewis' __license__ = """ diff --git a/pack/tartube.1 b/pack/tartube.1 index e02ff3a7..49395e7b 100644 --- a/pack/tartube.1 +++ b/pack/tartube.1 @@ -1,4 +1,4 @@ -.TH man 1 "30 Sep 2020" "2.2.0" "tartube man page" +.TH man 1 "30 Sep 2020" "2.2.003" "tartube man page" .SH NAME tartube \- GUI front-end for youtube-dl .SH SYNOPSIS diff --git a/pack/tartube.desktop b/pack/tartube.desktop index 1c76c3b1..d04072de 100644 --- a/pack/tartube.desktop +++ b/pack/tartube.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=Tartube -Version=2.2.0 +Version=2.2.003 Exec=tartube Icon=tartube Type=Application diff --git a/setup.py b/setup.py index 7abd0111..fd858dea 100644 --- a/setup.py +++ b/setup.py @@ -147,7 +147,7 @@ # Setup setuptools.setup( name='tartube', - version='2.2.0', + version='2.2.003', description='GUI front-end for youtube-dl', long_description=long_description, long_description_content_type='text/plain', diff --git a/tartube/mainapp.py b/tartube/mainapp.py index ef084e31..85e1bf71 100644 --- a/tartube/mainapp.py +++ b/tartube/mainapp.py @@ -3214,7 +3214,8 @@ def load_config(self): else: # (Before this version, .ffmpeg_path was used for the avconv binary # too) - if re.search(r'avconv', self.ffmpeg_path): + if self.ffmpeg_path is not None \ + and re.search(r'avconv', self.ffmpeg_path): self.avconv_path = self.ffmpeg_path self.ffmpeg_path = None if version >= 2001098: # v2.1.098 diff --git a/tartube/tartube b/tartube/tartube index 74a957a5..2f8d62a4 100644 --- a/tartube/tartube +++ b/tartube/tartube @@ -42,7 +42,7 @@ import mainapp # 'Global' variables __packagename__ = 'tartube' -__version__ = '2.2.0' +__version__ = '2.2.003' __date__ = '30 Sep 2020' __copyright__ = 'Copyright \xa9 2019-2020 A S Lewis' __license__ = """