Update to v1.3.007

CHANGES

@@ -1,4 +1,18 @@
-v1.3.0 (20 Sep 2019)
+v1.3.007 (20 Dec 2019)
+-------------------------------------------------------------------------------
+
+MAJOR FIXES
+- v1.3.007 was completely broken when replacing an earlier installation. Fixed
+- When Tartube's data directory was copied from one place to another (for
+    example, from one external drive to another), Tartube did not adapt to the
+    change very well. The way file paths are stored in Tartube's database has
+    been changed to eliminate this problem
+
+MINOR FIXES
+- Fixed an invalid time value which (sometimes) prevented a refresh operation
+    from completing correctly
+
+v1.3.0 (20 Dec 2019)
 -------------------------------------------------------------------------------
 MAJOR NEW FEATURES
 - Tartube on MS Windows did not recognise FFmpeg or AVConv. You can now tell

README.rst

@@ -11,40 +11,9 @@ Works with YouTube, BitChute, and hundreds of other websites
 * `1 Introduction`_
 * `2 Why should I use Tartube?`_
 * `3 Quick start guide`_
-* `3.1 MS Windows`_
-* `3.2 Linux/BSD`_
 * `4 Downloads`_
 * `5 Installation`_
-* `5.1 Installation - MS Windows`_
-* `5.2 Installation - MacOS`_
-* `5.3 Installation - Linux/BSD`_
-* `5.3.1 Linux/BSD Installation requirements`_
-* `5.3.2 Optional dependencies`_
-* `5.3.3 Install using PyPI`_
-* `5.3.4 Install from source`_
-* `5.3.5 Run without installing`_
 * `6 Getting started`_
-* `6.1 Choose where to save videos`_
-* `6.2 Check youtube-dl is updated`_
-* `6.3 Setting youtube-dl's location`_
-* `6.4 Setting the location of FFmpeg / AVConv`_
-* `6.4.1 On MS Windows`_
-* `6.4.2 On Linux/BSD`_
-* `6.5 Introducing system folders`_
-* `6.6 Adding videos`_
-* `6.7 Adding channels and playlists`_
-* `6.8 Adding folders`_
-* `6.9 Things you can do`_
-* `6.10 General download options`_
-* `6.11 Other download options`_
-* `6.12 Favourite videos`_
-* `6.13 Watching videos`_
-* `6.14 Combining channels, playlists and folders`_
-* `6.14.1 Combining one channel and many playlists`_
-* `6.14.2 Combining channels from different websites`_
-* `6.14.3 Download all videos to a single folder`_
-* `6.15 Archiving videos`_
-* `6.16 Exporting/importing the Tartube database`_
 * `7. Frequently-Asked Questions`_
 * `8. Future plans`_
 * `9. Known issues`_
@@ -110,11 +79,11 @@ Problems can be reported at `our GitHub page <https://github.com/axcore/tartube/
 4 Downloads
 ===========
 
-Latest version: **v1.3.0 (20 Dec 2019)**
+Latest version: **v1.3.007 (20 Dec 2019)**
 
--  `MS Windows (32-bit) installer <https://sourceforge.net/projects/tartube/files/v1.3.0/install-tartube-1.3.0-32bit.exe/download>`__ from Sourceforge
--  `MS Windows (64-bit) installer <https://sourceforge.net/projects/tartube/files/v1.3.0/install-tartube-1.3.0-64bit.exe/download>`__ from Sourceforge
--  `Source code <https://sourceforge.net/projects/tartube/files/v1.3.0/tartube_v1.3.0.tar.gz/download>`__ from Sourceforge
+-  `MS Windows (32-bit) installer <https://sourceforge.net/projects/tartube/files/v1.3.007/install-tartube-1.3.007-32bit.exe/download>`__ from Sourceforge
+-  `MS Windows (64-bit) installer <https://sourceforge.net/projects/tartube/files/v1.3.007/install-tartube-1.3.007-64bit.exe/download>`__ from Sourceforge
+-  `Source code <https://sourceforge.net/projects/tartube/files/v1.3.007/tartube_v1.3.007.tar.gz/download>`__ from Sourceforge
 -  `Source code <https://github.com/axcore/tartube>`__ and `support <https://github.com/axcore/tartube/issues>`__ from GitHub
 
 5 Installation

icons/COPYING

@@ -5,13 +5,14 @@ All files in the ../win sub-directory
 
 Author: Vectorgraphit 
 Source: https://www.iconfinder.com/icons/199499/
+Author: bekeen studio
+https://www.iconfinder.com/bekeenstudio
 
 This work is licensed under the Creative Commons Attribution 3.0 Unported
 License. To view a copy of this license, visit
 http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative 
 Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
 
-
 All files in the ../large sub-directory
 All files in the ../small sub-directory
 All files in the ../template sub-directory

nsis/tartube_install_32bit.nsi

@@ -1,4 +1,4 @@
-# Tartube v1.3.0 installer script for MS Windows
+# Tartube v1.3.007 installer script for MS Windows
 #
 # Copyright (C) 2019 A S Lewis
 #
@@ -139,7 +139,7 @@
 
     ;Name and file
     Name "Tartube"
