Plugin cleanup and tweaks
This commit is contained in:
@@ -1,6 +1,3 @@
|
||||
# coding: utf-8
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import re
|
||||
|
||||
from .common import InfoExtractor
|
||||
@@ -90,7 +87,6 @@ class MegaTVComIE(MegaTVComBaseIE):
|
||||
formats, subs = [{'url': source}], {}
|
||||
if player_attrs.get('subs'):
|
||||
self._merge_subtitles({'und': [{'url': player_attrs['subs']}]}, target=subs)
|
||||
self._sort_formats(formats)
|
||||
return {
|
||||
'id': video_id,
|
||||
'display_id': display_id,
|
||||
@@ -107,7 +103,7 @@ class MegaTVComEmbedIE(MegaTVComBaseIE):
|
||||
IE_NAME = 'megatvcom:embed'
|
||||
IE_DESC = 'megatv.com embedded videos'
|
||||
_VALID_URL = r'(?:https?:)?//(?:www\.)?megatv\.com/embed/?\?p=(?P<id>\d+)'
|
||||
_EMBED_RE = re.compile(rf'''<iframe[^>]+?src=(?P<_q1>["'])(?P<url>{_VALID_URL})(?P=_q1)''')
|
||||
_EMBED_REGEX = [rf'''<iframe[^>]+?src=(?P<_q1>["'])(?P<url>{_VALID_URL})(?P=_q1)''']
|
||||
|
||||
_TESTS = [{
|
||||
'url': 'https://www.megatv.com/embed/?p=2020520979',
|
||||
@@ -137,11 +133,6 @@ class MegaTVComEmbedIE(MegaTVComBaseIE):
|
||||
},
|
||||
}]
|
||||
|
||||
@classmethod
|
||||
def _extract_urls(cls, webpage):
|
||||
for mobj in cls._EMBED_RE.finditer(webpage):
|
||||
yield unescapeHTML(mobj.group('url'))
|
||||
|
||||
def _match_canonical_url(self, webpage):
|
||||
LINK_RE = r'''(?x)
|
||||
<link(?:
|
||||
|
Reference in New Issue
Block a user