projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify coding cookie
[youtube-dl]
/
youtube_dl
/
extractor
/
mailru.py
diff --git
a/youtube_dl/extractor/mailru.py
b/youtube_dl/extractor/mailru.py
index b7671f16e53fdf33888d8f5a9b453a892af122ee..f7cc3c83289f1101207c385d5bfed2055c7b7f67 100644
(file)
--- a/
youtube_dl/extractor/mailru.py
+++ b/
youtube_dl/extractor/mailru.py
@@
-1,4
+1,4
@@
-#
en
coding: utf-8
+# coding: utf-8
from __future__ import unicode_literals
import re
from __future__ import unicode_literals
import re
@@
-13,7
+13,7
@@
from ..utils import (
class MailRuIE(InfoExtractor):
IE_NAME = 'mailru'
IE_DESC = 'Видео@Mail.Ru'
class MailRuIE(InfoExtractor):
IE_NAME = 'mailru'
IE_DESC = 'Видео@Mail.Ru'
- _VALID_URL = r'http
://(?:www
\.)?my\.mail\.ru/(?:video/.*#video=/?(?P<idv1>(?:[^/]+/){3}\d+)|(?:(?P<idv2prefix>(?:[^/]+/){2})video/(?P<idv2suffix>[^/]+/\d+))\.html)'
+ _VALID_URL = r'http
s?://(?:(?:www|m)
\.)?my\.mail\.ru/(?:video/.*#video=/?(?P<idv1>(?:[^/]+/){3}\d+)|(?:(?P<idv2prefix>(?:[^/]+/){2})video/(?P<idv2suffix>[^/]+/\d+))\.html)'
_TESTS = [
{
_TESTS = [
{
@@
-38,9
+38,9
@@
class MailRuIE(InfoExtractor):
'id': '46843144_1263',
'ext': 'mp4',
'title': 'Samsung Galaxy S5 Hammer Smash Fail Battery Explosion',
'id': '46843144_1263',
'ext': 'mp4',
'title': 'Samsung Galaxy S5 Hammer Smash Fail Battery Explosion',
- 'timestamp': 1397
217632
,
- 'upload_date': '201404
11
',
- 'uploader': 'hitech',
+ 'timestamp': 1397
039888
,
+ 'upload_date': '201404
09
',
+ 'uploader': 'hitech
@corp.mail.ru
',
'uploader_id': 'hitech@corp.mail.ru',
'duration': 245,
},
'uploader_id': 'hitech@corp.mail.ru',
'duration': 245,
},
@@
-61,6
+61,10
@@
class MailRuIE(InfoExtractor):
'duration': 6001,
},
'skip': 'Not accessible from Travis CI server',
'duration': 6001,
},
'skip': 'Not accessible from Travis CI server',
+ },
+ {
+ 'url': 'http://m.my.mail.ru/mail/3sktvtr/video/_myvideo/138.html',
+ 'only_matching': True,
}
]
}
]