projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[clyp] Add extractor
[youtube-dl]
/
youtube_dl
/
extractor
/
moniker.py
diff --git
a/youtube_dl/extractor/moniker.py
b/youtube_dl/extractor/moniker.py
index 801abe0e187631d2dd8eabbdd7dc218f6f673f5f..69e4bcd1a28f7be589fd26ca448740bd16794cfc 100644
(file)
--- a/
youtube_dl/extractor/moniker.py
+++ b/
youtube_dl/extractor/moniker.py
@@
-9,7
+9,10
@@
from ..compat import (
compat_urllib_parse,
compat_urllib_request,
)
compat_urllib_parse,
compat_urllib_request,
)
-from ..utils import ExtractorError
+from ..utils import (
+ ExtractorError,
+ remove_start,
+)
class MonikerIE(InfoExtractor):
class MonikerIE(InfoExtractor):
@@
-24,6
+27,14
@@
class MonikerIE(InfoExtractor):
'ext': 'mp4',
'title': 'youtube-dl test video',
},
'ext': 'mp4',
'title': 'youtube-dl test video',
},
+ }, {
+ 'url': 'http://allmyvideos.net/embed-jih3nce3x6wn',
+ 'md5': '710883dee1bfc370ecf9fa6a89307c88',
+ 'info_dict': {
+ 'id': 'jih3nce3x6wn',
+ 'ext': 'mp4',
+ 'title': 'youtube-dl test video',
+ },
}, {
'url': 'http://vidspot.net/l2ngsmhs8ci5',
'md5': '710883dee1bfc370ecf9fa6a89307c88',
}, {
'url': 'http://vidspot.net/l2ngsmhs8ci5',
'md5': '710883dee1bfc370ecf9fa6a89307c88',
@@
-38,9
+49,15
@@
class MonikerIE(InfoExtractor):
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
- video_id = self._match_id(url)
+ orig_video_id = self._match_id(url)
+ video_id = remove_start(orig_video_id, 'embed-')
+ url = url.replace(orig_video_id, video_id)
+ assert re.match(self._VALID_URL, url) is not None
orig_webpage = self._download_webpage(url, video_id)
orig_webpage = self._download_webpage(url, video_id)
+ if '>File Not Found<' in orig_webpage:
+ raise ExtractorError('Video %s does not exist' % video_id, expected=True)
+
error = self._search_regex(
r'class="err">([^<]+)<', orig_webpage, 'error', default=None)
if error:
error = self._search_regex(
r'class="err">([^<]+)<', orig_webpage, 'error', default=None)
if error: