xZero707/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-30 07:38:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

[phantomjs] add exe version to debug info

Browse Source
This commit is contained in:
Tithen-Firion 2017-08-03 14:17:25 +02:00
parent c89267d31a
commit feee8d32e4
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/YoutubeDL.py
View File

@ -86,6 +86,7 @@ from .utils import (
write_string, write_string,
YoutubeDLCookieProcessor, YoutubeDLCookieProcessor,
YoutubeDLHandler, YoutubeDLHandler,
PhantomJSwrapper,
) )
from .cache import Cache from .cache import Cache
from .extractor import get_info_extractor, gen_extractor_classes, _LAZY_LOADER from .extractor import get_info_extractor, gen_extractor_classes, _LAZY_LOADER
@ -2146,6 +2147,7 @@ class YoutubeDL(object):
exe_versions = FFmpegPostProcessor.get_versions(self) exe_versions = FFmpegPostProcessor.get_versions(self)
exe_versions['rtmpdump'] = rtmpdump_version() exe_versions['rtmpdump'] = rtmpdump_version()
exe_versions['phantomjs'] = PhantomJSwrapper._version()
exe_str = ', '.join( exe_str = ', '.join(
'%s %s' % (exe, v) '%s %s' % (exe, v)
for exe, v in sorted(exe_versions.items()) for exe, v in sorted(exe_versions.items())

6
youtube_dl/utils.py
View File

@ -3895,6 +3895,10 @@ class PhantomJSwrapper(object):
_TMP_FILE_NAMES = ['script', 'html', 'cookies'] _TMP_FILE_NAMES = ['script', 'html', 'cookies']
@staticmethod
def _version():
return get_exe_version('phantomjs', version_re=r'([0-9.]+)')
def __init__(self, extractor, required_version=None, 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:
@ -3905,7 +3909,7 @@ class PhantomJSwrapper(object):
self.extractor = extractor self.extractor = extractor
if required_version: if required_version:
version = get_exe_version(self.exe, version_re=r'([0-9.]+)') version = self._version()
if is_outdated_version(version, required_version): if is_outdated_version(version, required_version):
self.extractor._downloader.report_warning( self.extractor._downloader.report_warning(
'Your copy of PhantomJS is outdated, update it to version ' 'Your copy of PhantomJS is outdated, update it to version '