Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[phantomjs] Add required version checking

pull/14225/head
Tithen-Firion 2017-04-29 12:41:42 +02:00
parent fcace2d1ad
commit 98f9d87381
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/utils.py
View File

@ -3734,13 +3734,22 @@ class PhantomJSwrapper(object):
_TMP_FILE_NAMES = ['script', 'html', 'cookies'] _TMP_FILE_NAMES = ['script', 'html', 'cookies']
def __init__(self, extractor, timeout=10000): def __init__(self, extractor, required_version=None, timeout=10000):
self.exe = check_executable('phantomjs', ['-v']) self.exe = check_executable('phantomjs', ['-v'])
if not self.exe: if not self.exe:
raise ExtractorError('PhantomJS executable not found in PATH, ' raise ExtractorError('PhantomJS executable not found in PATH, '
'download it from http://phantomjs.org', 'download it from http://phantomjs.org',
expected=True) expected=True)
self.extractor = extractor self.extractor = extractor
if required_version:
version = get_exe_version(self.exe, version_re=r'([0-9.]+)')
if is_outdated_version(version, required_version):
self.extractor._downloader.report_warning(
'Your copy of PhantomJS is outdated, update it to version '
'%s or newer if you encounter any errors.' % required_version)
self.options = { self.options = {
'timeout': timeout, 'timeout': timeout,
} }