projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[trilulilu] improve extraction
[youtube-dl]
/
youtube_dl
/
extractor
/
myvi.py
diff --git
a/youtube_dl/extractor/myvi.py
b/youtube_dl/extractor/myvi.py
index 896080c1e50a3d47f7f2c3f2afd5e060f6c32d87..4c65be122fd536c6e39fd9f10052e8933e96417d 100644
(file)
--- a/
youtube_dl/extractor/myvi.py
+++ b/
youtube_dl/extractor/myvi.py
@@
-6,18
+6,19
@@
import re
from .vimple import SprutoBaseIE
from .vimple import SprutoBaseIE
-class Myvi
Embed
IE(SprutoBaseIE):
+class MyviIE(SprutoBaseIE):
_VALID_URL = r'''(?x)
https?://
myvi\.(?:ru/player|tv)/
(?:
(?:
embed/html|
_VALID_URL = r'''(?x)
https?://
myvi\.(?:ru/player|tv)/
(?:
(?:
embed/html|
+ flash|
api/Video/Get
)/|
content/preloader\.swf\?.*\bid=
)
api/Video/Get
)/|
content/preloader\.swf\?.*\bid=
)
- (?P<id>[\da-zA-Z_]+)
+ (?P<id>[\da-zA-Z_
-
]+)
'''
_TESTS = [{
'url': 'http://myvi.ru/player/embed/html/oOy4euHA6LVwNNAjhD9_Jq5Ha2Qf0rtVMVFMAZav8wObeRTZaCATzucDQIDph8hQU0',
'''
_TESTS = [{
'url': 'http://myvi.ru/player/embed/html/oOy4euHA6LVwNNAjhD9_Jq5Ha2Qf0rtVMVFMAZav8wObeRTZaCATzucDQIDph8hQU0',
@@
-38,12
+39,15
@@
class MyviEmbedIE(SprutoBaseIE):
}, {
'url': 'http://myvi.tv/embed/html/oTGTNWdyz4Zwy_u1nraolwZ1odenTd9WkTnRfIL9y8VOgHYqOHApE575x4_xxS9Vn0?ap=0',
'only_matching': True,
}, {
'url': 'http://myvi.tv/embed/html/oTGTNWdyz4Zwy_u1nraolwZ1odenTd9WkTnRfIL9y8VOgHYqOHApE575x4_xxS9Vn0?ap=0',
'only_matching': True,
+ }, {
+ 'url': 'http://myvi.ru/player/flash/ocp2qZrHI-eZnHKQBK4cZV60hslH8LALnk0uBfKsB-Q4WnY26SeGoYPi8HWHxu0O30',
+ 'only_matching': True,
}]
@classmethod
def _extract_url(cls, webpage):
mobj = re.search(
}]
@classmethod
def _extract_url(cls, webpage):
mobj = re.search(
- r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//myvi\.(?:ru/player|tv)/
embed/html
/[^"]+)\1', webpage)
+ r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//myvi\.(?:ru/player|tv)/
(?:embed/html|flash)
/[^"]+)\1', webpage)
if mobj:
return mobj.group('url')
if mobj:
return mobj.group('url')