projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[nowtv] Fix extraction (Closes #6169)
[youtube-dl]
/
youtube_dl
/
extractor
/
ynet.py
diff --git
a/youtube_dl/extractor/ynet.py
b/youtube_dl/extractor/ynet.py
index 24872861a940dfe6b6788b8c043b5645b5d4780a..894678a23dac9d1b03e07f0cd9b2eecc7e690e18 100644
(file)
--- a/
youtube_dl/extractor/ynet.py
+++ b/
youtube_dl/extractor/ynet.py
@@
-5,7
+5,7
@@
import re
import json
from .common import InfoExtractor
import json
from .common import InfoExtractor
-from ..
utils
import compat_urllib_parse
+from ..
compat
import compat_urllib_parse
class YnetIE(InfoExtractor):
class YnetIE(InfoExtractor):
@@
-13,7
+13,6
@@
class YnetIE(InfoExtractor):
_TESTS = [
{
'url': 'http://hot.ynet.co.il/home/0,7340,L-11659-99244,00.html',
_TESTS = [
{
'url': 'http://hot.ynet.co.il/home/0,7340,L-11659-99244,00.html',
- 'md5': '002b44ee2f33d50363a1c153bed524cf',
'info_dict': {
'id': 'L-11659-99244',
'ext': 'flv',
'info_dict': {
'id': 'L-11659-99244',
'ext': 'flv',
@@
-22,7
+21,6
@@
class YnetIE(InfoExtractor):
}
}, {
'url': 'http://hot.ynet.co.il/home/0,7340,L-8859-84418,00.html',
}
}, {
'url': 'http://hot.ynet.co.il/home/0,7340,L-8859-84418,00.html',
- 'md5': '6455046ae1b48cf7e2b7cae285e53a16',
'info_dict': {
'id': 'L-8859-84418',
'ext': 'flv',
'info_dict': {
'id': 'L-8859-84418',
'ext': 'flv',
@@
-33,9
+31,7
@@
class YnetIE(InfoExtractor):
]
def _real_extract(self, url):
]
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
-
+ video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
content = compat_urllib_parse.unquote_plus(self._og_search_video_url(webpage))
webpage = self._download_webpage(url, video_id)
content = compat_urllib_parse.unquote_plus(self._og_search_video_url(webpage))
@@
-51,4
+47,4
@@
class YnetIE(InfoExtractor):
'title': title,
'formats': self._extract_f4m_formats(f4m_url, video_id),
'thumbnail': self._og_search_thumbnail(webpage),
'title': title,
'formats': self._extract_f4m_formats(f4m_url, video_id),
'thumbnail': self._og_search_thumbnail(webpage),
- }
\ No newline at end of file
+ }