Compare commits
6 Commits
master
...
df-test-cl
Author | SHA1 | Date | |
---|---|---|---|
|
ed1ad29633 | ||
|
9a0a381954 | ||
|
4f10e1e7c7 | ||
|
e679476ea0 | ||
|
28194bd327 | ||
|
efa723edc6 |
@ -33,6 +33,7 @@ from youtube_dl.compat import (
|
|||||||
from youtube_dl.utils import (
|
from youtube_dl.utils import (
|
||||||
DownloadError,
|
DownloadError,
|
||||||
ExtractorError,
|
ExtractorError,
|
||||||
|
error_to_compat_str,
|
||||||
format_bytes,
|
format_bytes,
|
||||||
UnavailableVideoError,
|
UnavailableVideoError,
|
||||||
)
|
)
|
||||||
@ -108,7 +109,7 @@ def generator(test_case, tname):
|
|||||||
for tc in test_cases:
|
for tc in test_cases:
|
||||||
info_dict = tc.get('info_dict', {})
|
info_dict = tc.get('info_dict', {})
|
||||||
if not (info_dict.get('id') and info_dict.get('ext')):
|
if not (info_dict.get('id') and info_dict.get('ext')):
|
||||||
raise Exception('Test definition incorrect. The output file cannot be known. Are both \'id\' and \'ext\' keys present?')
|
raise Exception('Test definition (%s) requires both \'id\' and \'ext\' keys present to define the output file' % (tname, ))
|
||||||
|
|
||||||
if 'skip' in test_case:
|
if 'skip' in test_case:
|
||||||
print_skipping(test_case['skip'])
|
print_skipping(test_case['skip'])
|
||||||
@ -161,7 +162,9 @@ def generator(test_case, tname):
|
|||||||
except (DownloadError, ExtractorError) as err:
|
except (DownloadError, ExtractorError) as err:
|
||||||
# Check if the exception is not a network related one
|
# Check if the exception is not a network related one
|
||||||
if not err.exc_info[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError, compat_http_client.BadStatusLine) or (err.exc_info[0] == compat_HTTPError and err.exc_info[1].code == 503):
|
if not err.exc_info[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError, compat_http_client.BadStatusLine) or (err.exc_info[0] == compat_HTTPError and err.exc_info[1].code == 503):
|
||||||
raise
|
msg = getattr(err, 'msg', error_to_compat_str(err))
|
||||||
|
err.msg = '%s (%s)' % (msg, tname, )
|
||||||
|
raise err
|
||||||
|
|
||||||
if try_num == RETRIES:
|
if try_num == RETRIES:
|
||||||
report_warning('%s failed due to network errors, skipping...' % tname)
|
report_warning('%s failed due to network errors, skipping...' % tname)
|
||||||
|
@ -303,7 +303,7 @@ def xor(data1, data2):
|
|||||||
|
|
||||||
|
|
||||||
def rijndael_mul(a, b):
|
def rijndael_mul(a, b):
|
||||||
if(a == 0 or b == 0):
|
if (a == 0 or b == 0):
|
||||||
return 0
|
return 0
|
||||||
return RIJNDAEL_EXP_TABLE[(RIJNDAEL_LOG_TABLE[a] + RIJNDAEL_LOG_TABLE[b]) % 0xFF]
|
return RIJNDAEL_EXP_TABLE[(RIJNDAEL_LOG_TABLE[a] + RIJNDAEL_LOG_TABLE[b]) % 0xFF]
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@ class BigoIE(InfoExtractor):
|
|||||||
'url': 'https://www.bigo.tv/ja/221338632',
|
'url': 'https://www.bigo.tv/ja/221338632',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '6576287577575737440',
|
'id': '6576287577575737440',
|
||||||
|
'ext': 'mp4',
|
||||||
'title': '土よ〜💁♂️ 休憩室/REST room',
|
'title': '土よ〜💁♂️ 休憩室/REST room',
|
||||||
'thumbnail': r're:https?://.+',
|
'thumbnail': r're:https?://.+',
|
||||||
'uploader': '✨Shin💫',
|
'uploader': '✨Shin💫',
|
||||||
@ -31,7 +32,7 @@ class BigoIE(InfoExtractor):
|
|||||||
user_id = self._match_id(url)
|
user_id = self._match_id(url)
|
||||||
|
|
||||||
info_raw = self._download_json(
|
info_raw = self._download_json(
|
||||||
'https://bigo.tv/studio/getInternalStudioInfo',
|
'https://ta.bigo.tv/official_website/studio/getInternalStudioInfo',
|
||||||
user_id, data=urlencode_postdata({'siteId': user_id}))
|
user_id, data=urlencode_postdata({'siteId': user_id}))
|
||||||
|
|
||||||
if not isinstance(info_raw, dict):
|
if not isinstance(info_raw, dict):
|
||||||
|
@ -78,7 +78,7 @@ class MindsIE(MindsBaseIE):
|
|||||||
else:
|
else:
|
||||||
return self.url_result(entity['perma_url'])
|
return self.url_result(entity['perma_url'])
|
||||||
else:
|
else:
|
||||||
assert(entity['subtype'] == 'video')
|
assert (entity['subtype'] == 'video')
|
||||||
video_id = entity_id
|
video_id = entity_id
|
||||||
# 1080p and webm formats available only on the sources array
|
# 1080p and webm formats available only on the sources array
|
||||||
video = self._call_api(
|
video = self._call_api(
|
||||||
|
Loading…
Reference in New Issue
Block a user