axcore/tartube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Further fixes to PyPI install

Browse Source
This commit is contained in:
A S Lewis 2020-02-24 13:18:57 +00:00
parent 6baae8c861
commit cd45243b95
10 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.rst
View File

@ -42,11 +42,11 @@ Problems can be reported at `our GitHub page <https://github.com/axcore/tartube/
3 Downloads
===========
Latest version: **v1.5.013 (24 Feb 2019)**
Latest version: **v1.5.015 (24 Feb 2019)**
- `MS Windows (32-bit) installer <https://sourceforge.net/projects/tartube/files/v1.5.013/install-tartube-1.5.013-32bit.exe/download>`__ from Sourceforge
- `MS Windows (64-bit) installer <https://sourceforge.net/projects/tartube/files/v1.5.013/install-tartube-1.5.013-64bit.exe/download>`__ from Sourceforge
- `Source code <https://sourceforge.net/projects/tartube/files/v1.5.013/tartube_v1.5.013.tar.gz/download>`__ from Sourceforge
- `MS Windows (32-bit) installer <https://sourceforge.net/projects/tartube/files/v1.5.015/install-tartube-1.5.015-32bit.exe/download>`__ from Sourceforge
- `MS Windows (64-bit) installer <https://sourceforge.net/projects/tartube/files/v1.5.015/install-tartube-1.5.015-64bit.exe/download>`__ from Sourceforge
- `Source code <https://sourceforge.net/projects/tartube/files/v1.5.015/tartube_v1.5.015.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
@ -178,7 +178,7 @@ Here is the procedure for Debian-based distributions, like Ubuntu and Linux Mint
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1. Type: ``sudo apt install python3-pip``
2. Type: ``sudo pip3 install tartube``
2. Type: ``pip3 install tartube``
3. The **Tartube** executable is stored in **~/.local/bin** by default. If that is already in your path, you can start **Tartube** by typing ``tartube``. Otherwise, type ``~/.local/bin/tartube``
4. **Tartube** asks you to choose a data directory, so do that
5. In the **Tartube** main window, click **Edit > System preferences... > youtube-dl**

6
nsis/tartube_install_32bit.nsi
View File

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

6
nsis/tartube_install_64bit.nsi
View File

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

2
setup.py
View File

@ -80,7 +80,7 @@ for path in glob.glob('icons/win/*'):
# Setup
setuptools.setup(
name='tartube',
version='1.5.013',
version='1.5.015',
description='GUI front-end for youtube-dl',
# long_description=long_description,
long_description="""Tartube is a GUI front-end for youtube-dl, partly based

11
tartube/info.py
View File

@ -192,11 +192,16 @@ class InfoManager(threading.Thread):
self.app_obj.main_win_obj.output_tab_write_stdout(1, msg)
# Convert a path beginning with ~ (not on MS Windows)
ytdl_path = self.app_obj.ytdl_path
if os.name != 'nt':
ytdl_path = re.sub('^\~', os.path.expanduser('~'), ytdl_path)
# Prepare the system command
if self.info_type == 'formats':
cmd_list = [
'youtube-dl',
ytdl_path,
'--list-formats',
self.video_obj.source,
]
@ -204,14 +209,14 @@ class InfoManager(threading.Thread):
elif self.info_type == 'subs':
cmd_list = [
'youtube-dl',
ytdl_path,
'--list-subs',
self.video_obj.source,
]
else:
cmd_list = ['youtube-dl']
cmd_list = [ytdl_path]
if self.options_string is not None \
and self.options_string != '':

3
tartube/mainapp.py
View File

@ -532,7 +532,8 @@ class TartubeApp(Gtk.Application):
# '/usr/bin/youtube-dl'
self.ytdl_path_default = None
# The path to the youtube-dl binary, after installation using PyPI.
# Not used on MS Windows
# Not used on MS Windows. The initial ~ character must be substituted
# for os.path.expanduser('~'), before use
self.ytdl_path_pypi = '~/.local/bin/youtube-dl'
# The actual path to use in the shell command during a download or
# update operation. Initially given the same value as

2
tartube/tartube
View File

@ -43,7 +43,7 @@ import mainapp
# 'Global' variables
__packagename__ = 'tartube'
__prettyname__ = 'Tartube'
__version__ = '1.5.013'
__version__ = '1.5.015'
__date__ = '24 Feb 2020'
__copyright__ = 'Copyright \xa9 2019-2020 A S Lewis'
__license__ = """

2
tartube/tartube_debian
View File

@ -43,7 +43,7 @@ import mainapp
# 'Global' variables
__packagename__ = 'tartube'
__prettyname__ = 'Tartube'
__version__ = '1.5.013'
__version__ = '1.5.015'
__date__ = '24 Feb 2020'
__copyright__ = 'Copyright \xa9 2019-2020 A S Lewis'
__license__ = """

4
tartube/updates.py
View File

@ -342,6 +342,10 @@ class UpdateManager(threading.Thread):
cmd_list \
= self.app_obj.ytdl_update_dict[self.app_obj.ytdl_update_current]
# Convert a path beginning with ~ (not on MS Windows)
if os.name != 'nt':
cmd_list[0] = re.sub('^\~', os.path.expanduser('~'), cmd_list[0])
# Create a new child process using that command
self.create_child_process(cmd_list)

7
tartube/utils.py
View File

@ -779,8 +779,13 @@ dl_sim_flag=False, divert_mode=None):
elif divert_mode == 'invidious':
source = convert_youtube_to_invidious(source)
# Convert a path beginning with ~ (not on MS Windows)
ytdl_path = app_obj.ytdl_path
if os.name != 'nt':
ytdl_path = re.sub('^\~', os.path.expanduser('~'), ytdl_path)
# Set the list
cmd_list = [app_obj.ytdl_path] + options_list + [source]
cmd_list = [ytdl_path] + options_list + [source]
return cmd_list