mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-15 13:43:04 +00:00
Compare commits
No commits in common. "f0c9fb96827ff798a48626e7e5d32a9c5de7b97e" and "145c5a83a80536b781fd043016bd27c91c760667" have entirely different histories.
f0c9fb9682
...
145c5a83a8
@ -53,7 +53,7 @@ def get_all_ies():
|
|||||||
if os.path.exists(PLUGINS_DIRNAME):
|
if os.path.exists(PLUGINS_DIRNAME):
|
||||||
os.rename(PLUGINS_DIRNAME, BLOCKED_DIRNAME)
|
os.rename(PLUGINS_DIRNAME, BLOCKED_DIRNAME)
|
||||||
try:
|
try:
|
||||||
from yt_dlp.extractor.extractors import _ALL_CLASSES
|
from yt_dlp.extractor import _ALL_CLASSES
|
||||||
finally:
|
finally:
|
||||||
if os.path.exists(BLOCKED_DIRNAME):
|
if os.path.exists(BLOCKED_DIRNAME):
|
||||||
os.rename(BLOCKED_DIRNAME, PLUGINS_DIRNAME)
|
os.rename(BLOCKED_DIRNAME, PLUGINS_DIRNAME)
|
||||||
|
@ -38,6 +38,8 @@ from .compat import (
|
|||||||
from .cookies import load_cookies
|
from .cookies import load_cookies
|
||||||
from .downloader import FFmpegFD, get_suitable_downloader, shorten_protocol_name
|
from .downloader import FFmpegFD, get_suitable_downloader, shorten_protocol_name
|
||||||
from .downloader.rtmp import rtmpdump_version
|
from .downloader.rtmp import rtmpdump_version
|
||||||
|
from .extractor import _LAZY_LOADER
|
||||||
|
from .extractor import _PLUGIN_CLASSES as plugin_extractors
|
||||||
from .extractor import gen_extractor_classes, get_info_extractor
|
from .extractor import gen_extractor_classes, get_info_extractor
|
||||||
from .extractor.openload import PhantomJSwrapper
|
from .extractor.openload import PhantomJSwrapper
|
||||||
from .minicurses import format_text
|
from .minicurses import format_text
|
||||||
@ -3657,10 +3659,6 @@ class YoutubeDL:
|
|||||||
if not self.params.get('verbose'):
|
if not self.params.get('verbose'):
|
||||||
return
|
return
|
||||||
|
|
||||||
# These imports can be slow. So import them only as needed
|
|
||||||
from .extractor.extractors import _LAZY_LOADER
|
|
||||||
from .extractor.extractors import _PLUGIN_CLASSES as plugin_extractors
|
|
||||||
|
|
||||||
def get_encoding(stream):
|
def get_encoding(stream):
|
||||||
ret = str(getattr(stream, 'encoding', 'missing (%s)' % type(stream).__name__))
|
ret = str(getattr(stream, 'encoding', 'missing (%s)' % type(stream).__name__))
|
||||||
if not supports_terminal_sequences(stream):
|
if not supports_terminal_sequences(stream):
|
||||||
@ -3705,12 +3703,14 @@ class YoutubeDL:
|
|||||||
|
|
||||||
if source == 'source':
|
if source == 'source':
|
||||||
try:
|
try:
|
||||||
stdout, _, _ = Popen.run(
|
sp = Popen(
|
||||||
['git', 'rev-parse', '--short', 'HEAD'],
|
['git', 'rev-parse', '--short', 'HEAD'],
|
||||||
text=True, cwd=os.path.dirname(os.path.abspath(__file__)),
|
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
|
||||||
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
cwd=os.path.dirname(os.path.abspath(__file__)))
|
||||||
if re.fullmatch('[0-9a-f]+', stdout.strip()):
|
out, err = sp.communicate_or_kill()
|
||||||
write_debug(f'Git HEAD: {stdout.strip()}')
|
out = out.decode().strip()
|
||||||
|
if re.match('[0-9a-f]+', out):
|
||||||
|
write_debug('Git HEAD: %s' % out)
|
||||||
except Exception:
|
except Exception:
|
||||||
with contextlib.suppress(Exception):
|
with contextlib.suppress(Exception):
|
||||||
sys.exc_clear()
|
sys.exc_clear()
|
||||||
|
@ -12,7 +12,7 @@ import sys
|
|||||||
from .compat import compat_getpass, compat_shlex_quote
|
from .compat import compat_getpass, compat_shlex_quote
|
||||||
from .cookies import SUPPORTED_BROWSERS, SUPPORTED_KEYRINGS
|
from .cookies import SUPPORTED_BROWSERS, SUPPORTED_KEYRINGS
|
||||||
from .downloader import FileDownloader
|
from .downloader import FileDownloader
|
||||||
from .extractor import list_extractor_classes
|
from .extractor import GenericIE, list_extractor_classes
|
||||||
from .extractor.adobepass import MSO_INFO
|
from .extractor.adobepass import MSO_INFO
|
||||||
from .extractor.common import InfoExtractor
|
from .extractor.common import InfoExtractor
|
||||||
from .options import parseOpts
|
from .options import parseOpts
|
||||||
@ -79,10 +79,6 @@ def get_urls(urls, batchfile, verbose):
|
|||||||
|
|
||||||
|
|
||||||
def print_extractor_information(opts, urls):
|
def print_extractor_information(opts, urls):
|
||||||
# Importing GenericIE is currently slow since it imports other extractors
|
|
||||||
# TODO: Move this back to module level after generalization of embed detection
|
|
||||||
from .extractor.generic import GenericIE
|
|
||||||
|
|
||||||
out = ''
|
out = ''
|
||||||
if opts.list_extractors:
|
if opts.list_extractors:
|
||||||
urls = dict.fromkeys(urls, False)
|
urls = dict.fromkeys(urls, False)
|
||||||
|
@ -33,7 +33,7 @@ def _is_package(module):
|
|||||||
|
|
||||||
def passthrough_module(parent, child, *, callback=lambda _: None):
|
def passthrough_module(parent, child, *, callback=lambda _: None):
|
||||||
parent_module = importlib.import_module(parent)
|
parent_module = importlib.import_module(parent)
|
||||||
child_module = None # Import child module only as needed
|
child_module = importlib.import_module(child, parent)
|
||||||
|
|
||||||
class PassthroughModule(types.ModuleType):
|
class PassthroughModule(types.ModuleType):
|
||||||
def __getattr__(self, attr):
|
def __getattr__(self, attr):
|
||||||
@ -41,9 +41,6 @@ def passthrough_module(parent, child, *, callback=lambda _: None):
|
|||||||
with contextlib.suppress(ImportError):
|
with contextlib.suppress(ImportError):
|
||||||
return importlib.import_module(f'.{attr}', parent)
|
return importlib.import_module(f'.{attr}', parent)
|
||||||
|
|
||||||
nonlocal child_module
|
|
||||||
child_module = child_module or importlib.import_module(child, parent)
|
|
||||||
|
|
||||||
ret = _NO_ATTRIBUTE
|
ret = _NO_ATTRIBUTE
|
||||||
with contextlib.suppress(AttributeError):
|
with contextlib.suppress(AttributeError):
|
||||||
ret = getattr(child_module, attr)
|
ret = getattr(child_module, attr)
|
||||||
|
@ -709,19 +709,21 @@ def _get_kwallet_network_wallet(logger):
|
|||||||
"""
|
"""
|
||||||
default_wallet = 'kdewallet'
|
default_wallet = 'kdewallet'
|
||||||
try:
|
try:
|
||||||
stdout, _, returncode = Popen.run([
|
proc = Popen([
|
||||||
'dbus-send', '--session', '--print-reply=literal',
|
'dbus-send', '--session', '--print-reply=literal',
|
||||||
'--dest=org.kde.kwalletd5',
|
'--dest=org.kde.kwalletd5',
|
||||||
'/modules/kwalletd5',
|
'/modules/kwalletd5',
|
||||||
'org.kde.KWallet.networkWallet'
|
'org.kde.KWallet.networkWallet'
|
||||||
], text=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
|
], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
|
||||||
|
|
||||||
if returncode:
|
stdout, stderr = proc.communicate_or_kill()
|
||||||
|
if proc.returncode != 0:
|
||||||
logger.warning('failed to read NetworkWallet')
|
logger.warning('failed to read NetworkWallet')
|
||||||
return default_wallet
|
return default_wallet
|
||||||
else:
|
else:
|
||||||
logger.debug(f'NetworkWallet = "{stdout.strip()}"')
|
network_wallet = stdout.decode().strip()
|
||||||
return stdout.strip()
|
logger.debug(f'NetworkWallet = "{network_wallet}"')
|
||||||
|
return network_wallet
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(f'exception while obtaining NetworkWallet: {e}')
|
logger.warning(f'exception while obtaining NetworkWallet: {e}')
|
||||||
return default_wallet
|
return default_wallet
|
||||||
@ -739,16 +741,17 @@ def _get_kwallet_password(browser_keyring_name, logger):
|
|||||||
network_wallet = _get_kwallet_network_wallet(logger)
|
network_wallet = _get_kwallet_network_wallet(logger)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
stdout, _, returncode = Popen.run([
|
proc = Popen([
|
||||||
'kwallet-query',
|
'kwallet-query',
|
||||||
'--read-password', f'{browser_keyring_name} Safe Storage',
|
'--read-password', f'{browser_keyring_name} Safe Storage',
|
||||||
'--folder', f'{browser_keyring_name} Keys',
|
'--folder', f'{browser_keyring_name} Keys',
|
||||||
network_wallet
|
network_wallet
|
||||||
], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
|
], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
|
||||||
|
|
||||||
if returncode:
|
stdout, stderr = proc.communicate_or_kill()
|
||||||
logger.error(f'kwallet-query failed with return code {returncode}. '
|
if proc.returncode != 0:
|
||||||
'Please consult the kwallet-query man page for details')
|
logger.error(f'kwallet-query failed with return code {proc.returncode}. Please consult '
|
||||||
|
'the kwallet-query man page for details')
|
||||||
return b''
|
return b''
|
||||||
else:
|
else:
|
||||||
if stdout.lower().startswith(b'failed to read'):
|
if stdout.lower().startswith(b'failed to read'):
|
||||||
@ -763,7 +766,9 @@ def _get_kwallet_password(browser_keyring_name, logger):
|
|||||||
return b''
|
return b''
|
||||||
else:
|
else:
|
||||||
logger.debug('password found')
|
logger.debug('password found')
|
||||||
return stdout.rstrip(b'\n')
|
if stdout[-1:] == b'\n':
|
||||||
|
stdout = stdout[:-1]
|
||||||
|
return stdout
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(f'exception running kwallet-query: {error_to_str(e)}')
|
logger.warning(f'exception running kwallet-query: {error_to_str(e)}')
|
||||||
return b''
|
return b''
|
||||||
@ -810,13 +815,17 @@ def _get_linux_keyring_password(browser_keyring_name, keyring, logger):
|
|||||||
def _get_mac_keyring_password(browser_keyring_name, logger):
|
def _get_mac_keyring_password(browser_keyring_name, logger):
|
||||||
logger.debug('using find-generic-password to obtain password from OSX keychain')
|
logger.debug('using find-generic-password to obtain password from OSX keychain')
|
||||||
try:
|
try:
|
||||||
stdout, _, _ = Popen.run(
|
proc = Popen(
|
||||||
['security', 'find-generic-password',
|
['security', 'find-generic-password',
|
||||||
'-w', # write password to stdout
|
'-w', # write password to stdout
|
||||||
'-a', browser_keyring_name, # match 'account'
|
'-a', browser_keyring_name, # match 'account'
|
||||||
'-s', f'{browser_keyring_name} Safe Storage'], # match 'service'
|
'-s', f'{browser_keyring_name} Safe Storage'], # match 'service'
|
||||||
stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
|
stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
|
||||||
return stdout.rstrip(b'\n')
|
|
||||||
|
stdout, stderr = proc.communicate_or_kill()
|
||||||
|
if stdout[-1:] == b'\n':
|
||||||
|
stdout = stdout[:-1]
|
||||||
|
return stdout
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(f'exception running find-generic-password: {error_to_str(e)}')
|
logger.warning(f'exception running find-generic-password: {error_to_str(e)}')
|
||||||
return None
|
return None
|
||||||
|
@ -34,7 +34,6 @@ class Features(enum.Enum):
|
|||||||
class ExternalFD(FragmentFD):
|
class ExternalFD(FragmentFD):
|
||||||
SUPPORTED_PROTOCOLS = ('http', 'https', 'ftp', 'ftps')
|
SUPPORTED_PROTOCOLS = ('http', 'https', 'ftp', 'ftps')
|
||||||
SUPPORTED_FEATURES = ()
|
SUPPORTED_FEATURES = ()
|
||||||
_CAPTURE_STDERR = True
|
|
||||||
|
|
||||||
def real_download(self, filename, info_dict):
|
def real_download(self, filename, info_dict):
|
||||||
self.report_destination(filename)
|
self.report_destination(filename)
|
||||||
@ -129,25 +128,24 @@ class ExternalFD(FragmentFD):
|
|||||||
self._debug_cmd(cmd)
|
self._debug_cmd(cmd)
|
||||||
|
|
||||||
if 'fragments' not in info_dict:
|
if 'fragments' not in info_dict:
|
||||||
_, stderr, returncode = Popen.run(
|
p = Popen(cmd, stderr=subprocess.PIPE)
|
||||||
cmd, text=True, stderr=subprocess.PIPE if self._CAPTURE_STDERR else None)
|
_, stderr = p.communicate_or_kill()
|
||||||
if returncode and stderr:
|
if p.returncode != 0:
|
||||||
self.to_stderr(stderr)
|
self.to_stderr(stderr.decode('utf-8', 'replace'))
|
||||||
return returncode
|
return p.returncode
|
||||||
|
|
||||||
fragment_retries = self.params.get('fragment_retries', 0)
|
fragment_retries = self.params.get('fragment_retries', 0)
|
||||||
skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
|
skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
|
||||||
|
|
||||||
count = 0
|
count = 0
|
||||||
while count <= fragment_retries:
|
while count <= fragment_retries:
|
||||||
_, stderr, returncode = Popen.run(cmd, text=True, stderr=subprocess.PIPE)
|
p = Popen(cmd, stderr=subprocess.PIPE)
|
||||||
if not returncode:
|
_, stderr = p.communicate_or_kill()
|
||||||
|
if p.returncode == 0:
|
||||||
break
|
break
|
||||||
|
|
||||||
# TODO: Decide whether to retry based on error code
|
# TODO: Decide whether to retry based on error code
|
||||||
# https://aria2.github.io/manual/en/html/aria2c.html#exit-status
|
# https://aria2.github.io/manual/en/html/aria2c.html#exit-status
|
||||||
if stderr:
|
self.to_stderr(stderr.decode('utf-8', 'replace'))
|
||||||
self.to_stderr(stderr)
|
|
||||||
count += 1
|
count += 1
|
||||||
if count <= fragment_retries:
|
if count <= fragment_retries:
|
||||||
self.to_screen(
|
self.to_screen(
|
||||||
@ -182,7 +180,6 @@ class ExternalFD(FragmentFD):
|
|||||||
|
|
||||||
class CurlFD(ExternalFD):
|
class CurlFD(ExternalFD):
|
||||||
AVAILABLE_OPT = '-V'
|
AVAILABLE_OPT = '-V'
|
||||||
_CAPTURE_STDERR = False # curl writes the progress to stderr
|
|
||||||
|
|
||||||
def _make_cmd(self, tmpfilename, info_dict):
|
def _make_cmd(self, tmpfilename, info_dict):
|
||||||
cmd = [self.exe, '--location', '-o', tmpfilename, '--compressed']
|
cmd = [self.exe, '--location', '-o', tmpfilename, '--compressed']
|
||||||
@ -207,6 +204,16 @@ class CurlFD(ExternalFD):
|
|||||||
cmd += ['--', info_dict['url']]
|
cmd += ['--', info_dict['url']]
|
||||||
return cmd
|
return cmd
|
||||||
|
|
||||||
|
def _call_downloader(self, tmpfilename, info_dict):
|
||||||
|
cmd = [encodeArgument(a) for a in self._make_cmd(tmpfilename, info_dict)]
|
||||||
|
|
||||||
|
self._debug_cmd(cmd)
|
||||||
|
|
||||||
|
# curl writes the progress to stderr so don't capture it.
|
||||||
|
p = Popen(cmd)
|
||||||
|
p.communicate_or_kill()
|
||||||
|
return p.returncode
|
||||||
|
|
||||||
|
|
||||||
class AxelFD(ExternalFD):
|
class AxelFD(ExternalFD):
|
||||||
AVAILABLE_OPT = '-V'
|
AVAILABLE_OPT = '-V'
|
||||||
@ -493,7 +500,7 @@ class FFmpegFD(ExternalFD):
|
|||||||
args.append(encodeFilename(ffpp._ffmpeg_filename_argument(tmpfilename), True))
|
args.append(encodeFilename(ffpp._ffmpeg_filename_argument(tmpfilename), True))
|
||||||
self._debug_cmd(args)
|
self._debug_cmd(args)
|
||||||
|
|
||||||
with Popen(args, stdin=subprocess.PIPE, env=env) as proc:
|
proc = Popen(args, stdin=subprocess.PIPE, env=env)
|
||||||
if url in ('-', 'pipe:'):
|
if url in ('-', 'pipe:'):
|
||||||
self.on_process_started(proc, proc.stdin)
|
self.on_process_started(proc, proc.stdin)
|
||||||
try:
|
try:
|
||||||
@ -507,7 +514,8 @@ class FFmpegFD(ExternalFD):
|
|||||||
if isinstance(e, KeyboardInterrupt) and sys.platform != 'win32' and url not in ('-', 'pipe:'):
|
if isinstance(e, KeyboardInterrupt) and sys.platform != 'win32' and url not in ('-', 'pipe:'):
|
||||||
proc.communicate_or_kill(b'q')
|
proc.communicate_or_kill(b'q')
|
||||||
else:
|
else:
|
||||||
proc.kill(timeout=None)
|
proc.kill()
|
||||||
|
proc.wait()
|
||||||
raise
|
raise
|
||||||
return retval
|
return retval
|
||||||
|
|
||||||
|
@ -92,7 +92,8 @@ class RtmpFD(FileDownloader):
|
|||||||
self.to_screen('')
|
self.to_screen('')
|
||||||
return proc.wait()
|
return proc.wait()
|
||||||
except BaseException: # Including KeyboardInterrupt
|
except BaseException: # Including KeyboardInterrupt
|
||||||
proc.kill(timeout=None)
|
proc.kill()
|
||||||
|
proc.wait()
|
||||||
raise
|
raise
|
||||||
|
|
||||||
url = info_dict['url']
|
url = info_dict['url']
|
||||||
|
@ -1,15 +1,32 @@
|
|||||||
from ..compat.compat_utils import passthrough_module
|
import contextlib
|
||||||
|
import os
|
||||||
|
|
||||||
passthrough_module(__name__, '.extractors')
|
from ..utils import load_plugins
|
||||||
del passthrough_module
|
|
||||||
|
_LAZY_LOADER = False
|
||||||
|
if not os.environ.get('YTDLP_NO_LAZY_EXTRACTORS'):
|
||||||
|
with contextlib.suppress(ImportError):
|
||||||
|
from .lazy_extractors import * # noqa: F403
|
||||||
|
from .lazy_extractors import _ALL_CLASSES
|
||||||
|
_LAZY_LOADER = True
|
||||||
|
|
||||||
|
if not _LAZY_LOADER:
|
||||||
|
from .extractors import * # noqa: F403
|
||||||
|
_ALL_CLASSES = [ # noqa: F811
|
||||||
|
klass
|
||||||
|
for name, klass in globals().items()
|
||||||
|
if name.endswith('IE') and name != 'GenericIE'
|
||||||
|
]
|
||||||
|
_ALL_CLASSES.append(GenericIE) # noqa: F405
|
||||||
|
|
||||||
|
_PLUGIN_CLASSES = load_plugins('extractor', 'IE', globals())
|
||||||
|
_ALL_CLASSES = list(_PLUGIN_CLASSES.values()) + _ALL_CLASSES
|
||||||
|
|
||||||
|
|
||||||
def gen_extractor_classes():
|
def gen_extractor_classes():
|
||||||
""" Return a list of supported extractors.
|
""" Return a list of supported extractors.
|
||||||
The order does matter; the first extractor matched is the one handling the URL.
|
The order does matter; the first extractor matched is the one handling the URL.
|
||||||
"""
|
"""
|
||||||
from .extractors import _ALL_CLASSES
|
|
||||||
|
|
||||||
return _ALL_CLASSES
|
return _ALL_CLASSES
|
||||||
|
|
||||||
|
|
||||||
@ -22,12 +39,10 @@ def gen_extractors():
|
|||||||
|
|
||||||
def list_extractor_classes(age_limit=None):
|
def list_extractor_classes(age_limit=None):
|
||||||
"""Return a list of extractors that are suitable for the given age, sorted by extractor name"""
|
"""Return a list of extractors that are suitable for the given age, sorted by extractor name"""
|
||||||
from .generic import GenericIE
|
|
||||||
|
|
||||||
yield from sorted(filter(
|
yield from sorted(filter(
|
||||||
lambda ie: ie.is_suitable(age_limit) and ie != GenericIE,
|
lambda ie: ie.is_suitable(age_limit) and ie != GenericIE, # noqa: F405
|
||||||
gen_extractor_classes()), key=lambda ie: ie.IE_NAME.lower())
|
gen_extractor_classes()), key=lambda ie: ie.IE_NAME.lower())
|
||||||
yield GenericIE
|
yield GenericIE # noqa: F405
|
||||||
|
|
||||||
|
|
||||||
def list_extractors(age_limit=None):
|
def list_extractors(age_limit=None):
|
||||||
@ -37,6 +52,4 @@ def list_extractors(age_limit=None):
|
|||||||
|
|
||||||
def get_info_extractor(ie_name):
|
def get_info_extractor(ie_name):
|
||||||
"""Returns the info extractor class with the given ie_name"""
|
"""Returns the info extractor class with the given ie_name"""
|
||||||
from . import extractors
|
return globals()[ie_name + 'IE']
|
||||||
|
|
||||||
return getattr(extractors, f'{ie_name}IE')
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -9,6 +9,7 @@ from ..utils import (
|
|||||||
ExtractorError,
|
ExtractorError,
|
||||||
Popen,
|
Popen,
|
||||||
check_executable,
|
check_executable,
|
||||||
|
encodeArgument,
|
||||||
get_exe_version,
|
get_exe_version,
|
||||||
is_outdated_version,
|
is_outdated_version,
|
||||||
)
|
)
|
||||||
@ -212,14 +213,16 @@ class PhantomJSwrapper:
|
|||||||
else:
|
else:
|
||||||
self.extractor.to_screen(f'{video_id}: {note2}')
|
self.extractor.to_screen(f'{video_id}: {note2}')
|
||||||
|
|
||||||
stdout, stderr, returncode = Popen.run(
|
p = Popen(
|
||||||
[self.exe, '--ssl-protocol=any', self._TMP_FILES['script'].name],
|
[self.exe, '--ssl-protocol=any', self._TMP_FILES['script'].name],
|
||||||
text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
if returncode:
|
out, err = p.communicate_or_kill()
|
||||||
raise ExtractorError(f'Executing JS failed\n:{stderr}')
|
if p.returncode != 0:
|
||||||
|
raise ExtractorError(
|
||||||
|
'Executing JS failed\n:' + encodeArgument(err))
|
||||||
with open(self._TMP_FILES['html'].name, 'rb') as f:
|
with open(self._TMP_FILES['html'].name, 'rb') as f:
|
||||||
html = f.read().decode('utf-8')
|
html = f.read().decode('utf-8')
|
||||||
|
|
||||||
self._load_cookies()
|
self._load_cookies()
|
||||||
|
|
||||||
return (html, stdout)
|
return (html, encodeArgument(out))
|
||||||
|
@ -157,12 +157,14 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
|
|||||||
|
|
||||||
self._report_run('atomicparsley', filename)
|
self._report_run('atomicparsley', filename)
|
||||||
self.write_debug('AtomicParsley command line: %s' % shell_quote(cmd))
|
self.write_debug('AtomicParsley command line: %s' % shell_quote(cmd))
|
||||||
stdout, stderr, returncode = Popen.run(cmd, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
p = Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
if returncode:
|
stdout, stderr = p.communicate_or_kill()
|
||||||
self.report_warning(f'Unable to embed thumbnails using AtomicParsley; {stderr.strip()}')
|
if p.returncode != 0:
|
||||||
|
msg = stderr.decode('utf-8', 'replace').strip()
|
||||||
|
self.report_warning(f'Unable to embed thumbnails using AtomicParsley; {msg}')
|
||||||
# for formats that don't support thumbnails (like 3gp) AtomicParsley
|
# for formats that don't support thumbnails (like 3gp) AtomicParsley
|
||||||
# won't create to the temporary file
|
# won't create to the temporary file
|
||||||
if 'No changes' in stdout:
|
if b'No changes' in stdout:
|
||||||
self.report_warning('The file format doesn\'t support embedding a thumbnail')
|
self.report_warning('The file format doesn\'t support embedding a thumbnail')
|
||||||
success = False
|
success = False
|
||||||
|
|
||||||
|
@ -239,12 +239,14 @@ class FFmpegPostProcessor(PostProcessor):
|
|||||||
encodeArgument('-i')]
|
encodeArgument('-i')]
|
||||||
cmd.append(encodeFilename(self._ffmpeg_filename_argument(path), True))
|
cmd.append(encodeFilename(self._ffmpeg_filename_argument(path), True))
|
||||||
self.write_debug(f'{self.basename} command line: {shell_quote(cmd)}')
|
self.write_debug(f'{self.basename} command line: {shell_quote(cmd)}')
|
||||||
stdout, stderr, returncode = Popen.run(cmd, text=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
handle = Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
if returncode != (0 if self.probe_available else 1):
|
stdout_data, stderr_data = handle.communicate_or_kill()
|
||||||
|
expected_ret = 0 if self.probe_available else 1
|
||||||
|
if handle.wait() != expected_ret:
|
||||||
return None
|
return None
|
||||||
except OSError:
|
except OSError:
|
||||||
return None
|
return None
|
||||||
output = stdout if self.probe_available else stderr
|
output = (stdout_data if self.probe_available else stderr_data).decode('ascii', 'ignore')
|
||||||
if self.probe_available:
|
if self.probe_available:
|
||||||
audio_codec = None
|
audio_codec = None
|
||||||
for line in output.split('\n'):
|
for line in output.split('\n'):
|
||||||
@ -278,10 +280,11 @@ class FFmpegPostProcessor(PostProcessor):
|
|||||||
]
|
]
|
||||||
|
|
||||||
cmd += opts
|
cmd += opts
|
||||||
cmd.append(self._ffmpeg_filename_argument(path))
|
cmd.append(encodeFilename(self._ffmpeg_filename_argument(path), True))
|
||||||
self.write_debug(f'ffprobe command line: {shell_quote(cmd)}')
|
self.write_debug('ffprobe command line: %s' % shell_quote(cmd))
|
||||||
stdout, _, _ = Popen.run(cmd, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
|
p = Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
|
||||||
return json.loads(stdout)
|
stdout, stderr = p.communicate()
|
||||||
|
return json.loads(stdout.decode('utf-8', 'replace'))
|
||||||
|
|
||||||
def get_stream_number(self, path, keys, value):
|
def get_stream_number(self, path, keys, value):
|
||||||
streams = self.get_metadata_object(path)['streams']
|
streams = self.get_metadata_object(path)['streams']
|
||||||
@ -343,13 +346,16 @@ class FFmpegPostProcessor(PostProcessor):
|
|||||||
for i, (path, opts) in enumerate(path_opts) if path)
|
for i, (path, opts) in enumerate(path_opts) if path)
|
||||||
|
|
||||||
self.write_debug('ffmpeg command line: %s' % shell_quote(cmd))
|
self.write_debug('ffmpeg command line: %s' % shell_quote(cmd))
|
||||||
stdout, stderr, returncode = Popen.run(cmd, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
|
p = Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
|
||||||
if returncode not in variadic(expected_retcodes):
|
stdout, stderr = p.communicate_or_kill()
|
||||||
raise FFmpegPostProcessorError(stderr.strip().splitlines()[-1])
|
if p.returncode not in variadic(expected_retcodes):
|
||||||
|
stderr = stderr.decode('utf-8', 'replace').strip()
|
||||||
|
self.write_debug(stderr)
|
||||||
|
raise FFmpegPostProcessorError(stderr.split('\n')[-1])
|
||||||
for out_path, _ in output_path_opts:
|
for out_path, _ in output_path_opts:
|
||||||
if out_path:
|
if out_path:
|
||||||
self.try_utime(out_path, oldest_mtime, oldest_mtime)
|
self.try_utime(out_path, oldest_mtime, oldest_mtime)
|
||||||
return stderr
|
return stderr.decode('utf-8', 'replace')
|
||||||
|
|
||||||
def run_ffmpeg(self, path, out_path, opts, **kwargs):
|
def run_ffmpeg(self, path, out_path, opts, **kwargs):
|
||||||
return self.run_ffmpeg_multiple_files([path], out_path, opts, **kwargs)
|
return self.run_ffmpeg_multiple_files([path], out_path, opts, **kwargs)
|
||||||
|
@ -84,15 +84,17 @@ class SponSkrubPP(PostProcessor):
|
|||||||
cmd = [encodeArgument(i) for i in cmd]
|
cmd = [encodeArgument(i) for i in cmd]
|
||||||
|
|
||||||
self.write_debug('sponskrub command line: %s' % shell_quote(cmd))
|
self.write_debug('sponskrub command line: %s' % shell_quote(cmd))
|
||||||
stdout, _, returncode = Popen.run(cmd, text=True, stdout=None if self.get_param('verbose') else subprocess.PIPE)
|
pipe = None if self.get_param('verbose') else subprocess.PIPE
|
||||||
|
p = Popen(cmd, stdout=pipe)
|
||||||
|
stdout = p.communicate_or_kill()[0]
|
||||||
|
|
||||||
if not returncode:
|
if p.returncode == 0:
|
||||||
os.replace(temp_filename, filename)
|
os.replace(temp_filename, filename)
|
||||||
self.to_screen('Sponsor sections have been %s' % ('removed' if self.cutout else 'marked'))
|
self.to_screen('Sponsor sections have been %s' % ('removed' if self.cutout else 'marked'))
|
||||||
elif returncode == 3:
|
elif p.returncode == 3:
|
||||||
self.to_screen('No segments in the SponsorBlock database')
|
self.to_screen('No segments in the SponsorBlock database')
|
||||||
else:
|
else:
|
||||||
raise PostProcessingError(
|
msg = stdout.decode('utf-8', 'replace').strip() if stdout else ''
|
||||||
stdout.strip().splitlines()[0 if stdout.strip().lower().startswith('unrecognised') else -1]
|
msg = msg.split('\n')[0 if msg.lower().startswith('unrecognised') else -1]
|
||||||
or f'sponskrub failed with error code {returncode}')
|
raise PostProcessingError(msg if msg else 'sponskrub failed with error code %s' % p.returncode)
|
||||||
return [], information
|
return [], information
|
||||||
|
@ -841,31 +841,17 @@ class Popen(subprocess.Popen):
|
|||||||
else:
|
else:
|
||||||
_startupinfo = None
|
_startupinfo = None
|
||||||
|
|
||||||
def __init__(self, *args, text=False, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
if text is True:
|
|
||||||
kwargs['universal_newlines'] = True # For 3.6 compatibility
|
|
||||||
kwargs.setdefault('encoding', 'utf-8')
|
|
||||||
kwargs.setdefault('errors', 'replace')
|
|
||||||
super().__init__(*args, **kwargs, startupinfo=self._startupinfo)
|
super().__init__(*args, **kwargs, startupinfo=self._startupinfo)
|
||||||
|
|
||||||
def communicate_or_kill(self, *args, **kwargs):
|
def communicate_or_kill(self, *args, **kwargs):
|
||||||
try:
|
try:
|
||||||
return self.communicate(*args, **kwargs)
|
return self.communicate(*args, **kwargs)
|
||||||
except BaseException: # Including KeyboardInterrupt
|
except BaseException: # Including KeyboardInterrupt
|
||||||
self.kill(timeout=None)
|
self.kill()
|
||||||
|
self.wait()
|
||||||
raise
|
raise
|
||||||
|
|
||||||
def kill(self, *, timeout=0):
|
|
||||||
super().kill()
|
|
||||||
if timeout != 0:
|
|
||||||
self.wait(timeout=timeout)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def run(cls, *args, **kwargs):
|
|
||||||
with cls(*args, **kwargs) as proc:
|
|
||||||
stdout, stderr = proc.communicate_or_kill()
|
|
||||||
return stdout or '', stderr or '', proc.returncode
|
|
||||||
|
|
||||||
|
|
||||||
def get_subprocess_encoding():
|
def get_subprocess_encoding():
|
||||||
if sys.platform == 'win32' and sys.getwindowsversion()[0] >= 5:
|
if sys.platform == 'win32' and sys.getwindowsversion()[0] >= 5:
|
||||||
@ -2570,7 +2556,7 @@ def check_executable(exe, args=[]):
|
|||||||
""" Checks if the given binary is installed somewhere in PATH, and returns its name.
|
""" Checks if the given binary is installed somewhere in PATH, and returns its name.
|
||||||
args can be a list of arguments for a short output (like -version) """
|
args can be a list of arguments for a short output (like -version) """
|
||||||
try:
|
try:
|
||||||
Popen.run([exe] + args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
Popen([exe] + args, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate_or_kill()
|
||||||
except OSError:
|
except OSError:
|
||||||
return False
|
return False
|
||||||
return exe
|
return exe
|
||||||
@ -2583,11 +2569,14 @@ def _get_exe_version_output(exe, args, *, to_screen=None):
|
|||||||
# STDIN should be redirected too. On UNIX-like systems, ffmpeg triggers
|
# STDIN should be redirected too. On UNIX-like systems, ffmpeg triggers
|
||||||
# SIGTTOU if yt-dlp is run in the background.
|
# SIGTTOU if yt-dlp is run in the background.
|
||||||
# See https://github.com/ytdl-org/youtube-dl/issues/955#issuecomment-209789656
|
# See https://github.com/ytdl-org/youtube-dl/issues/955#issuecomment-209789656
|
||||||
stdout, _, _ = Popen.run([encodeArgument(exe)] + args, text=True,
|
out, _ = Popen(
|
||||||
stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
[encodeArgument(exe)] + args, stdin=subprocess.PIPE,
|
||||||
|
stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate_or_kill()
|
||||||
except OSError:
|
except OSError:
|
||||||
return False
|
return False
|
||||||
return stdout
|
if isinstance(out, bytes): # Python 2.x
|
||||||
|
out = out.decode('ascii', 'ignore')
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
def detect_exe_version(output, version_re=None, unrecognized='present'):
|
def detect_exe_version(output, version_re=None, unrecognized='present'):
|
||||||
@ -4807,13 +4796,14 @@ def write_xattr(path, key, value):
|
|||||||
|
|
||||||
value = value.decode()
|
value = value.decode()
|
||||||
try:
|
try:
|
||||||
_, stderr, returncode = Popen.run(
|
p = Popen(
|
||||||
[exe, '-w', key, value, path] if exe == 'xattr' else [exe, '-n', key, '-v', value, path],
|
[exe, '-w', key, value, path] if exe == 'xattr' else [exe, '-n', key, '-v', value, path],
|
||||||
stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
|
stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
raise XAttrMetadataError(e.errno, e.strerror)
|
raise XAttrMetadataError(e.errno, e.strerror)
|
||||||
if returncode:
|
stderr = p.communicate_or_kill()[1].decode('utf-8', 'replace')
|
||||||
raise XAttrMetadataError(returncode, stderr)
|
if p.returncode:
|
||||||
|
raise XAttrMetadataError(p.returncode, stderr)
|
||||||
|
|
||||||
|
|
||||||
def random_birthday(year_field, month_field, day_field):
|
def random_birthday(year_field, month_field, day_field):
|
||||||
@ -5156,8 +5146,10 @@ def windows_enable_vt_mode(): # TODO: Do this the proper way https://bugs.pytho
|
|||||||
if get_windows_version() < (10, 0, 10586):
|
if get_windows_version() < (10, 0, 10586):
|
||||||
return
|
return
|
||||||
global WINDOWS_VT_MODE
|
global WINDOWS_VT_MODE
|
||||||
|
startupinfo = subprocess.STARTUPINFO()
|
||||||
|
startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
|
||||||
try:
|
try:
|
||||||
Popen.run('', shell=True)
|
subprocess.Popen('', shell=True, startupinfo=startupinfo).wait()
|
||||||
except Exception:
|
except Exception:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user