Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ynet] Remove unused stuff, simplify and improve

Browse Source
This commit is contained in:
Sergey M․ 2014-09-28 03:26:38 +07:00
parent 6be1cd4ddb
commit c664182323
1 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
youtube_dl/extractor/ynet.py
View File

@ -2,46 +2,53 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import re import re
import base64
import json import json
from .common import InfoExtractor from .common import InfoExtractor
from youtube_dl.utils import compat_urllib_parse_urlparse, compat_urllib_parse from ..utils import compat_urllib_parse
class YnetIE(InfoExtractor): class YnetIE(InfoExtractor):
_VALID_URL = r'http://.*ynet\.co\.il/.*/0,7340,(?P<id>L(-[0-9]+)+),00\.html' _VALID_URL = r'http://.*ynet\.co\.il/.*/0,7340,(?P<id>L(?:-[0-9]+)+),00\.html'
_TEST = { _TESTS = [
'url': 'http://hot.ynet.co.il/home/0,7340,L-11659-99244,00.html', {
'info_dict': { 'url': 'http://hot.ynet.co.il/home/0,7340,L-11659-99244,00.html',
'id': 'L-11659-99244', 'md5': '002b44ee2f33d50363a1c153bed524cf',
'ext': 'flv', 'info_dict': {
'title': 'md5:3dba12d2837ee2ad9652cc64af652b16', 'id': 'L-11659-99244',
'thumbnail': 'http://hot.ynet.co.il/PicServer4/2014/09/23/5606015/AMERICAN_COMMUNE1_T.jpg', 'ext': 'flv',
'title': 'איש לא יודע מאיפה באנו',
'thumbnail': 're:^https?://.*\.jpg',
}
}, {
'url': 'http://hot.ynet.co.il/home/0,7340,L-8859-84418,00.html',
'md5': '6455046ae1b48cf7e2b7cae285e53a16',
'info_dict': {
'id': 'L-8859-84418',
'ext': 'flv',
'title': "צפו: הנשיקה הלוהטת של תורגי' ויוליה פלוטקין",
'thumbnail': 're:^https?://.*\.jpg',
}
} }
} ]
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
id = mobj.group('id') webpage = self._download_webpage(url, video_id)
webpage = self._download_webpage(url, id)
content = compat_urllib_parse.unquote_plus(self._og_search_video_url(webpage).decode('utf-8')) content = compat_urllib_parse.unquote_plus(self._og_search_video_url(webpage))
config = json.loads(self._search_regex(r'config=({.+?})$', content, 'video config'))
player_url = re.match('(http.*\.swf)\?' ,content).group(1) f4m_url = config['clip']['url']
title = self._og_search_title(webpage)
config = json.loads(re.match('.*config\=(.*)' ,content).group(1)) m = re.search(r'ynet - HOT -- (["\']+)(?P<title>.+?)\1', title)
if m:
f4m_url = config['clip']['url'] title = m.group('title')
title = re.sub(': Video$', '', self._og_search_title(webpage))
return { return {
'id': id, 'id': video_id,
'title': title, 'title': title,
'formats': self._extract_f4m_formats(f4m_url, id), 'formats': self._extract_f4m_formats(f4m_url, video_id),
'thumbnail': self._og_search_thumbnail(webpage), 'thumbnail': self._og_search_thumbnail(webpage),
'player_url': player_url, }
}