Updated yt_dlp version; added extremly basic dumb cache setup in thumbnailer; moved build and script as well as deb folder to build
This commit is contained in:
@@ -876,13 +876,19 @@ class Popen(subprocess.Popen):
|
||||
kwargs.setdefault('encoding', 'utf-8')
|
||||
kwargs.setdefault('errors', 'replace')
|
||||
|
||||
if shell and os.name == 'nt' and kwargs.get('executable') is None:
|
||||
if not isinstance(args, str):
|
||||
args = shell_quote(args, shell=True)
|
||||
shell = False
|
||||
# Set variable for `cmd.exe` newline escaping (see `utils.shell_quote`)
|
||||
env['='] = '"^\n\n"'
|
||||
args = f'{self.__comspec()} /Q /S /D /V:OFF /E:ON /C "{args}"'
|
||||
if os.name == 'nt' and kwargs.get('executable') is None:
|
||||
# Must apply shell escaping if we are trying to run a batch file
|
||||
# These conditions should be very specific to limit impact
|
||||
if not shell and isinstance(args, list) and args and args[0].lower().endswith(('.bat', '.cmd')):
|
||||
shell = True
|
||||
|
||||
if shell:
|
||||
if not isinstance(args, str):
|
||||
args = shell_quote(args, shell=True)
|
||||
shell = False
|
||||
# Set variable for `cmd.exe` newline escaping (see `utils.shell_quote`)
|
||||
env['='] = '"^\n\n"'
|
||||
args = f'{self.__comspec()} /Q /S /D /V:OFF /E:ON /C "{args}"'
|
||||
|
||||
super().__init__(args, *remaining, env=env, shell=shell, **kwargs, startupinfo=self._startupinfo)
|
||||
|
||||
@@ -1256,7 +1262,8 @@ def unified_strdate(date_str, day_first=True):
|
||||
return str(upload_date)
|
||||
|
||||
|
||||
def unified_timestamp(date_str, day_first=True):
|
||||
@partial_application
|
||||
def unified_timestamp(date_str, day_first=True, tz_offset=0):
|
||||
if not isinstance(date_str, str):
|
||||
return None
|
||||
|
||||
@@ -1264,7 +1271,8 @@ def unified_timestamp(date_str, day_first=True):
|
||||
r'(?i)[,|]|(mon|tues?|wed(nes)?|thu(rs)?|fri|sat(ur)?|sun)(day)?', '', date_str))
|
||||
|
||||
pm_delta = 12 if re.search(r'(?i)PM', date_str) else 0
|
||||
timezone, date_str = extract_timezone(date_str)
|
||||
timezone, date_str = extract_timezone(
|
||||
date_str, default=dt.timedelta(hours=tz_offset) if tz_offset else None)
|
||||
|
||||
# Remove AM/PM + timezone
|
||||
date_str = re.sub(r'(?i)\s*(?:AM|PM)(?:\s+[A-Z]+)?', '', date_str)
|
||||
@@ -2150,14 +2158,14 @@ def check_executable(exe, args=[]):
|
||||
return exe
|
||||
|
||||
|
||||
def _get_exe_version_output(exe, args):
|
||||
def _get_exe_version_output(exe, args, ignore_return_code=False):
|
||||
try:
|
||||
# STDIN should be redirected too. On UNIX-like systems, ffmpeg triggers
|
||||
# SIGTTOU if yt-dlp is run in the background.
|
||||
# See https://github.com/ytdl-org/youtube-dl/issues/955#issuecomment-209789656
|
||||
stdout, _, ret = Popen.run([encodeArgument(exe), *args], text=True,
|
||||
stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||
if ret:
|
||||
if not ignore_return_code and ret:
|
||||
return None
|
||||
except OSError:
|
||||
return False
|
||||
@@ -2822,7 +2830,7 @@ def js_to_json(code, vars={}, *, strict=False):
|
||||
{STRING_RE}|
|
||||
{COMMENT_RE}|,(?={SKIP_RE}[\]}}])|
|
||||
void\s0|(?:(?<![0-9])[eE]|[a-df-zA-DF-Z_$])[.a-zA-Z_$0-9]*|
|
||||
\b(?:0[xX][0-9a-fA-F]+|0+[0-7]+)(?:{SKIP_RE}:)?|
|
||||
\b(?:0[xX][0-9a-fA-F]+|(?<!\.)0+[0-7]+)(?:{SKIP_RE}:)?|
|
||||
[0-9]+(?={SKIP_RE}:)|
|
||||
!+
|
||||
''', fix_kv, code)
|
||||
@@ -2889,8 +2897,9 @@ def limit_length(s, length):
|
||||
return s
|
||||
|
||||
|
||||
def version_tuple(v):
|
||||
return tuple(int(e) for e in re.split(r'[-.]', v))
|
||||
def version_tuple(v, *, lenient=False):
|
||||
parse = int_or_none(default=-1) if lenient else int
|
||||
return tuple(parse(e) for e in re.split(r'[-.]', v))
|
||||
|
||||
|
||||
def is_outdated_version(version, limit, assume_new=True):
|
||||
@@ -2995,6 +3004,8 @@ def mimetype2ext(mt, default=NO_DEFAULT):
|
||||
'ttaf+xml': 'dfxp',
|
||||
'ttml+xml': 'ttml',
|
||||
'x-ms-sami': 'sami',
|
||||
'x-subrip': 'srt',
|
||||
'x-srt': 'srt',
|
||||
|
||||
# misc
|
||||
'gzip': 'gz',
|
||||
@@ -4467,7 +4478,7 @@ def decode_packed_codes(code):
|
||||
symbol_table[base_n_count] = symbols[count] or base_n_count
|
||||
|
||||
return re.sub(
|
||||
r'\b(\w+)\b', lambda mobj: symbol_table[mobj.group(0)],
|
||||
r'\b(\w+)\b', lambda m: symbol_table.get(m.group(0), m.group(0)),
|
||||
obfuscated_code)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user