projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/common] Fix numeric identifiers conversion in DASH URL templates
[youtube-dl]
/
youtube_dl
/
extractor
/
odnoklassniki.py
diff --git
a/youtube_dl/extractor/odnoklassniki.py
b/youtube_dl/extractor/odnoklassniki.py
index ccc88cfb1a8657ec4266a03bfa07c8aa0e598cd6..f9e064a60e445668200b759ca4e0ad1a6f7c28ab 100644
(file)
--- a/
youtube_dl/extractor/odnoklassniki.py
+++ b/
youtube_dl/extractor/odnoklassniki.py
@@
-13,7
+13,7
@@
from ..utils import (
class OdnoklassnikiIE(InfoExtractor):
class OdnoklassnikiIE(InfoExtractor):
- _VALID_URL = r'https?://(?:
www\.)?(?:odnoklassniki|ok)\.ru/(?:video
|web-api/video/moviePlayer)/(?P<id>[\d-]+)'
+ _VALID_URL = r'https?://(?:
(?:www|m|mobile)\.)?(?:odnoklassniki|ok)\.ru/(?:video(?:embed)?
|web-api/video/moviePlayer)/(?P<id>[\d-]+)'
_TESTS = [{
# metadata in JSON
'url': 'http://ok.ru/video/20079905452',
_TESTS = [{
# metadata in JSON
'url': 'http://ok.ru/video/20079905452',
@@
-66,6
+66,15
@@
class OdnoklassnikiIE(InfoExtractor):
}, {
'url': 'http://www.ok.ru/video/20648036891',
'only_matching': True,
}, {
'url': 'http://www.ok.ru/video/20648036891',
'only_matching': True,
+ }, {
+ 'url': 'http://www.ok.ru/videoembed/20648036891',
+ 'only_matching': True,
+ }, {
+ 'url': 'http://m.ok.ru/video/20079905452',
+ 'only_matching': True,
+ }, {
+ 'url': 'http://mobile.ok.ru/video/20079905452',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):