|
|
@ -75,7 +75,7 @@ class GlomexBaseIE(InfoExtractor):
|
|
|
|
format_url, video_id, 'mp4', m3u8_id=format_id,
|
|
|
|
format_url, video_id, 'mp4', m3u8_id=format_id,
|
|
|
|
fatal=False)
|
|
|
|
fatal=False)
|
|
|
|
formats.extend(formats_)
|
|
|
|
formats.extend(formats_)
|
|
|
|
subs.update(subs_)
|
|
|
|
self._merge_subtitles(subs_, target=subs)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
formats.append({
|
|
|
|
formats.append({
|
|
|
|
'url': format_url,
|
|
|
|
'url': format_url,
|
|
|
@ -205,8 +205,6 @@ class GlomexEmbedIE(GlomexBaseIE):
|
|
|
|
mdict = mobj.groupdict()
|
|
|
|
mdict = mobj.groupdict()
|
|
|
|
if mdict.get('url'):
|
|
|
|
if mdict.get('url'):
|
|
|
|
url = unescapeHTML(mdict['url'])
|
|
|
|
url = unescapeHTML(mdict['url'])
|
|
|
|
if url.startswith('//'):
|
|
|
|
|
|
|
|
url = f'https:{url}'
|
|
|
|
|
|
|
|
if not cls.suitable(url):
|
|
|
|
if not cls.suitable(url):
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
yield cls._smuggle_origin_url(url, origin_url)
|
|
|
|
yield cls._smuggle_origin_url(url, origin_url)
|
|
|
|