[YoutubeDL] Include rtmpdump in exe versions -v output
This commit is contained in:
		
							parent
							
								
									9580711841
								
							
						
					
					
						commit
						4c83c96795
					
				
					 2 changed files with 8 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -62,6 +62,7 @@ from .utils import (
 | 
			
		|||
from .cache import Cache
 | 
			
		||||
from .extractor import get_info_extractor, gen_extractors
 | 
			
		||||
from .downloader import get_suitable_downloader
 | 
			
		||||
from .downloader.rtmp import rtmpdump_version
 | 
			
		||||
from .postprocessor import FFmpegMergerPP, FFmpegPostProcessor
 | 
			
		||||
from .version import __version__
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -1321,6 +1322,7 @@ class YoutubeDL(object):
 | 
			
		|||
            platform.python_version(), platform_name()))
 | 
			
		||||
 | 
			
		||||
        exe_versions = FFmpegPostProcessor.get_versions()
 | 
			
		||||
        exe_versions['rtmpdump'] = rtmpdump_version()
 | 
			
		||||
        exe_str = ', '.join(
 | 
			
		||||
            '%s %s' % (exe, v)
 | 
			
		||||
            for exe, v in sorted(exe_versions.items())
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -12,9 +12,15 @@ from ..utils import (
 | 
			
		|||
    compat_str,
 | 
			
		||||
    encodeFilename,
 | 
			
		||||
    format_bytes,
 | 
			
		||||
    get_exe_version,
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def rtmpdump_version():
 | 
			
		||||
    return get_exe_version(
 | 
			
		||||
        'rtmpdump', ['--help'], r'(?i)RTMPDump\s*v?([0-9a-zA-Z._-]+)')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class RtmpFD(FileDownloader):
 | 
			
		||||
    def real_download(self, filename, info_dict):
 | 
			
		||||
        def run_rtmpdump(args):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue