Fix config file reader

axcore · Sep 30, 2020 · cfb4ba4 · cfb4ba4
1 parent c8aaf7c
commit cfb4ba4
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 20 deletions.
diff --git a/README.rst b/README.rst
@@ -55,14 +55,14 @@ For a full list of new features and fixes, see `recent changes <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 <https://github.com/axcore/tartube/releases>`__):
 
-- `MS Windows (64-bit) installer <https://sourceforge.net/projects/tartube/files/v2.2.0/install-tartube-2.2.0-64bit.exe/download>`__ and `portable edition <https://sourceforge.net/projects/tartube/files/v2.2.0/tartube-portable-64bit.zip/download>`__ from Sourceforge
-- `MS Windows (32-bit) installer <https://sourceforge.net/projects/tartube/files/v2.2.0/install-tartube-2.2.0-32bit.exe/download>`__ and `portable edition <https://sourceforge.net/projects/tartube/files/v2.2.0/tartube-portable-32bit.zip/download>`__ from Sourceforge
-- `DEB package (for Debian-based distros, e.g. Ubuntu, Linux Mint) <https://sourceforge.net/projects/tartube/files/v2.2.0/python3-tartube_2.2.0.deb/download>`__ from Sourceforge
-- `RPM package (for RHEL-based distros, e.g. Fedora) <https://sourceforge.net/projects/tartube/files/v2.2.0/tartube-2.2.0.rpm/download>`__ from Sourceforge
+- `MS Windows (64-bit) installer <https://sourceforge.net/projects/tartube/files/v2.2.003/install-tartube-2.2.003-64bit.exe/download>`__ and `portable edition <https://sourceforge.net/projects/tartube/files/v2.2.003/tartube-portable-64bit.zip/download>`__ from Sourceforge
+- `MS Windows (32-bit) installer <https://sourceforge.net/projects/tartube/files/v2.2.003/install-tartube-2.2.003-32bit.exe/download>`__ and `portable edition <https://sourceforge.net/projects/tartube/files/v2.2.003/tartube-portable-32bit.zip/download>`__ from Sourceforge
+- `DEB package (for Debian-based distros, e.g. Ubuntu, Linux Mint) <https://sourceforge.net/projects/tartube/files/v2.2.003/python3-tartube_2.2.003.deb/download>`__ from Sourceforge
+- `RPM package (for RHEL-based distros, e.g. Fedora) <https://sourceforge.net/projects/tartube/files/v2.2.003/tartube-2.2.003.rpm/download>`__ 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 <https://sourceforge.net/projects/tartube/files/v2.2.0/tartube_v2.2.0.tar.gz/download>`__ from Sourceforge
+- `Source code <https://sourceforge.net/projects/tartube/files/v2.2.003/tartube_v2.2.003.tar.gz/download>`__ from Sourceforge
 - `Source code <https://github.com/axcore/tartube>`__ and `support <https://github.com/axcore/tartube/issues>`__ 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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__ = """