Merge pull request #3710 from naglis/izlesene_fix

Izlesene fix
This commit is contained in:
Sergey M. 2014-09-10 18:20:57 +07:00
commit d8e487fbd9
1 changed files with 60 additions and 31 deletions

View File

@ -14,16 +14,19 @@ from ..utils import (
class IzleseneIE(InfoExtractor): class IzleseneIE(InfoExtractor):
_VALID_URL = r'https?://(?:(?:www|m)\.)?izlesene\.com/(?:video|embedplayer)/(?:[^/]+/)?(?P<id>[0-9]+)' _VALID_URL = r'''(?x)
_STREAM_URL = 'http://panel.izlesene.com/api/streamurl/{id:}/{format:}' https?://(?:(?:www|m)\.)?izlesene\.com/
_TEST = { (?:video|embedplayer)/(?:[^/]+/)?(?P<id>[0-9]+)
'''
_TESTS = [
{
'url': 'http://www.izlesene.com/video/sevincten-cildirtan-dogum-gunu-hediyesi/7599694', 'url': 'http://www.izlesene.com/video/sevincten-cildirtan-dogum-gunu-hediyesi/7599694',
'md5': '4384f9f0ea65086734b881085ee05ac2', 'md5': '4384f9f0ea65086734b881085ee05ac2',
'info_dict': { 'info_dict': {
'id': '7599694', 'id': '7599694',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Sevinçten Çıldırtan Doğum Günü Hediyesi', 'title': 'Sevinçten Çıldırtan Doğum Günü Hediyesi',
'description': 'Annesi oğluna doğum günü hediyesi olarak minecraft cd si alıyor, ve çocuk hunharca seviniyor', 'description': 'md5:253753e2655dde93f59f74b572454f6d',
'thumbnail': 're:^http://.*\.jpg', 'thumbnail': 're:^http://.*\.jpg',
'uploader_id': 'pelikzzle', 'uploader_id': 'pelikzzle',
'timestamp': 1404298698, 'timestamp': 1404298698,
@ -31,7 +34,24 @@ class IzleseneIE(InfoExtractor):
'duration': 95.395, 'duration': 95.395,
'age_limit': 0, 'age_limit': 0,
} }
},
{
'url': 'http://www.izlesene.com/video/tarkan-dortmund-2006-konseri/17997',
'md5': '97f09b6872bffa284cb7fa4f6910cb72',
'info_dict': {
'id': '17997',
'ext': 'mp4',
'title': 'Tarkan Dortmund 2006 Konseri',
'description': 'Tarkan Dortmund 2006 Konseri',
'thumbnail': 're:^http://.*\.jpg',
'uploader_id': 'parlayankiz',
'timestamp': 1163318593,
'upload_date': '20061112',
'duration': 253.666,
'age_limit': 0,
} }
},
]
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
@ -45,18 +65,21 @@ class IzleseneIE(InfoExtractor):
thumbnail = self._og_search_thumbnail(webpage) thumbnail = self._og_search_thumbnail(webpage)
uploader = self._html_search_regex( uploader = self._html_search_regex(
r"adduserUsername\s*=\s*'([^']+)';", webpage, 'uploader', fatal=False, default='') r"adduserUsername\s*=\s*'([^']+)';",
webpage, 'uploader', fatal=False, default='')
timestamp = parse_iso8601(self._html_search_meta( timestamp = parse_iso8601(self._html_search_meta(
'uploadDate', webpage, 'upload date', fatal=False)) 'uploadDate', webpage, 'upload date', fatal=False))
duration = int_or_none(self._html_search_regex( duration = int_or_none(self._html_search_regex(
r'"videoduration"\s*:\s*"([^"]+)"', webpage, 'duration', fatal=False)) r'"videoduration"\s*:\s*"([^"]+)"',
webpage, 'duration', fatal=False))
if duration: if duration:
duration /= 1000.0 duration /= 1000.0
view_count = str_to_int(get_element_by_id('videoViewCount', webpage)) view_count = str_to_int(get_element_by_id('videoViewCount', webpage))
comment_count = self._html_search_regex( comment_count = self._html_search_regex(
r'comment_count\s*=\s*\'([^\']+)\';', webpage, 'uploader', fatal=False) r'comment_count\s*=\s*\'([^\']+)\';',
webpage, 'comment_count', fatal=False)
family_friendly = self._html_search_meta( family_friendly = self._html_search_meta(
'isFamilyFriendly', webpage, 'age limit', fatal=False) 'isFamilyFriendly', webpage, 'age limit', fatal=False)
@ -66,20 +89,26 @@ class IzleseneIE(InfoExtractor):
ext = determine_ext(content_url, 'mp4') ext = determine_ext(content_url, 'mp4')
# Might be empty for some videos. # Might be empty for some videos.
qualities = self._html_search_regex( streams = self._html_search_regex(
r'"quality"\s*:\s*"([^"]+)"', webpage, 'qualities', fatal=False, default='') r'"qualitylevel"\s*:\s*"([^"]+)"',
webpage, 'streams', fatal=False, default='')
formats = [] formats = []
for quality in qualities.split('|'): if streams:
json = self._download_json( for stream in streams.split('|'):
self._STREAM_URL.format(id=video_id, format=quality), video_id, quality, url = re.search(r'\[(\w+)\](.+)', stream).groups()
note='Getting video URL for "%s" quality' % quality,
errnote='Failed to get video URL for "%s" quality' % quality
)
formats.append({ formats.append({
'url': json.get('streamurl'),
'ext': ext,
'format_id': '%sp' % quality if quality else 'sd', 'format_id': '%sp' % quality if quality else 'sd',
'url': url,
'ext': ext,
})
else:
stream_url = self._search_regex(
r'"streamurl"\s?:\s?"([^"]+)"', webpage, 'stream URL')
formats.append({
'format_id': 'sd',
'url': stream_url,
'ext': ext,
}) })
return { return {