Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Find and use system youtube-dl binary #394

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Find and use system youtube-dl binary #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions youtube_dl_gui/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
get_config_path,
get_locale_file,
os_path_exists,
YOUTUBEDL_BIN
YOUTUBEDL_BIN,
system_youtube_dl,
)


Expand Down Expand Up @@ -81,7 +82,12 @@

def main():
"""The real main. Creates and calls the main app windows. """
youtubedl_path = os.path.join(opt_manager.options["youtubedl_path"], YOUTUBEDL_BIN)

if system_youtube_dl is not None:
youtubedl_path = system_youtube_dl
print("Found and using system youtube-dl")
else:
youtubedl_path = os.path.join(opt_manager.options["youtubedl_path"], YOUTUBEDL_BIN)

app = wx.App()
frame = MainFrame(opt_manager, log_manager)
Expand Down
11 changes: 9 additions & 2 deletions youtube_dl_gui/downloaders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
from Queue import Queue
from threading import Thread

from .utils import convert_item
from .utils import (
convert_item,
system_youtube_dl,
)


class PipeReader(Thread):
Expand Down Expand Up @@ -314,7 +317,11 @@ def _get_cmd(self, url, options):
if os.name == 'nt':
cmd = [self.youtubedl_path] + options + [url]
else:
cmd = ['python', self.youtubedl_path] + options + [url]
if (system_youtube_dl is None):
cmd = ['python', self.youtubedl_path] + options + [url]
else:
cmd = [system_youtube_dl] + options + [url]
#print("Executing cmd: ", cmd)

return cmd

Expand Down
8 changes: 6 additions & 2 deletions youtube_dl_gui/downloadmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

from .utils import (
YOUTUBEDL_BIN,
system_youtube_dl,
os_path_exists,
format_bytes,
to_string,
Expand Down Expand Up @@ -506,7 +507,7 @@ def _talk_to_gui(self, data):

def _check_youtubedl(self):
"""Check if youtube-dl binary exists. If not try to download it. """
if not os_path_exists(self._youtubedl_path()) and self.parent.update_thread is None:
if (system_youtube_dl is None) and not os_path_exists(self._youtubedl_path()) and self.parent.update_thread is None:
self.parent.update_thread = UpdateThread(self.opt_manager.options['youtubedl_path'], True)
self.parent.update_thread.join()
self.parent.update_thread = None
Expand All @@ -529,7 +530,10 @@ def _jobs_done(self):
def _youtubedl_path(self):
"""Returns the path to youtube-dl binary. """
path = self.opt_manager.options['youtubedl_path']
path = os.path.join(path, YOUTUBEDL_BIN)
if system_youtube_dl is not None:
path = system_youtube_dl
else:
path = os.path.join(self.opt_manager.options["youtubedl_path"], YOUTUBEDL_BIN)
return path


Expand Down
6 changes: 6 additions & 0 deletions youtube_dl_gui/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
import locale
import subprocess

import distutils
from distutils.spawn import find_executable

try:
from twodict import TwoWayOrderedDict
except ImportError as error:
Expand All @@ -36,6 +39,9 @@
if os.name == 'nt':
YOUTUBEDL_BIN += '.exe'

# Prefer system youtube-dl; if it does not exist, fallback to downloading
# it in downloadmanager.py/_check_youtubedl
system_youtube_dl = find_executable(YOUTUBEDL_BIN)

FILESIZE_METRICS = ["B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"]

Expand Down