mirror of
				https://github.com/ytdl-org/youtube-dl.git
				synced 2025-10-29 09:26:20 -07:00 
			
		
		
		
	[phantomjs] add exe version to debug info
This commit is contained in:
		| @@ -86,6 +86,7 @@ from .utils import ( | ||||
|     write_string, | ||||
|     YoutubeDLCookieProcessor, | ||||
|     YoutubeDLHandler, | ||||
|     PhantomJSwrapper, | ||||
| ) | ||||
| from .cache import Cache | ||||
| 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['rtmpdump'] = rtmpdump_version() | ||||
|         exe_versions['phantomjs'] = PhantomJSwrapper._version() | ||||
|         exe_str = ', '.join( | ||||
|             '%s %s' % (exe, v) | ||||
|             for exe, v in sorted(exe_versions.items()) | ||||
|   | ||||
| @@ -3895,6 +3895,10 @@ class PhantomJSwrapper(object): | ||||
|  | ||||
|     _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): | ||||
|         self.exe = check_executable('phantomjs', ['-v']) | ||||
|         if not self.exe: | ||||
| @@ -3905,7 +3909,7 @@ class PhantomJSwrapper(object): | ||||
|         self.extractor = extractor | ||||
|  | ||||
|         if required_version: | ||||
|             version = get_exe_version(self.exe, version_re=r'([0-9.]+)') | ||||
|             version = self._version() | ||||
|             if is_outdated_version(version, required_version): | ||||
|                 self.extractor._downloader.report_warning( | ||||
|                     'Your copy of PhantomJS is outdated, update it to version ' | ||||
|   | ||||
		Reference in New Issue
	
	Block a user