-    OutFile "install-tartube-1.3.0-32bit.exe"
+    OutFile "install-tartube-1.3.007-32bit.exe"
 
     ;Default installation folder
     InstallDir "$LOCALAPPDATA\Tartube"
@@ -244,7 +244,7 @@ Section "Tartube" SecClient
         "Publisher" "A S Lewis"
     WriteRegStr HKLM \
         "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \
-        "DisplayVersion" "1.3.0"
+        "DisplayVersion" "1.3.007"
 
     # Create uninstaller
     WriteUninstaller "$INSTDIR\Uninstall.exe"

nsis/tartube_install_64bit.nsi

@@ -1,4 +1,4 @@
-# Tartube v1.3.0 installer script for MS Windows
+# Tartube v1.3.007 installer script for MS Windows
 #
 # Copyright (C) 2019 A S Lewis
 #
@@ -140,7 +140,7 @@
 
     ;Name and file
     Name "Tartube"
-    OutFile "install-tartube-1.3.0-64bit.exe"
+    OutFile "install-tartube-1.3.007-64bit.exe"
 
     ;Default installation folder
     InstallDir "$LOCALAPPDATA\Tartube"
@@ -245,7 +245,7 @@ Section "Tartube" SecClient
         "Publisher" "A S Lewis"
     WriteRegStr HKLM \
         "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \
-        "DisplayVersion" "1.3.0"
+        "DisplayVersion" "1.3.007"
 
     # Create uninstaller
     WriteUninstaller "$INSTDIR\Uninstall.exe"

setup.py

@@ -62,7 +62,7 @@
 # Setup
 setuptools.setup(
     name='tartube',
-    version='1.3.0',
+    version='1.3.007',
     description='GUI front-end for youtube-dl',
 #    long_description=long_description,
     long_description="""Tartube is a GUI front-end for youtube-dl, partly based

tartube/config.py

@@ -4096,6 +4096,7 @@ def setup_general_tab(self):
             entry6.set_text(
                 os.path.abspath(
                     os.path.join(
+                        self.app_obj.downloads_dir,
                         self.edit_obj.file_dir,
                         self.edit_obj.file_name + self.edit_obj.file_ext,
                     ),

tartube/downloads.py

@@ -1982,7 +1982,7 @@ def confirm_sim_video(self, json_dict):
             # If the 'Add videos' button was used, the path/filename/extension
             #   won't be set yet
             if not video_obj.file_dir and full_path:
-                video_obj.set_file(path, filename, extension)
+                video_obj.set_file(filename, extension)
 
             # Update any video object IVs that are not set
             if video_obj.name == app_obj.default_video_name \
@@ -2084,6 +2084,7 @@ def confirm_sim_video(self, json_dict):
             #   thumbnail locally
             thumb_path = os.path.abspath(
                 os.path.join(
+                    app_obj.downloads_dir,
                     video_obj.file_dir,
                     video_obj.file_name + remote_ext,
                 ),

tartube/formats.py

@@ -25,13 +25,22 @@
 
 
 # Import other modules
-#   ...
+import datetime
 
 
 # Import our modules
 #   ...
 
 
+# Some icons are different at Christmas
+today = datetime.date.today()
+day = today.strftime("%d")
+month = today.strftime("%m")
+if (int(month) == 12 and int(day) >= 24) or (int(month) == 1 and int(day) <= 5):
+    xmas_flag = True
+else:
+    xmas_flag = False
+
 # Used by utils.format_bytes()
 KILO_SIZE = 1024.0
 FILESIZE_METRIC_LIST = [
@@ -417,9 +426,14 @@
     ['Zulu', 'zu'],
 ]
 
-DIALOGUE_ICON_DICT = {
-    'system_icon': 'system_icon_64.png',
-}
+if not xmas_flag:
+    DIALOGUE_ICON_DICT = {
+        'system_icon': 'system_icon_64.png',
+    }
+else:
+    DIALOGUE_ICON_DICT = {
+        'system_icon': 'system_icon_xmas_64.png',
+    }
 
 TOOLBAR_ICON_DICT = {
     'tool_channel_large': 'channel_large.png',
@@ -514,13 +528,25 @@
     'warning_small': 'warning.png',
 }
 
-WIN_ICON_LIST = [
-    'system_icon_16.png',
-    'system_icon_24.png',
-    'system_icon_32.png',
-    'system_icon_48.png',
-    'system_icon_64.png',
-    'system_icon_128.png',
-    'system_icon_256.png',
-    'system_icon_512.png',
-]
+if not xmas_flag:
+    WIN_ICON_LIST = [
+        'system_icon_16.png',
+        'system_icon_24.png',
+        'system_icon_32.png',
+        'system_icon_48.png',
+        'system_icon_64.png',
+        'system_icon_128.png',
+        'system_icon_256.png',
+        'system_icon_512.png',
+    ]
+else:
+    WIN_ICON_LIST = [
+        'system_icon_xmas_16.png',
+        'system_icon_xmas_24.png',
+        'system_icon_xmas_32.png',
+        'system_icon_xmas_48.png',
+        'system_icon_xmas_64.png',
+        'system_icon_xmas_128.png',
+        'system_icon_xmas_256.png',
+        'system_icon_xmas_512.png',
+    ]