projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractors] Import for myvi:embed
[youtube-dl]
/
youtube_dl
/
extractor
/
vice.py
diff --git
a/youtube_dl/extractor/vice.py
b/youtube_dl/extractor/vice.py
index 54e207b391360b94f879b5de73e2c1dd31df7126..bcc28693a4545f9260f5e7942bcac4942faac380 100644
(file)
--- a/
youtube_dl/extractor/vice.py
+++ b/
youtube_dl/extractor/vice.py
@@
-7,6
+7,7
@@
import hashlib
import json
from .adobepass import AdobePassIE
import json
from .adobepass import AdobePassIE
+from .youtube import YoutubeIE
from .common import InfoExtractor
from ..compat import compat_HTTPError
from ..utils import (
from .common import InfoExtractor
from ..compat import compat_HTTPError
from ..utils import (
@@
-197,7
+198,7
@@
class ViceShowIE(InfoExtractor):
class ViceArticleIE(InfoExtractor):
IE_NAME = 'vice:article'
class ViceArticleIE(InfoExtractor):
IE_NAME = 'vice:article'
- _VALID_URL = r'https://www
.vice
.com/[^/]+/article/(?P<id>[^?#]+)'
+ _VALID_URL = r'https://www
\.vice\
.com/[^/]+/article/(?P<id>[^?#]+)'
_TESTS = [{
'url': 'https://www.vice.com/en_us/article/on-set-with-the-woman-making-mormon-porn-in-utah',
_TESTS = [{
'url': 'https://www.vice.com/en_us/article/on-set-with-the-woman-making-mormon-porn-in-utah',
@@
-261,11
+262,9
@@
class ViceArticleIE(InfoExtractor):
if embed_code:
return _url_res('ooyala:%s' % embed_code, 'Ooyala')
if embed_code:
return _url_res('ooyala:%s' % embed_code, 'Ooyala')
- youtube_url = self._html_search_regex(
- r'<iframe[^>]+src="(.*youtube\.com/.*)"',
- body, 'YouTube URL', default=None)
+ youtube_url = YoutubeIE._extract_url(body)
if youtube_url:
if youtube_url:
- return _url_res(youtube_url,
'Youtube'
)
+ return _url_res(youtube_url,
YoutubeIE.ie_key()
)
video_url = self._html_search_regex(
r'data-video-url="([^"]+)"',
video_url = self._html_search_regex(
r'data-video-url="([^"]+)"',