aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/helper.py8
-rw-r--r--test/test_cache.py14
-rw-r--r--test/test_jsinterp.py935
-rw-r--r--test/test_traversal.py190
-rw-r--r--test/test_utils.py46
-rw-r--r--test/test_youtube_signature.py231
6 files changed, 938 insertions, 486 deletions
diff --git a/test/helper.py b/test/helper.py
index 6f2129eff..fac069d25 100644
--- a/test/helper.py
+++ b/test/helper.py
@@ -85,10 +85,10 @@ class FakeYDL(YoutubeDL):
# Silence an expected warning matching a regex
old_report_warning = self.report_warning
- def report_warning(self, message):
+ def report_warning(self, message, *args, **kwargs):
if re.match(regex, message):
return
- old_report_warning(message)
+ old_report_warning(message, *args, **kwargs)
self.report_warning = types.MethodType(report_warning, self)
@@ -265,11 +265,11 @@ def assertRegexpMatches(self, text, regexp, msg=None):
def expect_warnings(ydl, warnings_re):
real_warning = ydl.report_warning
- def _report_warning(w):
+ def _report_warning(self, w, *args, **kwargs):
if not any(re.search(w_re, w) for w_re in warnings_re):
real_warning(w)
- ydl.report_warning = _report_warning
+ ydl.report_warning = types.MethodType(_report_warning, ydl)
def http_server_port(httpd):
diff --git a/test/test_cache.py b/test/test_cache.py
index 931074aa1..0431f4f15 100644
--- a/test/test_cache.py
+++ b/test/test_cache.py
@@ -63,9 +63,21 @@ class TestCache(unittest.TestCase):
obj = {'x': 1, 'y': ['รค', '\\a', True]}
c.store('test_cache', 'k.', obj)
self.assertEqual(c.load('test_cache', 'k.', min_ver='1970.01.01'), obj)
- new_version = '.'.join(('%d' % ((v + 1) if i == 0 else v, )) for i, v in enumerate(version_tuple(__version__)))
+ new_version = '.'.join(('%0.2d' % ((v + 1) if i == 0 else v, )) for i, v in enumerate(version_tuple(__version__)))
self.assertIs(c.load('test_cache', 'k.', min_ver=new_version), None)
+ def test_cache_clear(self):
+ ydl = FakeYDL({
+ 'cachedir': self.test_dir,
+ })
+ c = Cache(ydl)
+ c.store('test_cache', 'k.', 'kay')
+ c.store('test_cache', 'l.', 'ell')
+ self.assertEqual(c.load('test_cache', 'k.'), 'kay')
+ c.clear('test_cache', 'k.')
+ self.assertEqual(c.load('test_cache', 'k.'), None)
+ self.assertEqual(c.load('test_cache', 'l.'), 'ell')
+
if __name__ == '__main__':
unittest.main()
diff --git a/test/test_jsinterp.py b/test/test_jsinterp.py
index da8e98020..479cb43a0 100644
--- a/test/test_jsinterp.py
+++ b/test/test_jsinterp.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+# coding: utf-8
from __future__ import unicode_literals
@@ -6,199 +7,257 @@ from __future__ import unicode_literals
import os
import sys
import unittest
+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import math
import re
+import time
+from youtube_dl.compat import compat_str as str
from youtube_dl.jsinterp import JS_Undefined, JSInterpreter
+NaN = object()
-class TestJSInterpreter(unittest.TestCase):
- def test_basic(self):
- jsi = JSInterpreter('function x(){;}')
- self.assertEqual(jsi.call_function('x'), None)
- self.assertEqual(repr(jsi.extract_function('x')), 'F<x>')
- jsi = JSInterpreter('function x3(){return 42;}')
- self.assertEqual(jsi.call_function('x3'), 42)
-
- jsi = JSInterpreter('function x3(){42}')
- self.assertEqual(jsi.call_function('x3'), None)
+class TestJSInterpreter(unittest.TestCase):
+ def _test(self, jsi_or_code, expected, func='f', args=()):
+ if isinstance(jsi_or_code, str):
+ jsi_or_code = JSInterpreter(jsi_or_code)
+ got = jsi_or_code.call_function(func, *args)
+ if expected is NaN:
+ self.assertTrue(math.isnan(got), '{0} is not NaN'.format(got))
+ else:
+ self.assertEqual(got, expected)
- jsi = JSInterpreter('var x5 = function(){return 42;}')
- self.assertEqual(jsi.call_function('x5'), 42)
+ def test_basic(self):
+ jsi = JSInterpreter('function f(){;}')
+ self.assertEqual(repr(jsi.extract_function('f')), 'F<f>')
+ self._test(jsi, None)
- def test_calc(self):
- jsi = JSInterpreter('function x4(a){return 2*a+1;}')
- self.assertEqual(jsi.call_function('x4', 3), 7)
+ self._test('function f(){return 42;}', 42)
+ self._test('function f(){42}', None)
+ self._test('var f = function(){return 42;}', 42)
def test_add(self):
- jsi = JSInterpreter('function f(){return 42 + 7;}')
- self.assertEqual(jsi.call_function('f'), 49)
- jsi = JSInterpreter('function f(){return 42 + undefined;}')
- self.assertTrue(math.isnan(jsi.call_function('f')))
- jsi = JSInterpreter('function f(){return 42 + null;}')
- self.assertEqual(jsi.call_function('f'), 42)
+ self._test('function f(){return 42 + 7;}', 49)
+ self._test('function f(){return 42 + undefined;}', NaN)
+ self._test('function f(){return 42 + null;}', 42)
+ self._test('function f(){return 1 + "";}', '1')
+ self._test('function f(){return 42 + "7";}', '427')
+ self._test('function f(){return false + true;}', 1)
+ self._test('function f(){return "false" + true;}', 'falsetrue')
+ self._test('function f(){return '
+ '1 + "2" + [3,4] + {k: 56} + null + undefined + Infinity;}',
+ '123,4[object Object]nullundefinedInfinity')
def test_sub(self):
- jsi = JSInterpreter('function f(){return 42 - 7;}')
- self.assertEqual(jsi.call_function('f'), 35)
- jsi = JSInterpreter('function f(){return 42 - undefined;}')
- self.assertTrue(math.isnan(jsi.call_function('f')))
- jsi = JSInterpreter('function f(){return 42 - null;}')
- self.assertEqual(jsi.call_function('f'), 42)
+ self._test('function f(){return 42 - 7;}', 35)
+ self._test('function f(){return 42 - undefined;}', NaN)
+ self._test('function f(){return 42 - null;}', 42)
+ self._test('function f(){return 42 - "7";}', 35)
+ self._test('function f(){return 42 - "spam";}', NaN)
def test_mul(self):
- jsi = JSInterpreter('function f(){return 42 * 7;}')
- self.assertEqual(jsi.call_function('f'), 294)
- jsi = JSInterpreter('function f(){return 42 * undefined;}')
- self.assertTrue(math.isnan(jsi.call_function('f')))
- jsi = JSInterpreter('function f(){return 42 * null;}')
- self.assertEqual(jsi.call_function('f'), 0)
+ self._test('function f(){return 42 * 7;}', 294)
+ self._test('function f(){return 42 * undefined;}', NaN)
+ self._test('function f(){return 42 * null;}', 0)
+ self._test('function f(){return 42 * "7";}', 294)
+ self._test('function f(){return 42 * "eggs";}', NaN)
def test_div(self):
jsi = JSInterpreter('function f(a, b){return a / b;}')
- self.assertTrue(math.isnan(jsi.call_function('f', 0, 0)))
- self.assertTrue(math.isnan(jsi.call_function('f', JS_Undefined, 1)))
- self.assertTrue(math.isinf(jsi.call_function('f', 2, 0)))
- self.assertEqual(jsi.call_function('f', 0, 3), 0)
+ self._test(jsi, NaN, args=(0, 0))
+ self._test(jsi, NaN, args=(JS_Undefined, 1))
+ self._test(jsi, float('inf'), args=(2, 0))
+ self._test(jsi, 0, args=(0, 3))
+ self._test(jsi, 6, args=(42, 7))
+ self._test(jsi, 0, args=(42, float('inf')))
+ self._test(jsi, 6, args=("42", 7))
+ self._test(jsi, NaN, args=("spam", 7))
def test_mod(self):
- jsi = JSInterpreter('function f(){return 42 % 7;}')
- self.assertEqual(jsi.call_function('f'), 0)
- jsi = JSInterpreter('function f(){return 42 % 0;}')
- self.assertTrue(math.isnan(jsi.call_function('f')))
- jsi = JSInterpreter('function f(){return 42 % undefined;}')
- self.assertTrue(math.isnan(jsi.call_function('f')))
+ self._test('function f(){return 42 % 7;}', 0)
+ self._test('function f(){return 42 % 0;}', NaN)
+ self._test('function f(){return 42 % undefined;}', NaN)
+ self._test('function f(){return 42 % "7";}', 0)
+ self._test('function f(){return 42 % "beans";}', NaN)
def test_exp(self):
- jsi = JSInterpreter('function f(){return 42 ** 2;}')
- self.assertEqual(jsi.call_function('f'), 1764)
- jsi = JSInterpreter('function f(){return 42 ** undefined;}')
- self.assertTrue(math.isnan(jsi.call_function('f')))
- jsi = JSInterpreter('function f(){return 42 ** null;}')
- self.assertEqual(jsi.call_function('f'), 1)
- jsi = JSInterpreter('function f(){return undefined ** 42;}')
- self.assertTrue(math.isnan(jsi.call_function('f')))
+ self._test('function f(){return 42 ** 2;}', 1764)
+ self._test('function f(){return 42 ** undefined;}', NaN)
+ self._test('function f(){return 42 ** null;}', 1)
+ self._test('function f(){return undefined ** 0;}', 1)
+ self._test('function f(){return undefined ** 42;}', NaN)
+ self._test('function f(){return 42 ** "2";}', 1764)
+ self._test('function f(){return 42 ** "spam";}', NaN)
+
+ def test_calc(self):
+ self._test('function f(a){return 2*a+1;}', 7, args=[3])
def test_empty_return(self):
- jsi = JSInterpreter('function f(){return; y()}')
- self.assertEqual(jsi.call_function('f'), None)
+ self._test('function f(){return; y()}', None)
def test_morespace(self):
- jsi = JSInterpreter('function x (a) { return 2 * a + 1 ; }')
- self.assertEqual(jsi.call_function('x', 3), 7)
-
- jsi = JSInterpreter('function f () { x = 2 ; return x; }')
- self.assertEqual(jsi.call_function('f'), 2)
+ self._test('function f (a) { return 2 * a + 1 ; }', 7, args=[3])
+ self._test('function f () { x = 2 ; return x; }', 2)
def test_strange_chars(self):
- jsi = JSInterpreter('function $_xY1 ($_axY1) { var $_axY2 = $_axY1 + 1; return $_axY2; }')
- self.assertEqual(jsi.call_function('$_xY1', 20), 21)
+ self._test('function $_xY1 ($_axY1) { var $_axY2 = $_axY1 + 1; return $_axY2; }',
+ 21, args=[20], func='$_xY1')
def test_operators(self):
- jsi = JSInterpreter('function f(){return 1 << 5;}')
- self.assertEqual(jsi.call_function('f'), 32)
-
- jsi = JSInterpreter('function f(){return 2 ** 5}')
- self.assertEqual(jsi.call_function('f'), 32)
-
- jsi = JSInterpreter('function f(){return 19 & 21;}')
- self.assertEqual(jsi.call_function('f'), 17)
-
- jsi = JSInterpreter('function f(){return 11 >> 2;}')
- self.assertEqual(jsi.call_function('f'), 2)
-
- jsi = JSInterpreter('function f(){return []? 2+3: 4;}')
- self.assertEqual(jsi.call_function('f'), 5)
-
- jsi = JSInterpreter('function f(){return 1 == 2}')
- self.assertEqual(jsi.call_function('f'), False)
-
- jsi = JSInterpreter('function f(){return 0 && 1 || 2;}')
- self.assertEqual(jsi.call_function('f'), 2)
-
- jsi = JSInterpreter('function f(){return 0 ?? 42;}')
- self.assertEqual(jsi.call_function('f'), 0)
-
- jsi = JSInterpreter('function f(){return "life, the universe and everything" < 42;}')
- self.assertFalse(jsi.call_function('f'))
+ self._test('function f(){return 1 << 5;}', 32)
+ self._test('function f(){return 2 ** 5}', 32)
+ self._test('function f(){return 19 & 21;}', 17)
+ self._test('function f(){return 11 >> 2;}', 2)
+ self._test('function f(){return []? 2+3: 4;}', 5)
+ # equality
+ self._test('function f(){return 1 == 1}', True)
+ self._test('function f(){return 1 == 1.0}', True)
+ self._test('function f(){return 1 == "1"}', True)
+ self._test('function f(){return 1 == 2}', False)
+ self._test('function f(){return 1 != "1"}', False)
+ self._test('function f(){return 1 != 2}', True)
+ self._test('function f(){var x = {a: 1}; var y = x; return x == y}', True)
+ self._test('function f(){var x = {a: 1}; return x == {a: 1}}', False)
+ self._test('function f(){return NaN == NaN}', False)
+ self._test('function f(){return null == undefined}', True)
+ self._test('function f(){return "spam, eggs" == "spam, eggs"}', True)
+ # strict equality
+ self._test('function f(){return 1 === 1}', True)
+ self._test('function f(){return 1 === 1.0}', True)
+ self._test('function f(){return 1 === "1"}', False)
+ self._test('function f(){return 1 === 2}', False)
+ self._test('function f(){var x = {a: 1}; var y = x; return x === y}', True)
+ self._test('function f(){var x = {a: 1}; return x === {a: 1}}', False)
+ self._test('function f(){return NaN === NaN}', False)
+ self._test('function f(){return null === undefined}', False)
+ self._test('function f(){return null === null}', True)
+ self._test('function f(){return undefined === undefined}', True)
+ self._test('function f(){return "uninterned" === "uninterned"}', True)
+ self._test('function f(){return 1 === 1}', True)
+ self._test('function f(){return 1 === "1"}', False)
+ self._test('function f(){return 1 !== 1}', False)
+ self._test('function f(){return 1 !== "1"}', True)
+ # expressions
+ self._test('function f(){return 0 && 1 || 2;}', 2)
+ self._test('function f(){return 0 ?? 42;}', 0)
+ self._test('function f(){return "life, the universe and everything" < 42;}', False)
+ # https://github.com/ytdl-org/youtube-dl/issues/32815
+ self._test('function f(){return 0 - 7 * - 6;}', 42)
+
+ def test_bitwise_operators_typecast(self):
+ # madness
+ self._test('function f(){return null << 5}', 0)
+ self._test('function f(){return undefined >> 5}', 0)
+ self._test('function f(){return 42 << NaN}', 42)
+ self._test('function f(){return 42 << Infinity}', 42)
+ self._test('function f(){return 0.0 << null}', 0)
+ self._test('function f(){return NaN << 42}', 0)
+ self._test('function f(){return "21.9" << 1}', 42)
+ self._test('function f(){return true << "5";}', 32)
+ self._test('function f(){return true << true;}', 2)
+ self._test('function f(){return "19" & "21.9";}', 17)
+ self._test('function f(){return "19" & false;}', 0)
+ self._test('function f(){return "11.0" >> "2.1";}', 2)
+ self._test('function f(){return 5 ^ 9;}', 12)
+ self._test('function f(){return 0.0 << NaN}', 0)
+ self._test('function f(){return null << undefined}', 0)
+ self._test('function f(){return 21 << 4294967297}', 42)
def test_array_access(self):
- jsi = JSInterpreter('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2.0] = 7; return x;}')
- self.assertEqual(jsi.call_function('f'), [5, 2, 7])
+ self._test('function f(){var x = [1,2,3]; x[0] = 4; x[0] = 5; x[2.0] = 7; return x;}', [5, 2, 7])
def test_parens(self):
- jsi = JSInterpreter('function f(){return (1) + (2) * ((( (( (((((3)))))) )) ));}')
- self.assertEqual(jsi.call_function('f'), 7)
-
- jsi = JSInterpreter('function f(){return (1 + 2) * 3;}')
- self.assertEqual(jsi.call_function('f'), 9)
+ self._test('function f(){return (1) + (2) * ((( (( (((((3)))))) )) ));}', 7)
+ self._test('function f(){return (1 + 2) * 3;}', 9)
def test_quotes(self):
- jsi = JSInterpreter(r'function f(){return "a\"\\("}')
- self.assertEqual(jsi.call_function('f'), r'a"\(')
+ self._test(r'function f(){return "a\"\\("}', r'a"\(')
def test_assignments(self):
- jsi = JSInterpreter('function f(){var x = 20; x = 30 + 1; return x;}')
- self.assertEqual(jsi.call_function('f'), 31)
-
- jsi = JSInterpreter('function f(){var x = 20; x += 30 + 1; return x;}')
- self.assertEqual(jsi.call_function('f'), 51)
-
- jsi = JSInterpreter('function f(){var x = 20; x -= 30 + 1; return x;}')
- self.assertEqual(jsi.call_function('f'), -11)
+ self._test('function f(){var x = 20; x = 30 + 1; return x;}', 31)
+ self._test('function f(){var x = 20; x += 30 + 1; return x;}', 51)
+ self._test('function f(){var x = 20; x -= 30 + 1; return x;}', -11)
+ self._test('function f(){var x = 2; var y = ["a", "b"]; y[x%y["length"]]="z"; return y}', ['z', 'b'])
def test_comments(self):
- 'Skipping: Not yet fully implemented'
- return
- jsi = JSInterpreter('''
- function x() {
- var x = /* 1 + */ 2;
- var y = /* 30
- * 40 */ 50;
- return x + y;
- }
- ''')
- self.assertEqual(jsi.call_function('x'), 52)
-
- jsi = JSInterpreter('''
- function f() {
- var x = "/*";
- var y = 1 /* comment */ + 2;
- return y;
- }
- ''')
- self.assertEqual(jsi.call_function('f'), 3)
+ self._test('''
+ function f() {
+ var x = /* 1 + */ 2;
+ var y = /* 30
+ * 40 */ 50;
+ return x + y;
+ }
+ ''', 52)
+
+ self._test('''
+ function f() {
+ var x = "/*";
+ var y = 1 /* comment */ + 2;
+ return y;
+ }
+ ''', 3)
+
+ self._test('''
+ function f() {
+ var x = ( /* 1 + */ 2 +
+ /* 30 * 40 */
+ 50);
+ return x;
+ }
+ ''', 52)
def test_precedence(self):
- jsi = JSInterpreter('''
- function x() {
- var a = [10, 20, 30, 40, 50];
- var b = 6;
- a[0]=a[b%a.length];
- return a;
- }''')
- self.assertEqual(jsi.call_function('x'), [20, 20, 30, 40, 50])
+ self._test('''
+ function f() {
+ var a = [10, 20, 30, 40, 50];
+ var b = 6;
+ a[0]=a[b%a.length];
+ return a;
+ }
+ ''', [20, 20, 30, 40, 50])
def test_builtins(self):
- jsi = JSInterpreter('''
- function x() { return NaN }
- ''')
- self.assertTrue(math.isnan(jsi.call_function('x')))
+ self._test('function f() { return NaN }', NaN)
def test_Date(self):
- jsi = JSInterpreter('''
- function x(dt) { return new Date(dt) - 0; }
- ''')
- self.assertEqual(jsi.call_function('x', 'Wednesday 31 December 1969 18:01:26 MDT'), 86000)
+ self._test('function f() { return new Date("Wednesday 31 December 1969 18:01:26 MDT") - 0; }', 86000)
+ jsi = JSInterpreter('function f(dt) { return new Date(dt) - 0; }')
# date format m/d/y
- self.assertEqual(jsi.call_function('x', '12/31/1969 18:01:26 MDT'), 86000)
-
+ self._test(jsi, 86000, args=['12/31/1969 18:01:26 MDT'])
# epoch 0
- self.assertEqual(jsi.call_function('x', '1 January 1970 00:00:00 UTC'), 0)
+ self._test(jsi, 0, args=['1 January 1970 00:00:00 UTC'])
+ # undefined
+ self._test(jsi, NaN, args=[JS_Undefined])
+ # y,m,d, ... - may fail with older dates lacking DST data
+ jsi = JSInterpreter(
+ 'function f() { return new Date(%s); }'
+ % ('2024, 5, 29, 2, 52, 12, 42',))
+ self._test(jsi, (
+ 1719625932042 # UK value
+ + (
+ + 3600 # back to GMT
+ + (time.altzone if time.daylight # host's DST
+ else time.timezone)
+ ) * 1000))
+ # no arg
+ self.assertAlmostEqual(JSInterpreter(
+ 'function f() { return new Date() - 0; }').call_function('f'),
+ time.time() * 1000, delta=100)
+ # Date.now()
+ self.assertAlmostEqual(JSInterpreter(
+ 'function f() { return Date.now(); }').call_function('f'),
+ time.time() * 1000, delta=100)
+ # Date.parse()
+ jsi = JSInterpreter('function f(dt) { return Date.parse(dt); }')
+ self._test(jsi, 0, args=['1 January 1970 00:00:00 UTC'])
+ # Date.UTC()
+ jsi = JSInterpreter('function f() { return Date.UTC(%s); }'
+ % ('1970, 0, 1, 0, 0, 0, 0',))
+ self._test(jsi, 0)
def test_call(self):
jsi = JSInterpreter('''
@@ -206,179 +265,135 @@ class TestJSInterpreter(unittest.TestCase):
function y(a) { return x() + (a?a:0); }
function z() { return y(3); }
''')
- self.assertEqual(jsi.call_function('z'), 5)
- self.assertEqual(jsi.call_function('y'), 2)
+ self._test(jsi, 5, func='z')
+ self._test(jsi, 2, func='y')
def test_if(self):
- jsi = JSInterpreter('''
- function x() {
+ self._test('''
+ function f() {
let a = 9;
if (0==0) {a++}
return a
- }''')
- self.assertEqual(jsi.call_function('x'), 10)
+ }
+ ''', 10)
- jsi = JSInterpreter('''
- function x() {
+ self._test('''
+ function f() {
if (0==0) {return 10}
- }''')
- self.assertEqual(jsi.call_function('x'), 10)
+ }
+ ''', 10)
- jsi = JSInterpreter('''
- function x() {
+ self._test('''
+ function f() {
if (0!=0) {return 1}
else {return 10}
- }''')
- self.assertEqual(jsi.call_function('x'), 10)
-
- """ # Unsupported
- jsi = JSInterpreter('''
- function x() {
- if (0!=0) return 1;
- else {return 10}
- }''')
- self.assertEqual(jsi.call_function('x'), 10)
- """
+ }
+ ''', 10)
def test_elseif(self):
- jsi = JSInterpreter('''
- function x() {
- if (0!=0) {return 1}
- else if (1==0) {return 2}
- else {return 10}
- }''')
- self.assertEqual(jsi.call_function('x'), 10)
-
- """ # Unsupported
- jsi = JSInterpreter('''
- function x() {
- if (0!=0) return 1;
- else if (1==0) {return 2}
- else {return 10}
- }''')
- self.assertEqual(jsi.call_function('x'), 10)
- # etc
- """
+ self._test('''
+ function f() {
+ if (0!=0) {return 1}
+ else if (1==0) {return 2}
+ else {return 10}
+ }
+ ''', 10)
def test_for_loop(self):
- # function x() { a=0; for (i=0; i-10; i++) {a++} a }
- jsi = JSInterpreter('''
- function x() { a=0; for (i=0; i-10; i++) {a++} return a }
- ''')
- self.assertEqual(jsi.call_function('x'), 10)
+ self._test('function f() { a=0; for (i=0; i-10; i++) {a++} return a }', 10)
def test_while_loop(self):
- # function x() { a=0; while (a<10) {a++} a }
- jsi = JSInterpreter('''
- function x() { a=0; while (a<10) {a++} return a }
- ''')
- self.assertEqual(jsi.call_function('x'), 10)
+ self._test('function f() { a=0; while (a<10) {a++} return a }', 10)
def test_switch(self):
jsi = JSInterpreter('''
- function x(f) { switch(f){
- case 1:f+=1;
- case 2:f+=2;
- case 3:f+=3;break;
- case 4:f+=4;
- default:f=0;
- } return f }
+ function f(x) { switch(x){
+ case 1:x+=1;
+ case 2:x+=2;
+ case 3:x+=3;break;
+ case 4:x+=4;
+ default:x=0;
+ } return x }
''')
- self.assertEqual(jsi.call_function('x', 1), 7)
- self.assertEqual(jsi.call_function('x', 3), 6)
- self.assertEqual(jsi.call_function('x', 5), 0)
+ self._test(jsi, 7, args=[1])
+ self._test(jsi, 6, args=[3])
+ self._test(jsi, 0, args=[5])
def test_switch_default(self):
jsi = JSInterpreter('''
- function x(f) { switch(f){
- case 2: f+=2;
- default: f-=1;
- case 5:
- case 6: f+=6;
- case 0: break;
- case 1: f+=1;
- } return f }
+ function f(x) { switch(x){
+ case 2: x+=2;
+ default: x-=1;
+ case 5:
+ case 6: x+=6;
+ case 0: break;
+ case 1: x+=1;
+ } return x }
''')
- self.assertEqual(jsi.call_function('x', 1), 2)
- self.assertEqual(jsi.call_function('x', 5), 11)
- self.assertEqual(jsi.call_function('x', 9), 14)
+ self._test(jsi, 2, args=[1])
+ self._test(jsi, 11, args=[5])
+ self._test(jsi, 14, args=[9])
def test_try(self):
- jsi = JSInterpreter('''
- function x() { try{return 10} catch(e){return 5} }
- ''')
- self.assertEqual(jsi.call_function('x'), 10)
+ self._test('function f() { try{return 10} catch(e){return 5} }', 10)
def test_catch(self):
- jsi = JSInterpreter('''
- function x() { try{throw 10} catch(e){return 5} }
- ''')
- self.assertEqual(jsi.call_function('x'), 5)
+ self._test('function f() { try{throw 10} catch(e){return 5} }', 5)
def test_finally(self):
- jsi = JSInterpreter('''
- function x() { try{throw 10} finally {return 42} }
- ''')
- self.assertEqual(jsi.call_function('x'), 42)
- jsi = JSInterpreter('''
- function x() { try{throw 10} catch(e){return 5} finally {return 42} }
- ''')
- self.assertEqual(jsi.call_function('x'), 42)
+ self._test('function f() { try{throw 10} finally {return 42} }', 42)
+ self._test('function f() { try{throw 10} catch(e){return 5} finally {return 42} }', 42)
def test_nested_try(self):
- jsi = JSInterpreter('''
- function x() {try {
- try{throw 10} finally {throw 42}
+ self._test('''
+ function f() {try {
+ try{throw 10} finally {throw 42}
} catch(e){return 5} }
- ''')
- self.assertEqual(jsi.call_function('x'), 5)
+ ''', 5)
def test_for_loop_continue(self):
- jsi = JSInterpreter('''
- function x() { a=0; for (i=0; i-10; i++) { continue; a++ } return a }
- ''')
- self.assertEqual(jsi.call_function('x'), 0)
+ self._test('function f() { a=0; for (i=0; i-10; i++) { continue; a++ } return a }', 0)
def test_for_loop_break(self):
- jsi = JSInterpreter('''
- function x() { a=0; for (i=0; i-10; i++) { break; a++ } return a }
- ''')
- self.assertEqual(jsi.call_function('x'), 0)
+ self._test('function f() { a=0; for (i=0; i-10; i++) { break; a++ } return a }', 0)
def test_for_loop_try(self):
- jsi = JSInterpreter('''
- function x() {
- for (i=0; i-10; i++) { try { if (i == 5) throw i} catch {return 10} finally {break} };
- return 42 }
- ''')
- self.assertEqual(jsi.call_function('x'), 42)
+ self._test('''
+ function f() {
+ for (i=0; i-10; i++) { try { if (i == 5) throw i} catch {return 10} finally {break} };
+ return 42 }
+ ''', 42)
def test_literal_list(self):
- jsi = JSInterpreter('''
- function x() { return [1, 2, "asdf", [5, 6, 7]][3] }
- ''')
- self.assertEqual(jsi.call_function('x'), [5, 6, 7])
+ self._test('function f() { return [1, 2, "asdf", [5, 6, 7]][3] }', [5, 6, 7])
def test_comma(self):
- jsi = JSInterpreter('''
- function x() { a=5; a -= 1, a+=3; return a }
- ''')
- self.assertEqual(jsi.call_function('x'), 7)
- jsi = JSInterpreter('''
- function x() { a=5; return (a -= 1, a+=3, a); }
- ''')
- self.assertEqual(jsi.call_function('x'), 7)
+ self._test('function f() { a=5; a -= 1, a+=3; return a }', 7)
+ self._test('function f() { a=5; return (a -= 1, a+=3, a); }', 7)
+ self._test('function f() { return (l=[0,1,2,3], function(a, b){return a+b})((l[1], l[2]), l[3]) }', 5)
- jsi = JSInterpreter('''
- function x() { return (l=[0,1,2,3], function(a, b){return a+b})((l[1], l[2]), l[3]) }
- ''')
- self.assertEqual(jsi.call_function('x'), 5)
+ def test_not(self):
+ self._test('function f() { return ! undefined; }', True)
+ self._test('function f() { return !0; }', True)
+ self._test('function f() { return !!0; }', False)
+ self._test('function f() { return ![]; }', False)
+ self._test('function f() { return !0 !== false; }', True)
def test_void(self):
- jsi = JSInterpreter('''
- function x() { return void 42; }
- ''')
- self.assertEqual(jsi.call_function('x'), None)
+ self._test('function f() { return void 42; }', JS_Undefined)
+
+ def test_typeof(self):
+ self._test('function f() { return typeof undefined; }', 'undefined')
+ self._test('function f() { return typeof NaN; }', 'number')
+ self._test('function f() { return typeof Infinity; }', 'number')
+ self._test('function f() { return typeof true; }', 'boolean')
+ self._test('function f() { return typeof null; }', 'object')
+ self._test('function f() { return typeof "a string"; }', 'string')
+ self._test('function f() { return typeof 42; }', 'number')
+ self._test('function f() { return typeof 42.42; }', 'number')
+ self._test('function f() { var g = function(){}; return typeof g; }', 'function')
+ self._test('function f() { return typeof {key: "value"}; }', 'object')
+ # not yet implemented: Symbol, BigInt
def test_return_function(self):
jsi = JSInterpreter('''
@@ -387,110 +402,71 @@ class TestJSInterpreter(unittest.TestCase):
self.assertEqual(jsi.call_function('x')([]), 1)
def test_null(self):
- jsi = JSInterpreter('''
- function x() { return null; }
- ''')
- self.assertIs(jsi.call_function('x'), None)
-
- jsi = JSInterpreter('''
- function x() { return [null > 0, null < 0, null == 0, null === 0]; }
- ''')
- self.assertEqual(jsi.call_function('x'), [False, False, False, False])
-
- jsi = JSInterpreter('''
- function x() { return [null >= 0, null <= 0]; }
- ''')
- self.assertEqual(jsi.call_function('x'), [True, True])
+ self._test('function f() { return null; }', None)
+ self._test('function f() { return [null > 0, null < 0, null == 0, null === 0]; }',
+ [False, False, False, False])
+ self._test('function f() { return [null >= 0, null <= 0]; }', [True, True])
def test_undefined(self):
- jsi = JSInterpreter('''
- function x() { return undefined === undefined; }
- ''')
- self.assertTrue(jsi.call_function('x'))
-
- jsi = JSInterpreter('''
- function x() { return undefined; }
- ''')
- self.assertIs(jsi.call_function('x'), JS_Undefined)
-
- jsi = JSInterpreter('''
- function x() { let v; return v; }
- ''')
- self.assertIs(jsi.call_function('x'), JS_Undefined)
-
- jsi = JSInterpreter('''
- function x() { return [undefined === undefined, undefined == undefined, undefined < undefined, undefined > undefined]; }
- ''')
- self.assertEqual(jsi.call_function('x'), [True, True, False, False])
-
- jsi = JSInterpreter('''
- function x() { return [undefined === 0, undefined == 0, undefined < 0, undefined > 0]; }
- ''')
- self.assertEqual(jsi.call_function('x'), [False, False, False, False])
-
- jsi = JSInterpreter('''
- function x() { return [undefined >= 0, undefined <= 0]; }
- ''')
- self.assertEqual(jsi.call_function('x'), [False, False])
-
- jsi = JSInterpreter('''
- function x() { return [undefined > null, undefined < null, undefined == null, undefined === null]; }
- ''')
- self.assertEqual(jsi.call_function('x'), [False, False, True, False])
-
- jsi = JSInterpreter('''
- function x() { return [undefined === null, undefined == null, undefined < null, undefined > null]; }
- ''')
- self.assertEqual(jsi.call_function('x'), [False, True, False, False])
-
- jsi = JSInterpreter('''
- function x() { let v; return [42+v, v+42, v**42, 42**v, 0**v]; }
+ self._test('function f() { return undefined === undefined; }', True)
+ self._test('function f() { return undefined; }', JS_Undefined)
+ self._test('function f() { return undefined ?? 42; }', 42)
+ self._test('function f() { let v; return v; }', JS_Undefined)
+ self._test('function f() { let v; return v**0; }', 1)
+ self._test('function f() { let v; return [v>42, v<=42, v&&42, 42&&v]; }',
+ [False, False, JS_Undefined, JS_Undefined])
+
+ self._test('''
+ function f() { return [
+ undefined === undefined,
+ undefined == undefined,
+ undefined == null
+ ]; }
+ ''', [True] * 3)
+ self._test('''
+ function f() { return [
+ undefined < undefined,
+ undefined > undefined,
+ undefined === 0,
+ undefined == 0,
+ undefined < 0,
+ undefined > 0,
+ undefined >= 0,
+ undefined <= 0,
+ undefined > null,
+ undefined < null,
+ undefined === null
+ ]; }
+ ''', [False] * 11)
+
+ jsi = JSInterpreter('''
+ function x() { let v; return [42+v, v+42, v**42, 42**v, 0**v]; }
''')
for y in jsi.call_function('x'):
self.assertTrue(math.isnan(y))
- jsi = JSInterpreter('''
- function x() { let v; return v**0; }
- ''')
- self.assertEqual(jsi.call_function('x'), 1)
-
- jsi = JSInterpreter('''
- function x() { let v; return [v>42, v<=42, v&&42, 42&&v]; }
- ''')
- self.assertEqual(jsi.call_function('x'), [False, False, JS_Undefined, JS_Undefined])
-
- jsi = JSInterpreter('function x(){return undefined ?? 42; }')
- self.assertEqual(jsi.call_function('x'), 42)
-
def test_object(self):
- jsi = JSInterpreter('''
- function x() { return {}; }
- ''')
- self.assertEqual(jsi.call_function('x'), {})
-
- jsi = JSInterpreter('''
- function x() { let a = {m1: 42, m2: 0 }; return [a["m1"], a.m2]; }
- ''')
- self.assertEqual(jsi.call_function('x'), [42, 0])
-
- jsi = JSInterpreter('''
- function x() { let a; return a?.qq; }
- ''')
- self.assertIs(jsi.call_function('x'), JS_Undefined)
-
- jsi = JSInterpreter('''
- function x() { let a = {m1: 42, m2: 0 }; return a?.qq; }
- ''')
- self.assertIs(jsi.call_function('x'), JS_Undefined)
+ self._test('function f() { return {}; }', {})
+ self._test('function f() { let a = {m1: 42, m2: 0 }; return [a["m1"], a.m2]; }', [42, 0])
+ self._test('function f() { let a; return a?.qq; }', JS_Undefined)
+ self._test('function f() { let a = {m1: 42, m2: 0 }; return a?.qq; }', JS_Undefined)
+
+ def test_indexing(self):
+ self._test('function f() { return [1, 2, 3, 4][3]}', 4)
+ self._test('function f() { return [1, [2, [3, [4]]]][1][1][1][0]}', 4)
+ self._test('function f() { var o = {1: 2, 3: 4}; return o[3]}', 4)
+ self._test('function f() { var o = {1: 2, 3: 4}; return o["3"]}', 4)
+ self._test('function f() { return [1, [2, {3: [4]}]][1][1]["3"][0]}', 4)
+ self._test('function f() { return [1, 2, 3, 4].length}', 4)
+ self._test('function f() { var o = {1: 2, 3: 4}; return o.length}', JS_Undefined)
+ self._test('function f() { var o = {1: 2, 3: 4}; o["length"] = 42; return o.length}', 42)
def test_regex(self):
- jsi = JSInterpreter('''
- function x() { let a=/,,[/,913,/](,)}/; }
- ''')
- self.assertIs(jsi.call_function('x'), None)
+ self._test('function f() { let a=/,,[/,913,/](,)}/; }', None)
+ self._test('function f() { let a=/,,[/,913,/](,)}/; return a.source; }', ',,[/,913,/](,)}')
jsi = JSInterpreter('''
- function x() { let a=/,,[/,913,/](,)}/; "".replace(a, ""); return a; }
+ function x() { let a=/,,[/,913,/](,)}/; "".replace(a, ""); return a; }
''')
attrs = set(('findall', 'finditer', 'match', 'scanner', 'search',
'split', 'sub', 'subn'))
@@ -500,94 +476,181 @@ class TestJSInterpreter(unittest.TestCase):
self.assertSetEqual(set(dir(jsi.call_function('x'))) & attrs, attrs)
jsi = JSInterpreter('''
- function x() { let a=/,,[/,913,/](,)}/i; return a; }
+ function x() { let a=/,,[/,913,/](,)}/i; return a; }
''')
self.assertEqual(jsi.call_function('x').flags & ~re.U, re.I)
- jsi = JSInterpreter(r'''
- function x() { let a="data-name".replace("data-", ""); return a }
- ''')
- self.assertEqual(jsi.call_function('x'), 'name')
-
- jsi = JSInterpreter(r'''
- function x() { let a="data-name".replace(new RegExp("^.+-"), ""); return a; }
- ''')
- self.assertEqual(jsi.call_function('x'), 'name')
-
- jsi = JSInterpreter(r'''
- function x() { let a="data-name".replace(/^.+-/, ""); return a; }
- ''')
- self.assertEqual(jsi.call_function('x'), 'name')
-
- jsi = JSInterpreter(r'''
- function x() { let a="data-name".replace(/a/g, "o"); return a; }
- ''')
- self.assertEqual(jsi.call_function('x'), 'doto-nome')
-
- jsi = JSInterpreter(r'''
- function x() { let a="data-name".replaceAll("a", "o"); return a; }
- ''')
- self.assertEqual(jsi.call_function('x'), 'doto-nome')
+ jsi = JSInterpreter(r'function f() { let a=/,][}",],()}(\[)/; return a; }')
+ self.assertEqual(jsi.call_function('f').pattern, r',][}",],()}(\[)')
- jsi = JSInterpreter(r'''
- function x() { let a=[/[)\\]/]; return a[0]; }
- ''')
- self.assertEqual(jsi.call_function('x').pattern, r'[)\\]')
+ jsi = JSInterpreter(r'function f() { let a=[/[)\\]/]; return a[0]; }')
+ self.assertEqual(jsi.call_function('f').pattern, r'[)\\]')
- """ # fails
- jsi = JSInterpreter(r'''
- function x() { let a=100; a/=/[0-9]+/.exec('divide by 20 today')[0]; }
- ''')
- self.assertEqual(jsi.call_function('x'), 5)
- """
+ def test_replace(self):
+ self._test('function f() { let a="data-name".replace("data-", ""); return a }',
+ 'name')
+ self._test('function f() { let a="data-name".replace(new RegExp("^.+-"), ""); return a; }',
+ 'name')
+ self._test('function f() { let a="data-name".replace(/^.+-/, ""); return a; }',
+ 'name')
+ self._test('function f() { let a="data-name".replace(/a/g, "o"); return a; }',
+ 'doto-nome')
+ self._test('function f() { let a="data-name".replaceAll("a", "o"); return a; }',
+ 'doto-nome')
def test_char_code_at(self):
- jsi = JSInterpreter('function x(i){return "test".charCodeAt(i)}')
- self.assertEqual(jsi.call_function('x', 0), 116)
- self.assertEqual(jsi.call_function('x', 1), 101)
- self.assertEqual(jsi.call_function('x', 2), 115)
- self.assertEqual(jsi.call_function('x', 3), 116)
- self.assertEqual(jsi.call_function('x', 4), None)
- self.assertEqual(jsi.call_function('x', 'not_a_number'), 116)
+ jsi = JSInterpreter('function f(i){return "test".charCodeAt(i)}')
+ self._test(jsi, 116, args=[0])
+ self._test(jsi, 101, args=[1])
+ self._test(jsi, 115, args=[2])
+ self._test(jsi, 116, args=[3])
+ self._test(jsi, None, args=[4])
+ self._test(jsi, 116, args=['not_a_number'])
def test_bitwise_operators_overflow(self):
- jsi = JSInterpreter('function x(){return -524999584 << 5}')
- self.assertEqual(jsi.call_function('x'), 379882496)
-
- jsi = JSInterpreter('function x(){return 1236566549 << 5}')
- self.assertEqual(jsi.call_function('x'), 915423904)
+ self._test('function f(){return -524999584 << 5}', 379882496)
+ self._test('function f(){return 1236566549 << 5}', 915423904)
- def test_bitwise_operators_madness(self):
- jsi = JSInterpreter('function x(){return null << 5}')
- self.assertEqual(jsi.call_function('x'), 0)
-
- jsi = JSInterpreter('function x(){return undefined >> 5}')
- self.assertEqual(jsi.call_function('x'), 0)
-
- jsi = JSInterpreter('function x(){return 42 << NaN}')
- self.assertEqual(jsi.call_function('x'), 42)
-
- jsi = JSInterpreter('function x(){return 42 << Infinity}')
- self.assertEqual(jsi.call_function('x'), 42)
+ def test_negative(self):
+ self._test('function f(){return 2 * -2.0 ;}', -4)
+ self._test('function f(){return 2 - - -2 ;}', 0)
+ self._test('function f(){return 2 - - - -2 ;}', 4)
+ self._test('function f(){return 2 - + + - -2;}', 0)
+ self._test('function f(){return 2 + - + - -2;}', 0)
def test_32066(self):
- jsi = JSInterpreter("function x(){return Math.pow(3, 5) + new Date('1970-01-01T08:01:42.000+08:00') / 1000 * -239 - -24205;}")
- self.assertEqual(jsi.call_function('x'), 70)
-
- def test_unary_operators(self):
- jsi = JSInterpreter('function f(){return 2 - - - 2;}')
- self.assertEqual(jsi.call_function('f'), 0)
- jsi = JSInterpreter('function f(){return 2 + - + - - 2;}')
- self.assertEqual(jsi.call_function('f'), 0)
- # https://github.com/ytdl-org/youtube-dl/issues/32815
- jsi = JSInterpreter('function f(){return 0 - 7 * - 6;}')
- self.assertEqual(jsi.call_function('f'), 42)
+ self._test(
+ "function f(){return Math.pow(3, 5) + new Date('1970-01-01T08:01:42.000+08:00') / 1000 * -239 - -24205;}",
+ 70)
- """ # fails so far
+ @unittest.skip('Not yet working')
def test_packed(self):
- jsi = JSInterpreter('''function x(p,a,c,k,e,d){while(c--)if(k[c])p=p.replace(new RegExp('\\b'+c.toString(a)+'\\b','g'),k[c]);return p}''')
- self.assertEqual(jsi.call_function('x', '''h 7=g("1j");7.7h({7g:[{33:"w://7f-7e-7d-7c.v.7b/7a/79/78/77/76.74?t=73&s=2s&e=72&f=2t&71=70.0.0.1&6z=6y&6x=6w"}],6v:"w://32.v.u/6u.31",16:"r%",15:"r%",6t:"6s",6r:"",6q:"l",6p:"l",6o:"6n",6m:\'6l\',6k:"6j",9:[{33:"/2u?b=6i&n=50&6h=w://32.v.u/6g.31",6f:"6e"}],1y:{6d:1,6c:\'#6b\',6a:\'#69\',68:"67",66:30,65:r,},"64":{63:"%62 2m%m%61%5z%5y%5x.u%5w%5v%5u.2y%22 2k%m%1o%22 5t%m%1o%22 5s%m%1o%22 2j%m%5r%22 16%m%5q%22 15%m%5p%22 5o%2z%5n%5m%2z",5l:"w://v.u/d/1k/5k.2y",5j:[]},\'5i\':{"5h":"5g"},5f:"5e",5d:"w://v.u",5c:{},5b:l,1x:[0.25,0.50,0.75,1,1.25,1.5,2]});h 1m,1n,5a;h 59=0,58=0;h 7=g("1j");h 2x=0,57=0,56=0;$.55({54:{\'53-52\':\'2i-51\'}});7.j(\'4z\',6(x){c(5>0&&x.1l>=5&&1n!=1){1n=1;$(\'q.4y\').4x(\'4w\')}});7.j(\'13\',6(x){2x=x.1l});7.j(\'2g\',6(x){2w(x)});7.j(\'4v\',6(){$(\'q.2v\').4u()});6 2w(x){$(\'q.2v\').4t();c(1m)19;1m=1;17=0;c(4s.4r===l){17=1}$.4q(\'/2u?b=4p&2l=1k&4o=2t-4n-4m-2s-4l&4k=&4j=&4i=&17=\'+17,6(2r){$(\'#4h\').4g(2r)});$(\'.3-8-4f-4e:4d("4c")\').2h(6(e){2q();g().4b(0);g().4a(l)});6 2q(){h $14=$("<q />").2p({1l:"49",16:"r%",15:"r%",48:0,2n:0,2o:47,46:"45(10%, 10%, 10%, 0.4)","44-43":"42"});$("<41 />").2p({16:"60%",15:"60%",2o:40,"3z-2n":"3y"}).3x({\'2m\':\'/?b=3w&2l=1k\',\'2k\':\'0\',\'2j\':\'2i\'}).2f($14);$14.2h(6(){$(3v).3u();g().2g()});$14.2f($(\'#1j\'))}g().13(0);}6 3t(){h 9=7.1b(2e);2d.2c(9);c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==2e){2d.2c(\'!!=\'+i);7.1p(i)}}}}7.j(\'3s\',6(){g().1h("/2a/3r.29","3q 10 28",6(){g().13(g().27()+10)},"2b");$("q[26=2b]").23().21(\'.3-20-1z\');g().1h("/2a/3p.29","3o 10 28",6(){h 12=g().27()-10;c(12<0)12=0;g().13(12)},"24");$("q[26=24]").23().21(\'.3-20-1z\');});6 1i(){}7.j(\'3n\',6(){1i()});7.j(\'3m\',6(){1i()});7.j("k",6(y){h 9=7.1b();c(9.n<2)19;$(\'.3-8-3l-3k\').3j(6(){$(\'#3-8-a-k\').1e(\'3-8-a-z\');$(\'.3-a-k\').p(\'o-1f\',\'11\')});7.1h("/3i/3h.3g","3f 3e",6(){$(\'.3-1w\').3d(\'3-8-1v\');$(\'.3-8-1y, .3-8-1x\').p(\'o-1g\',\'11\');c($(\'.3-1w\').3c(\'3-8-1v\')){$(\'.3-a-k\').p(\'o-1g\',\'l\');$(\'.3-a-k\').p(\'o-1f\',\'l\');$(\'.3-8-a\').1e(\'3-8-a-z\');$(\'.3-8-a:1u\').3b(\'3-8-a-z\')}3a{$(\'.3-a-k\').p(\'o-1g\',\'11\');$(\'.3-a-k\').p(\'o-1f\',\'11\');$(\'.3-8-a:1u\').1e(\'3-8-a-z\')}},"39");7.j("38",6(y){1d.37(\'1c\',y.9[y.36].1a)});c(1d.1t(\'1c\')){35("1s(1d.1t(\'1c\'));",34)}});h 18;6 1s(1q){h 9=7.1b();c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==1q){c(i==18){19}18=i;7.1p(i)}}}}',36,270,'|||jw|||function|player|settings|tracks|submenu||if||||jwplayer|var||on|audioTracks|true|3D|length|aria|attr|div|100|||sx|filemoon|https||event|active||false|tt|seek|dd|height|width|adb|current_audio|return|name|getAudioTracks|default_audio|localStorage|removeClass|expanded|checked|addButton|callMeMaybe|vplayer|0fxcyc2ajhp1|position|vvplay|vvad|220|setCurrentAudioTrack|audio_name|for|audio_set|getItem|last|open|controls|playbackRates|captions|rewind|icon|insertAfter||detach|ff00||button|getPosition|sec|png|player8|ff11|log|console|track_name|appendTo|play|click|no|scrolling|frameborder|file_code|src|top|zIndex|css|showCCform|data|1662367683|383371|dl|video_ad|doPlay|prevt|mp4|3E||jpg|thumbs|file|300|setTimeout|currentTrack|setItem|audioTrackChanged|dualSound|else|addClass|hasClass|toggleClass|Track|Audio|svg|dualy|images|mousedown|buttons|topbar|playAttemptFailed|beforePlay|Rewind|fr|Forward|ff|ready|set_audio_track|remove|this|upload_srt|prop|50px|margin|1000001|iframe|center|align|text|rgba|background|1000000|left|absolute|pause|setCurrentCaptions|Upload|contains|item|content|html|fviews|referer|prem|embed|3e57249ef633e0d03bf76ceb8d8a4b65|216|83|hash|view|get|TokenZir|window|hide|show|complete|slow|fadeIn|video_ad_fadein|time||cache|Cache|Content|headers|ajaxSetup|v2done|tott|vastdone2|vastdone1|vvbefore|playbackRateControls|cast|aboutlink|FileMoon|abouttext|UHD|1870|qualityLabels|sites|GNOME_POWER|link|2Fiframe|3C|allowfullscreen|22360|22640|22no|marginheight|marginwidth|2FGNOME_POWER|2F0fxcyc2ajhp1|2Fe|2Ffilemoon|2F|3A||22https|3Ciframe|code|sharing|fontOpacity|backgroundOpacity|Tahoma|fontFamily|303030|backgroundColor|FFFFFF|color|userFontScale|thumbnails|kind|0fxcyc2ajhp10000|url|get_slides|start|startparam|none|preload|html5|primary|hlshtml|androidhls|duration|uniform|stretching|0fxcyc2ajhp1_xt|image|2048|sp|6871|asn|127|srv|43200|_g3XlBcu2lmD9oDexD2NLWSmah2Nu3XcDrl93m9PwXY|m3u8||master|0fxcyc2ajhp1_x|00076|01|hls2|to|s01|delivery|storage|moon|sources|setup'''.split('|')))
- """
+ self._test(
+ '''function f(p,a,c,k,e,d){while(c--)if(k[c])p=p.replace(new RegExp('\\b'+c.toString(a)+'\\b','g'),k[c]);return p}''',
+ '''h 7=g("1j");7.7h({7g:[{33:"w://7f-7e-7d-7c.v.7b/7a/79/78/77/76.74?t=73&s=2s&e=72&f=2t&71=70.0.0.1&6z=6y&6x=6w"}],6v:"w://32.v.u/6u.31",16:"r%",15:"r%",6t:"6s",6r:"",6q:"l",6p:"l",6o:"6n",6m:\'6l\',6k:"6j",9:[{33:"/2u?b=6i&n=50&6h=w://32.v.u/6g.31",6f:"6e"}],1y:{6d:1,6c:\'#6b\',6a:\'#69\',68:"67",66:30,65:r,},"64":{63:"%62 2m%m%61%5z%5y%5x.u%5w%5v%5u.2y%22 2k%m%1o%22 5t%m%1o%22 5s%m%1o%22 2j%m%5r%22 16%m%5q%22 15%m%5p%22 5o%2z%5n%5m%2z",5l:"w://v.u/d/1k/5k.2y",5j:[]},\'5i\':{"5h":"5g"},5f:"5e",5d:"w://v.u",5c:{},5b:l,1x:[0.25,0.50,0.75,1,1.25,1.5,2]});h 1m,1n,5a;h 59=0,58=0;h 7=g("1j");h 2x=0,57=0,56=0;$.55({54:{\'53-52\':\'2i-51\'}});7.j(\'4z\',6(x){c(5>0&&x.1l>=5&&1n!=1){1n=1;$(\'q.4y\').4x(\'4w\')}});7.j(\'13\',6(x){2x=x.1l});7.j(\'2g\',6(x){2w(x)});7.j(\'4v\',6(){$(\'q.2v\').4u()});6 2w(x){$(\'q.2v\').4t();c(1m)19;1m=1;17=0;c(4s.4r===l){17=1}$.4q(\'/2u?b=4p&2l=1k&4o=2t-4n-4m-2s-4l&4k=&4j=&4i=&17=\'+17,6(2r){$(\'#4h\').4g(2r)});$(\'.3-8-4f-4e:4d("4c")\').2h(6(e){2q();g().4b(0);g().4a(l)});6 2q(){h $14=$("<q />").2p({1l:"49",16:"r%",15:"r%",48:0,2n:0,2o:47,46:"45(10%, 10%, 10%, 0.4)","44-43":"42"});$("<41 />").2p({16:"60%",15:"60%",2o:40,"3z-2n":"3y"}).3x({\'2m\':\'/?b=3w&2l=1k\',\'2k\':\'0\',\'2j\':\'2i\'}).2f($14);$14.2h(6(){$(3v).3u();g().2g()});$14.2f($(\'#1j\'))}g().13(0);}6 3t(){h 9=7.1b(2e);2d.2c(9);c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==2e){2d.2c(\'!!=\'+i);7.1p(i)}}}}7.j(\'3s\',6(){g().1h("/2a/3r.29","3q 10 28",6(){g().13(g().27()+10)},"2b");$("q[26=2b]").23().21(\'.3-20-1z\');g().1h("/2a/3p.29","3o 10 28",6(){h 12=g().27()-10;c(12<0)12=0;g().13(12)},"24");$("q[26=24]").23().21(\'.3-20-1z\');});6 1i(){}7.j(\'3n\',6(){1i()});7.j(\'3m\',6(){1i()});7.j("k",6(y){h 9=7.1b();c(9.n<2)19;$(\'.3-8-3l-3k\').3j(6(){$(\'#3-8-a-k\').1e(\'3-8-a-z\');$(\'.3-a-k\').p(\'o-1f\',\'11\')});7.1h("/3i/3h.3g","3f 3e",6(){$(\'.3-1w\').3d(\'3-8-1v\');$(\'.3-8-1y, .3-8-1x\').p(\'o-1g\',\'11\');c($(\'.3-1w\').3c(\'3-8-1v\')){$(\'.3-a-k\').p(\'o-1g\',\'l\');$(\'.3-a-k\').p(\'o-1f\',\'l\');$(\'.3-8-a\').1e(\'3-8-a-z\');$(\'.3-8-a:1u\').3b(\'3-8-a-z\')}3a{$(\'.3-a-k\').p(\'o-1g\',\'11\');$(\'.3-a-k\').p(\'o-1f\',\'11\');$(\'.3-8-a:1u\').1e(\'3-8-a-z\')}},"39");7.j("38",6(y){1d.37(\'1c\',y.9[y.36].1a)});c(1d.1t(\'1c\')){35("1s(1d.1t(\'1c\'));",34)}});h 18;6 1s(1q){h 9=7.1b();c(9.n>1){1r(i=0;i<9.n;i++){c(9[i].1a==1q){c(i==18){19}18=i;7.1p(i)}}}}',36,270,'|||jw|||function|player|settings|tracks|submenu||if||||jwplayer|var||on|audioTracks|true|3D|length|aria|attr|div|100|||sx|filemoon|https||event|active||false|tt|seek|dd|height|width|adb|current_audio|return|name|getAudioTracks|default_audio|localStorage|removeClass|expanded|checked|addButton|callMeMaybe|vplayer|0fxcyc2ajhp1|position|vvplay|vvad|220|setCurrentAudioTrack|audio_name|for|audio_set|getItem|last|open|controls|playbackRates|captions|rewind|icon|insertAfter||detach|ff00||button|getPosition|sec|png|player8|ff11|log|console|track_name|appendTo|play|click|no|scrolling|frameborder|file_code|src|top|zIndex|css|showCCform|data|1662367683|383371|dl|video_ad|doPlay|prevt|mp4|3E||jpg|thumbs|file|300|setTimeout|currentTrack|setItem|audioTrackChanged|dualSound|else|addClass|hasClass|toggleClass|Track|Audio|svg|dualy|images|mousedown|buttons|topbar|playAttemptFailed|beforePlay|Rewind|fr|Forward|ff|ready|set_audio_track|remove|this|upload_srt|prop|50px|margin|1000001|iframe|center|align|text|rgba|background|1000000|left|absolute|pause|setCurrentCaptions|Upload|contains|item|content|html|fviews|referer|prem|embed|3e57249ef633e0d03bf76ceb8d8a4b65|216|83|hash|view|get|TokenZir|window|hide|show|complete|slow|fadeIn|video_ad_fadein|time||cache|Cache|Content|headers|ajaxSetup|v2done|tott|vastdone2|vastdone1|vvbefore|playbackRateControls|cast|aboutlink|FileMoon|abouttext|UHD|1870|qualityLabels|sites|GNOME_POWER|link|2Fiframe|3C|allowfullscreen|22360|22640|22no|marginheight|marginwidth|2FGNOME_POWER|2F0fxcyc2ajhp1|2Fe|2Ffilemoon|2F|3A||22https|3Ciframe|code|sharing|fontOpacity|backgroundOpacity|Tahoma|fontFamily|303030|backgroundColor|FFFFFF|color|userFontScale|thumbnails|kind|0fxcyc2ajhp10000|url|get_slides|start|startparam|none|preload|html5|primary|hlshtml|androidhls|duration|uniform|stretching|0fxcyc2ajhp1_xt|image|2048|sp|6871|asn|127|srv|43200|_g3XlBcu2lmD9oDexD2NLWSmah2Nu3XcDrl93m9PwXY|m3u8||master|0fxcyc2ajhp1_x|00076|01|hls2|to|s01|delivery|storage|moon|sources|setup'''.split('|'))
+
+ def test_join(self):
+ test_input = list('test')
+ tests = [
+ 'function f(a, b){return a.join(b)}',
+ 'function f(a, b){return Array.prototype.join.call(a, b)}',
+ 'function f(a, b){return Array.prototype.join.apply(a, [b])}',
+ ]
+ for test in tests:
+ jsi = JSInterpreter(test)
+ self._test(jsi, 'test', args=[test_input, ''])
+ self._test(jsi, 't-e-s-t', args=[test_input, '-'])
+ self._test(jsi, '', args=[[], '-'])
+
+ self._test('function f(){return '
+ '[1, 1.0, "abc", {a: 1}, null, undefined, Infinity, NaN].join()}',
+ '1,1,abc,[object Object],,,Infinity,NaN')
+ self._test('function f(){return '
+ '[1, 1.0, "abc", {a: 1}, null, undefined, Infinity, NaN].join("~")}',
+ '1~1~abc~[object Object]~~~Infinity~NaN')
+
+ def test_split(self):
+ test_result = list('test')
+ tests = [
+ 'function f(a, b){return a.split(b)}',
+ 'function f(a, b){return a["split"](b)}',
+ 'function f(a, b){let x = ["split"]; return a[x[0]](b)}',
+ 'function f(a, b){return String.prototype.split.call(a, b)}',
+ 'function f(a, b){return String.prototype.split.apply(a, [b])}',
+ ]
+ for test in tests:
+ jsi = JSInterpreter(test)
+ self._test(jsi, test_result, args=['test', ''])
+ self._test(jsi, test_result, args=['t-e-s-t', '-'])
+ self._test(jsi, [''], args=['', '-'])
+ self._test(jsi, [], args=['', ''])
+ # RegExp split
+ self._test('function f(){return "test".split(/(?:)/)}',
+ ['t', 'e', 's', 't'])
+ self._test('function f(){return "t-e-s-t".split(/[es-]+/)}',
+ ['t', 't'])
+ # from MDN: surrogate pairs aren't handled: case 1 fails
+ # self._test('function f(){return "๐Ÿ˜„๐Ÿ˜„".split(/(?:)/)}',
+ # ['\ud83d', '\ude04', '\ud83d', '\ude04'])
+ # case 2 beats Py3.2: it gets the case 1 result
+ if sys.version_info >= (2, 6) and not ((3, 0) <= sys.version_info < (3, 3)):
+ self._test('function f(){return "๐Ÿ˜„๐Ÿ˜„".split(/(?:)/u)}',
+ ['๐Ÿ˜„', '๐Ÿ˜„'])
+
+ def test_slice(self):
+ self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice()}', [0, 1, 2, 3, 4, 5, 6, 7, 8])
+ self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(0)}', [0, 1, 2, 3, 4, 5, 6, 7, 8])
+ self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(5)}', [5, 6, 7, 8])
+ self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(99)}', [])
+ self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-2)}', [7, 8])
+ self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-99)}', [0, 1, 2, 3, 4, 5, 6, 7, 8])
+ self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(0, 0)}', [])
+ self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(1, 0)}', [])
+ self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(0, 1)}', [0])
+ self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(3, 6)}', [3, 4, 5])
+ self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(1, -1)}', [1, 2, 3, 4, 5, 6, 7])
+ self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-1, 1)}', [])
+ self._test('function f(){return [0, 1, 2, 3, 4, 5, 6, 7, 8].slice(-3, -1)}', [6, 7])
+ self._test('function f(){return "012345678".slice()}', '012345678')
+ self._test('function f(){return "012345678".slice(0)}', '012345678')
+ self._test('function f(){return "012345678".slice(5)}', '5678')
+ self._test('function f(){return "012345678".slice(99)}', '')
+ self._test('function f(){return "012345678".slice(-2)}', '78')
+ self._test('function f(){return "012345678".slice(-99)}', '012345678')
+ self._test('function f(){return "012345678".slice(0, 0)}', '')
+ self._test('function f(){return "012345678".slice(1, 0)}', '')
+ self._test('function f(){return "012345678".slice(0, 1)}', '0')
+ self._test('function f(){return "012345678".slice(3, 6)}', '345')
+ self._test('function f(){return "012345678".slice(1, -1)}', '1234567')
+ self._test('function f(){return "012345678".slice(-1, 1)}', '')
+ self._test('function f(){return "012345678".slice(-3, -1)}', '67')
+
+ def test_splice(self):
+ self._test('function f(){var T = ["0", "1", "2"]; T["splice"](2, 1, "0")[0]; return T }', ['0', '1', '0'])
+
+ def test_pop(self):
+ # pop
+ self._test('function f(){var a = [0, 1, 2, 3, 4, 5, 6, 7, 8]; return [a.pop(), a]}',
+ [8, [0, 1, 2, 3, 4, 5, 6, 7]])
+ self._test('function f(){return [].pop()}', JS_Undefined)
+ # push
+ self._test('function f(){var a = [0, 1, 2]; return [a.push(3, 4), a]}',
+ [5, [0, 1, 2, 3, 4]])
+ self._test('function f(){var a = [0, 1, 2]; return [a.push(), a]}',
+ [3, [0, 1, 2]])
+
+ def test_shift(self):
+ # shift
+ self._test('function f(){var a = [0, 1, 2, 3, 4, 5, 6, 7, 8]; return [a.shift(), a]}',
+ [0, [1, 2, 3, 4, 5, 6, 7, 8]])
+ self._test('function f(){return [].shift()}', JS_Undefined)
+ # unshift
+ self._test('function f(){var a = [0, 1, 2]; return [a.unshift(3, 4), a]}',
+ [5, [3, 4, 0, 1, 2]])
+ self._test('function f(){var a = [0, 1, 2]; return [a.unshift(), a]}',
+ [3, [0, 1, 2]])
+
+ def test_forEach(self):
+ self._test('function f(){var ret = []; var l = [4, 2]; '
+ 'var log = function(e,i,a){ret.push([e,i,a]);}; '
+ 'l.forEach(log); '
+ 'return [ret.length, ret[0][0], ret[1][1], ret[0][2]]}',
+ [2, 4, 1, [4, 2]])
+ self._test('function f(){var ret = []; var l = [4, 2]; '
+ 'var log = function(e,i,a){this.push([e,i,a]);}; '
+ 'l.forEach(log, ret); '
+ 'return [ret.length, ret[0][0], ret[1][1], ret[0][2]]}',
+ [2, 4, 1, [4, 2]])
+
+ def test_extract_function(self):
+ jsi = JSInterpreter('function a(b) { return b + 1; }')
+ func = jsi.extract_function('a')
+ self.assertEqual(func([2]), 3)
+
+ def test_extract_function_with_global_stack(self):
+ jsi = JSInterpreter('function c(d) { return d + e + f + g; }')
+ func = jsi.extract_function('c', {'e': 10}, {'f': 100, 'g': 1000})
+ self.assertEqual(func([1]), 1111)
if __name__ == '__main__':
diff --git a/test/test_traversal.py b/test/test_traversal.py
index 00a428edb..504cdee37 100644
--- a/test/test_traversal.py
+++ b/test/test_traversal.py
@@ -9,21 +9,32 @@ import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+import itertools
import re
from youtube_dl.traversal import (
dict_get,
get_first,
+ require,
+ subs_list_to_dict,
T,
traverse_obj,
+ unpack,
+ value,
)
from youtube_dl.compat import (
+ compat_chr as chr,
compat_etree_fromstring,
compat_http_cookies,
+ compat_map as map,
compat_str,
+ compat_zip as zip,
)
from youtube_dl.utils import (
+ determine_ext,
+ ExtractorError,
int_or_none,
+ join_nonempty,
str_or_none,
)
@@ -446,42 +457,164 @@ class TestTraversal(_TestCase):
msg='`any` should allow further branching')
def test_traversal_morsel(self):
- values = {
- 'expires': 'a',
- 'path': 'b',
- 'comment': 'c',
- 'domain': 'd',
- 'max-age': 'e',
- 'secure': 'f',
- 'httponly': 'g',
- 'version': 'h',
- 'samesite': 'i',
- }
- # SameSite added in Py3.8, breaks .update for 3.5-3.7
- if sys.version_info < (3, 8):
- del values['samesite']
morsel = compat_http_cookies.Morsel()
+ # SameSite added in Py3.8, breaks .update for 3.5-3.7
+ # Similarly Partitioned, Py3.14, thx Grub4k
+ values = dict(zip(morsel, map(chr, itertools.count(ord('a')))))
morsel.set(str('item_key'), 'item_value', 'coded_value')
morsel.update(values)
- values['key'] = str('item_key')
- values['value'] = 'item_value'
+ values.update({
+ 'key': str('item_key'),
+ 'value': 'item_value',
+ }),
values = dict((str(k), v) for k, v in values.items())
- # make test pass even without ordered dict
- value_set = set(values.values())
- for key, value in values.items():
- self.assertEqual(traverse_obj(morsel, key), value,
+ for key, val in values.items():
+ self.assertEqual(traverse_obj(morsel, key), val,
msg='Morsel should provide access to all values')
- self.assertEqual(set(traverse_obj(morsel, Ellipsis)), value_set,
- msg='`...` should yield all values')
- self.assertEqual(set(traverse_obj(morsel, lambda k, v: True)), value_set,
- msg='function key should yield all values')
+ values = list(values.values())
+ self.assertMaybeCountEqual(traverse_obj(morsel, Ellipsis), values,
+ msg='`...` should yield all values')
+ self.assertMaybeCountEqual(traverse_obj(morsel, lambda k, v: True), values,
+ msg='function key should yield all values')
self.assertIs(traverse_obj(morsel, [(None,), any]), morsel,
msg='Morsel should not be implicitly changed to dict on usage')
- def test_get_first(self):
- self.assertEqual(get_first([{'a': None}, {'a': 'spam'}], 'a'), 'spam')
-
+ def test_traversal_filter(self):
+ data = [None, False, True, 0, 1, 0.0, 1.1, '', 'str', {}, {0: 0}, [], [1]]
+
+ self.assertEqual(
+ traverse_obj(data, (Ellipsis, filter)),
+ [True, 1, 1.1, 'str', {0: 0}, [1]],
+ '`filter` should filter falsy values')
+
+
+class TestTraversalHelpers(_TestCase):
+ def test_traversal_require(self):
+ with self.assertRaises(ExtractorError, msg='Missing `value` should raise'):
+ traverse_obj(_TEST_DATA, ('None', T(require('value'))))
+ self.assertEqual(
+ traverse_obj(_TEST_DATA, ('str', T(require('value')))), 'str',
+ '`require` should pass through non-`None` values')
+
+ def test_subs_list_to_dict(self):
+ self.assertEqual(traverse_obj([
+ {'name': 'de', 'url': 'https://example.com/subs/de.vtt'},
+ {'name': 'en', 'url': 'https://example.com/subs/en1.ass'},
+ {'name': 'en', 'url': 'https://example.com/subs/en2.ass'},
+ ], [Ellipsis, {
+ 'id': 'name',
+ 'url': 'url',
+ }, all, T(subs_list_to_dict)]), {
+ 'de': [{'url': 'https://example.com/subs/de.vtt'}],
+ 'en': [
+ {'url': 'https://example.com/subs/en1.ass'},
+ {'url': 'https://example.com/subs/en2.ass'},
+ ],
+ }, 'function should build subtitle dict from list of subtitles')
+ self.assertEqual(traverse_obj([
+ {'name': 'de', 'url': 'https://example.com/subs/de.ass'},
+ {'name': 'de'},
+ {'name': 'en', 'content': 'content'},
+ {'url': 'https://example.com/subs/en'},
+ ], [Ellipsis, {
+ 'id': 'name',
+ 'data': 'content',
+ 'url': 'url',
+ }, all, T(subs_list_to_dict(lang=None))]), {
+ 'de': [{'url': 'https://example.com/subs/de.ass'}],
+ 'en': [{'data': 'content'}],
+ }, 'subs with mandatory items missing should be filtered')
+ self.assertEqual(traverse_obj([
+ {'url': 'https://example.com/subs/de.ass', 'name': 'de'},
+ {'url': 'https://example.com/subs/en', 'name': 'en'},
+ ], [Ellipsis, {
+ 'id': 'name',
+ 'ext': ['url', T(determine_ext(default_ext=None))],
+ 'url': 'url',
+ }, all, T(subs_list_to_dict(ext='ext'))]), {
+ 'de': [{'url': 'https://example.com/subs/de.ass', 'ext': 'ass'}],
+ 'en': [{'url': 'https://example.com/subs/en', 'ext': 'ext'}],
+ }, '`ext` should set default ext but leave existing value untouched')
+ self.assertEqual(traverse_obj([
+ {'name': 'en', 'url': 'https://example.com/subs/en2', 'prio': True},
+ {'name': 'en', 'url': 'https://example.com/subs/en1', 'prio': False},
+ ], [Ellipsis, {
+ 'id': 'name',
+ 'quality': ['prio', T(int)],
+ 'url': 'url',
+ }, all, T(subs_list_to_dict(ext='ext'))]), {'en': [
+ {'url': 'https://example.com/subs/en1', 'ext': 'ext'},
+ {'url': 'https://example.com/subs/en2', 'ext': 'ext'},
+ ]}, '`quality` key should sort subtitle list accordingly')
+ self.assertEqual(traverse_obj([
+ {'name': 'de', 'url': 'https://example.com/subs/de.ass'},
+ {'name': 'de'},
+ {'name': 'en', 'content': 'content'},
+ {'url': 'https://example.com/subs/en'},
+ ], [Ellipsis, {
+ 'id': 'name',
+ 'url': 'url',
+ 'data': 'content',
+ }, all, T(subs_list_to_dict(lang='en'))]), {
+ 'de': [{'url': 'https://example.com/subs/de.ass'}],
+ 'en': [
+ {'data': 'content'},
+ {'url': 'https://example.com/subs/en'},
+ ],
+ }, 'optionally provided lang should be used if no id available')
+ self.assertEqual(traverse_obj([
+ {'name': 1, 'url': 'https://example.com/subs/de1'},
+ {'name': {}, 'url': 'https://example.com/subs/de2'},
+ {'name': 'de', 'ext': 1, 'url': 'https://example.com/subs/de3'},
+ {'name': 'de', 'ext': {}, 'url': 'https://example.com/subs/de4'},
+ ], [Ellipsis, {
+ 'id': 'name',
+ 'url': 'url',
+ 'ext': 'ext',
+ }, all, T(subs_list_to_dict(lang=None))]), {
+ 'de': [
+ {'url': 'https://example.com/subs/de3'},
+ {'url': 'https://example.com/subs/de4'},
+ ],
+ }, 'non str types should be ignored for id and ext')
+ self.assertEqual(traverse_obj([
+ {'name': 1, 'url': 'https://example.com/subs/de1'},
+ {'name': {}, 'url': 'https://example.com/subs/de2'},
+ {'name': 'de', 'ext': 1, 'url': 'https://example.com/subs/de3'},
+ {'name': 'de', 'ext': {}, 'url': 'https://example.com/subs/de4'},
+ ], [Ellipsis, {
+ 'id': 'name',
+ 'url': 'url',
+ 'ext': 'ext',
+ }, all, T(subs_list_to_dict(lang='de'))]), {
+ 'de': [
+ {'url': 'https://example.com/subs/de1'},
+ {'url': 'https://example.com/subs/de2'},
+ {'url': 'https://example.com/subs/de3'},
+ {'url': 'https://example.com/subs/de4'},
+ ],
+ }, 'non str types should be replaced by default id')
+
+ def test_unpack(self):
+ self.assertEqual(
+ unpack(lambda *x: ''.join(map(compat_str, x)))([1, 2, 3]), '123')
+ self.assertEqual(
+ unpack(join_nonempty)([1, 2, 3]), '1-2-3')
+ self.assertEqual(
+ unpack(join_nonempty, delim=' ')([1, 2, 3]), '1 2 3')
+ with self.assertRaises(TypeError):
+ unpack(join_nonempty)()
+ with self.assertRaises(TypeError):
+ unpack()
+
+ def test_value(self):
+ self.assertEqual(
+ traverse_obj(_TEST_DATA, ('str', T(value('other')))), 'other',
+ '`value` should substitute specified value')
+
+
+class TestDictGet(_TestCase):
def test_dict_get(self):
FALSE_VALUES = {
'none': None,
@@ -504,6 +637,9 @@ class TestTraversal(_TestCase):
self.assertEqual(dict_get(d, ('b', 'c', key, )), None)
self.assertEqual(dict_get(d, ('b', 'c', key, ), skip_false_values=False), false_value)
+ def test_get_first(self):
+ self.assertEqual(get_first([{'a': None}, {'a': 'spam'}], 'a'), 'spam')
+
if __name__ == '__main__':
unittest.main()
diff --git a/test/test_utils.py b/test/test_utils.py
index 2947cce7e..1106f2819 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -69,6 +69,7 @@ from youtube_dl.utils import (
parse_iso8601,
parse_resolution,
parse_qs,
+ partial_application,
pkcs1pad,
prepend_extension,
read_batch_urls,
@@ -664,6 +665,8 @@ class TestUtil(unittest.TestCase):
self.assertEqual(parse_duration('3h 11m 53s'), 11513)
self.assertEqual(parse_duration('3 hours 11 minutes 53 seconds'), 11513)
self.assertEqual(parse_duration('3 hours 11 mins 53 secs'), 11513)
+ self.assertEqual(parse_duration('3 hours, 11 minutes, 53 seconds'), 11513)
+ self.assertEqual(parse_duration('3 hours, 11 mins, 53 secs'), 11513)
self.assertEqual(parse_duration('62m45s'), 3765)
self.assertEqual(parse_duration('6m59s'), 419)
self.assertEqual(parse_duration('49s'), 49)
@@ -682,6 +685,10 @@ class TestUtil(unittest.TestCase):
self.assertEqual(parse_duration('PT1H0.040S'), 3600.04)
self.assertEqual(parse_duration('PT00H03M30SZ'), 210)
self.assertEqual(parse_duration('P0Y0M0DT0H4M20.880S'), 260.88)
+ self.assertEqual(parse_duration('01:02:03:050'), 3723.05)
+ self.assertEqual(parse_duration('103:050'), 103.05)
+ self.assertEqual(parse_duration('1HR 3MIN'), 3780)
+ self.assertEqual(parse_duration('2hrs 3mins'), 7380)
def test_fix_xml_ampersands(self):
self.assertEqual(
@@ -895,6 +902,30 @@ class TestUtil(unittest.TestCase):
'vcodec': 'av01.0.05M.08',
'acodec': 'none',
})
+ self.assertEqual(parse_codecs('vp9.2'), {
+ 'vcodec': 'vp9.2',
+ 'acodec': 'none',
+ 'dynamic_range': 'HDR10',
+ })
+ self.assertEqual(parse_codecs('vp09.02.50.10.01.09.18.09.00'), {
+ 'vcodec': 'vp09.02.50.10.01.09.18.09.00',
+ 'acodec': 'none',
+ 'dynamic_range': 'HDR10',
+ })
+ self.assertEqual(parse_codecs('av01.0.12M.10.0.110.09.16.09.0'), {
+ 'vcodec': 'av01.0.12M.10.0.110.09.16.09.0',
+ 'acodec': 'none',
+ 'dynamic_range': 'HDR10',
+ })
+ self.assertEqual(parse_codecs('dvhe'), {
+ 'vcodec': 'dvhe',
+ 'acodec': 'none',
+ 'dynamic_range': 'DV',
+ })
+ self.assertEqual(parse_codecs('fLaC'), {
+ 'vcodec': 'none',
+ 'acodec': 'flac',
+ })
self.assertEqual(parse_codecs('theora, vorbis'), {
'vcodec': 'theora',
'acodec': 'vorbis',
@@ -1723,6 +1754,21 @@ Line 1
'a', 'b', 'c', 'd',
from_dict={'a': 'c', 'c': [], 'b': 'd', 'd': None}), 'c-d')
+ def test_partial_application(self):
+ test_fn = partial_application(lambda x, kwarg=None: '{0}, kwarg={1!r}'.format(x, kwarg))
+ self.assertTrue(
+ callable(test_fn(kwarg=10)),
+ 'missing positional parameter should apply partially')
+ self.assertEqual(
+ test_fn(10, kwarg=42), '10, kwarg=42',
+ 'positionally passed argument should call function')
+ self.assertEqual(
+ test_fn(x=10), '10, kwarg=None',
+ 'keyword passed positional should call function')
+ self.assertEqual(
+ test_fn(kwarg=42)(10), '10, kwarg=42',
+ 'call after partial application should call the function')
+
if __name__ == '__main__':
unittest.main()
diff --git a/test/test_youtube_signature.py b/test/test_youtube_signature.py
index cafba7a5c..98221b9c2 100644
--- a/test/test_youtube_signature.py
+++ b/test/test_youtube_signature.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+# coding: utf-8
from __future__ import unicode_literals
@@ -12,6 +13,7 @@ import re
import string
from youtube_dl.compat import (
+ compat_contextlib_suppress,
compat_open as open,
compat_str,
compat_urlretrieve,
@@ -50,23 +52,93 @@ _SIG_TESTS = [
(
'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflBb0OQx.js',
84,
- '123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQ0STUVWXYZ!"#$%&\'()*+,@./:;<=>'
+ '123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQ0STUVWXYZ!"#$%&\'()*+,@./:;<=>',
),
(
'https://s.ytimg.com/yts/jsbin/html5player-en_US-vfl9FYC6l.js',
83,
- '123456789abcdefghijklmnopqr0tuvwxyzABCDETGHIJKLMNOPQRS>UVWXYZ!"#$%&\'()*+,-./:;<=F'
+ '123456789abcdefghijklmnopqr0tuvwxyzABCDETGHIJKLMNOPQRS>UVWXYZ!"#$%&\'()*+,-./:;<=F',
),
(
'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflCGk6yw/html5player.js',
'4646B5181C6C3020DF1D9C7FCFEA.AD80ABF70C39BD369CCCAE780AFBB98FA6B6CB42766249D9488C288',
- '82C8849D94266724DC6B6AF89BBFA087EACCD963.B93C07FBA084ACAEFCF7C9D1FD0203C6C1815B6B'
+ '82C8849D94266724DC6B6AF89BBFA087EACCD963.B93C07FBA084ACAEFCF7C9D1FD0203C6C1815B6B',
),
(
'https://s.ytimg.com/yts/jsbin/html5player-en_US-vflKjOTVq/html5player.js',
'312AA52209E3623129A412D56A40F11CB0AF14AE.3EE09501CB14E3BCDC3B2AE808BF3F1D14E7FBF12',
'112AA5220913623229A412D56A40F11CB0AF14AE.3EE0950FCB14EEBCDC3B2AE808BF331D14E7FBF3',
- )
+ ),
+ (
+ 'https://www.youtube.com/s/player/6ed0d907/player_ias.vflset/en_US/base.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ 'AOq0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xx8j7v1pDL2QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0',
+ ),
+ (
+ 'https://www.youtube.com/s/player/3bb1f723/player_ias.vflset/en_US/base.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ 'MyOSJXtKI3m-uME_jv7-pT12gOFC02RFkGoqWpzE0Cs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ ),
+ (
+ 'https://www.youtube.com/s/player/2f1832d2/player_ias.vflset/en_US/base.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ '0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xxAj7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJ2OySqa0q',
+ ),
+ (
+ 'https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ 'AAOAOq0QJ8wRAIgXmPlOPSBkkUs1bYFYlJCfe29xx8j7vgpDL0QwbdV06sCIEzpWqMGkFR20CFOS21Tp-7vj_EMu-m37KtXJoOy1',
+ ),
+ (
+ 'https://www.youtube.com/s/player/363db69b/player_ias.vflset/en_US/base.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ '0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpz2ICs6EVdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ ),
+ (
+ 'https://www.youtube.com/s/player/363db69b/player_ias_tce.vflset/en_US/base.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ '0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpz2ICs6EVdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ ),
+ (
+ 'https://www.youtube.com/s/player/4fcd6e4a/player_ias.vflset/en_US/base.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ 'wAOAOq0QJ8ARAIgXmPlOPSBkkUs1bYFYlJCfe29xx8q7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0',
+ ),
+ (
+ 'https://www.youtube.com/s/player/4fcd6e4a/player_ias_tce.vflset/en_US/base.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ 'wAOAOq0QJ8ARAIgXmPlOPSBkkUs1bYFYlJCfe29xx8q7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0',
+ ),
+ (
+ 'https://www.youtube.com/s/player/20830619/player_ias.vflset/en_US/base.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
+ ),
+ (
+ 'https://www.youtube.com/s/player/20830619/player_ias_tce.vflset/en_US/base.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
+ ),
+ (
+ 'https://www.youtube.com/s/player/20830619/player-plasma-ias-phone-en_US.vflset/base.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
+ ),
+ (
+ 'https://www.youtube.com/s/player/20830619/player-plasma-ias-tablet-en_US.vflset/base.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ '7AOq0QJ8wRAIgXmPlOPSBkkAs1bYFYlJCfe29xx8jOv1pDL0Q2bdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_EMu-m37KtXJoOySqa0qaw',
+ ),
+ (
+ 'https://www.youtube.com/s/player/8a8ac953/player_ias_tce.vflset/en_US/base.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ 'IAOAOq0QJ8wRAAgXmPlOPSBkkUs1bYFYlJCfe29xx8j7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_E2u-m37KtXJoOySqa0',
+ ),
+ (
+ 'https://www.youtube.com/s/player/8a8ac953/tv-player-es6.vflset/tv-player-es6.js',
+ '2aq0aqSyOoJXtK73m-uME_jv7-pT15gOFC02RFkGMqWpzEICs69VdbwQ0LDp1v7j8xx92efCJlYFYb1sUkkBSPOlPmXgIARw8JQ0qOAOAA',
+ 'IAOAOq0QJ8wRAAgXmPlOPSBkkUs1bYFYlJCfe29xx8j7v1pDL0QwbdV96sCIEzpWqMGkFR20CFOg51Tp-7vj_E2u-m37KtXJoOySqa0',
+ ),
]
_NSIG_TESTS = [
@@ -136,13 +208,17 @@ _NSIG_TESTS = [
),
(
'https://www.youtube.com/s/player/c57c113c/player_ias.vflset/en_US/base.js',
- '-Txvy6bT5R6LqgnQNx', 'dcklJCnRUHbgSg',
+ 'M92UUMHa8PdvPd3wyM', '3hPqLJsiNZx7yA',
),
(
'https://www.youtube.com/s/player/5a3b6271/player_ias.vflset/en_US/base.js',
'B2j7f_UPT4rfje85Lu_e', 'm5DmNymaGQ5RdQ',
),
(
+ 'https://www.youtube.com/s/player/7a062b77/player_ias.vflset/en_US/base.js',
+ 'NRcE3y3mVtm_cV-W', 'VbsCYUATvqlt5w',
+ ),
+ (
'https://www.youtube.com/s/player/dac945fd/player_ias.vflset/en_US/base.js',
'o8BkRxXhuYsBCWi6RplPdP', '3Lx32v_hmzTm6A',
),
@@ -152,7 +228,11 @@ _NSIG_TESTS = [
),
(
'https://www.youtube.com/s/player/cfa9e7cb/player_ias.vflset/en_US/base.js',
- 'qO0NiMtYQ7TeJnfFG2', 'k9cuJDHNS5O7kQ',
+ 'aCi3iElgd2kq0bxVbQ', 'QX1y8jGb2IbZ0w',
+ ),
+ (
+ 'https://www.youtube.com/s/player/8c7583ff/player_ias.vflset/en_US/base.js',
+ '1wWCVpRR96eAmMI87L', 'KSkWAVv1ZQxC3A',
),
(
'https://www.youtube.com/s/player/b7910ca8/player_ias.vflset/en_US/base.js',
@@ -162,6 +242,114 @@ _NSIG_TESTS = [
'https://www.youtube.com/s/player/590f65a6/player_ias.vflset/en_US/base.js',
'1tm7-g_A9zsI8_Lay_', 'xI4Vem4Put_rOg',
),
+ (
+ 'https://www.youtube.com/s/player/b22ef6e7/player_ias.vflset/en_US/base.js',
+ 'b6HcntHGkvBLk_FRf', 'kNPW6A7FyP2l8A',
+ ),
+ (
+ 'https://www.youtube.com/s/player/3400486c/player_ias.vflset/en_US/base.js',
+ 'lL46g3XifCKUZn1Xfw', 'z767lhet6V2Skl',
+ ),
+ (
+ 'https://www.youtube.com/s/player/5604538d/player_ias.vflset/en_US/base.js',
+ '7X-he4jjvMx7BCX', 'sViSydX8IHtdWA',
+ ),
+ (
+ 'https://www.youtube.com/s/player/20dfca59/player_ias.vflset/en_US/base.js',
+ '-fLCxedkAk4LUTK2', 'O8kfRq1y1eyHGw',
+ ),
+ (
+ 'https://www.youtube.com/s/player/b12cc44b/player_ias.vflset/en_US/base.js',
+ 'keLa5R2U00sR9SQK', 'N1OGyujjEwMnLw',
+ ),
+ (
+ 'https://www.youtube.com/s/player/3bb1f723/player_ias.vflset/en_US/base.js',
+ 'gK15nzVyaXE9RsMP3z', 'ZFFWFLPWx9DEgQ',
+ ),
+ (
+ 'https://www.youtube.com/s/player/f8f53e1a/player_ias.vflset/en_US/base.js',
+ 'VTQOUOv0mCIeJ7i8kZB', 'kcfD8wy0sNLyNQ',
+ ),
+ (
+ 'https://www.youtube.com/s/player/2f1832d2/player_ias.vflset/en_US/base.js',
+ 'YWt1qdbe8SAfkoPHW5d', 'RrRjWQOJmBiP',
+ ),
+ (
+ 'https://www.youtube.com/s/player/9c6dfc4a/player_ias.vflset/en_US/base.js',
+ 'jbu7ylIosQHyJyJV', 'uwI0ESiynAmhNg',
+ ),
+ (
+ 'https://www.youtube.com/s/player/f6e09c70/player_ias.vflset/en_US/base.js',
+ 'W9HJZKktxuYoDTqW', 'jHbbkcaxm54',
+ ),
+ (
+ 'https://www.youtube.com/s/player/f6e09c70/player_ias_tce.vflset/en_US/base.js',
+ 'W9HJZKktxuYoDTqW', 'jHbbkcaxm54',
+ ),
+ (
+ 'https://www.youtube.com/s/player/e7567ecf/player_ias_tce.vflset/en_US/base.js',
+ 'Sy4aDGc0VpYRR9ew_', '5UPOT1VhoZxNLQ',
+ ),
+ (
+ 'https://www.youtube.com/s/player/d50f54ef/player_ias_tce.vflset/en_US/base.js',
+ 'Ha7507LzRmH3Utygtj', 'XFTb2HoeOE5MHg',
+ ),
+ (
+ 'https://www.youtube.com/s/player/074a8365/player_ias_tce.vflset/en_US/base.js',
+ 'Ha7507LzRmH3Utygtj', 'ufTsrE0IVYrkl8v',
+ ),
+ (
+ 'https://www.youtube.com/s/player/643afba4/player_ias.vflset/en_US/base.js',
+ 'N5uAlLqm0eg1GyHO', 'dCBQOejdq5s-ww',
+ ),
+ (
+ 'https://www.youtube.com/s/player/69f581a5/tv-player-ias.vflset/tv-player-ias.js',
+ '-qIP447rVlTTwaZjY', 'KNcGOksBAvwqQg',
+ ),
+ (
+ 'https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js',
+ 'ir9-V6cdbCiyKxhr', '2PL7ZDYAALMfmA',
+ ),
+ (
+ 'https://www.youtube.com/s/player/643afba4/player_ias.vflset/en_US/base.js',
+ 'ir9-V6cdbCiyKxhr', '2PL7ZDYAALMfmA',
+ ),
+ (
+ 'https://www.youtube.com/s/player/363db69b/player_ias.vflset/en_US/base.js',
+ 'eWYu5d5YeY_4LyEDc', 'XJQqf-N7Xra3gg',
+ ),
+ (
+ 'https://www.youtube.com/s/player/4fcd6e4a/player_ias.vflset/en_US/base.js',
+ 'o_L251jm8yhZkWtBW', 'lXoxI3XvToqn6A',
+ ),
+ (
+ 'https://www.youtube.com/s/player/4fcd6e4a/tv-player-ias.vflset/tv-player-ias.js',
+ 'o_L251jm8yhZkWtBW', 'lXoxI3XvToqn6A',
+ ),
+ (
+ 'https://www.youtube.com/s/player/20830619/tv-player-ias.vflset/tv-player-ias.js',
+ 'ir9-V6cdbCiyKxhr', '9YE85kNjZiS4',
+ ),
+ (
+ 'https://www.youtube.com/s/player/20830619/player-plasma-ias-phone-en_US.vflset/base.js',
+ 'ir9-V6cdbCiyKxhr', '9YE85kNjZiS4',
+ ),
+ (
+ 'https://www.youtube.com/s/player/20830619/player-plasma-ias-tablet-en_US.vflset/base.js',
+ 'ir9-V6cdbCiyKxhr', '9YE85kNjZiS4',
+ ),
+ (
+ 'https://www.youtube.com/s/player/8a8ac953/player_ias_tce.vflset/en_US/base.js',
+ 'MiBYeXx_vRREbiCCmh', 'RtZYMVvmkE0JE',
+ ),
+ (
+ 'https://www.youtube.com/s/player/8a8ac953/tv-player-es6.vflset/tv-player-es6.js',
+ 'MiBYeXx_vRREbiCCmh', 'RtZYMVvmkE0JE',
+ ),
+ (
+ 'https://www.youtube.com/s/player/aa3fc80b/player_ias.vflset/en_US/base.js',
+ '0qY9dal2uzOnOGwa-48hha', 'VSh1KDfQMk-eag',
+ ),
]
@@ -174,6 +362,8 @@ class TestPlayerInfo(unittest.TestCase):
('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-en_US.vflset/base.js', '64dddad9'),
('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-phone-de_DE.vflset/base.js', '64dddad9'),
('https://www.youtube.com/s/player/64dddad9/player-plasma-ias-tablet-en_US.vflset/base.js', '64dddad9'),
+ ('https://www.youtube.com/s/player/e7567ecf/player_ias_tce.vflset/en_US/base.js', 'e7567ecf'),
+ ('https://www.youtube.com/s/player/643afba4/tv-player-ias.vflset/tv-player-ias.js', '643afba4'),
# obsolete
('https://www.youtube.com/yts/jsbin/player_ias-vfle4-e03/en_US/base.js', 'vfle4-e03'),
('https://www.youtube.com/yts/jsbin/player_ias-vfl49f_g4/en_US/base.js', 'vfl49f_g4'),
@@ -183,8 +373,9 @@ class TestPlayerInfo(unittest.TestCase):
('https://s.ytimg.com/yts/jsbin/html5player-en_US-vflXGBaUN.js', 'vflXGBaUN'),
('https://s.ytimg.com/yts/jsbin/html5player-en_US-vflKjOTVq/html5player.js', 'vflKjOTVq'),
)
+ ie = YoutubeIE(FakeYDL({'cachedir': False}))
for player_url, expected_player_id in PLAYER_URLS:
- player_id = YoutubeIE._extract_player_info(player_url)
+ player_id = ie._extract_player_info(player_url)
self.assertEqual(player_id, expected_player_id)
@@ -196,21 +387,19 @@ class TestSignature(unittest.TestCase):
os.mkdir(self.TESTDATA_DIR)
def tearDown(self):
- try:
+ with compat_contextlib_suppress(OSError):
for f in os.listdir(self.TESTDATA_DIR):
os.remove(f)
- except OSError:
- pass
def t_factory(name, sig_func, url_pattern):
def make_tfunc(url, sig_input, expected_sig):
m = url_pattern.match(url)
- assert m, '%r should follow URL format' % url
- test_id = m.group('id')
+ assert m, '{0!r} should follow URL format'.format(url)
+ test_id = re.sub(r'[/.-]', '_', m.group('id') or m.group('compat_id'))
def test_func(self):
- basename = 'player-{0}-{1}.js'.format(name, test_id)
+ basename = 'player-{0}.js'.format(test_id)
fn = os.path.join(self.TESTDATA_DIR, basename)
if not os.path.exists(fn):
@@ -225,7 +414,7 @@ def t_factory(name, sig_func, url_pattern):
def signature(jscode, sig_input):
- func = YoutubeIE(FakeYDL())._parse_sig_js(jscode)
+ func = YoutubeIE(FakeYDL({'cachedir': False}))._parse_sig_js(jscode)
src_sig = (
compat_str(string.printable[:sig_input])
if isinstance(sig_input, int) else sig_input)
@@ -233,17 +422,23 @@ def signature(jscode, sig_input):
def n_sig(jscode, sig_input):
- funcname = YoutubeIE(FakeYDL())._extract_n_function_name(jscode)
- return JSInterpreter(jscode).call_function(funcname, sig_input)
+ ie = YoutubeIE(FakeYDL({'cachedir': False}))
+ jsi = JSInterpreter(jscode)
+ jsi, _, func_code = ie._extract_n_function_code_jsi(sig_input, jsi)
+ return ie._extract_n_function_from_code(jsi, func_code)(sig_input)
make_sig_test = t_factory(
- 'signature', signature, re.compile(r'.*-(?P<id>[a-zA-Z0-9_-]+)(?:/watch_as3|/html5player)?\.[a-z]+$'))
+ 'signature', signature,
+ re.compile(r'''(?x)
+ .+/(?P<h5>html5)?player(?(h5)(?:-en_US)?-|/)(?P<id>[a-zA-Z0-9/._-]+)
+ (?(h5)/(?:watch_as3|html5player))?\.js$
+ '''))
for test_spec in _SIG_TESTS:
make_sig_test(*test_spec)
make_nsig_test = t_factory(
- 'nsig', n_sig, re.compile(r'.+/player/(?P<id>[a-zA-Z0-9_-]+)/.+.js$'))
+ 'nsig', n_sig, re.compile(r'.+/player/(?P<id>[a-zA-Z0-9_/.-]+)\.js$'))
for test_spec in _NSIG_TESTS:
make_nsig_test(*test_spec)