[izlesene] Minor changes

This commit is contained in:
Sergey M․ 2014-08-01 19:08:09 +07:00
parent 328a20bf9c
commit f4776371ae
2 changed files with 45 additions and 40 deletions

View file

@ -4,25 +4,31 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import get_element_by_id, parse_iso8601, determine_ext, int_or_none from ..utils import (
get_element_by_id,
parse_iso8601,
determine_ext,
int_or_none,
str_to_int,
)
class IzleseneIE(InfoExtractor): class IzleseneIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.|m\.)?izlesene\.com/(?:video|embedplayer)/(?:[^/]+/)?(?P<id>[0-9]+)' _VALID_URL = r'https?://(?:(?:www|m)\.)?izlesene\.com/(?:video|embedplayer)/(?:[^/]+/)?(?P<id>[0-9]+)'
_STREAM_URL = 'http://panel.izlesene.com/api/streamurl/{id:}/{format:}' _STREAM_URL = 'http://panel.izlesene.com/api/streamurl/{id:}/{format:}'
_TEST = { _TEST = {
'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',
'title': u'Sevinçten Çıldırtan Doğum Günü Hediyesi',
'upload_date': '20140702',
'uploader_id': 'pelikzzle',
'description': u'Annesi oğluna doğum günü hediyesi olarak minecraft cd si alıyor, ve çocuk hunharca seviniyor',
'timestamp': 1404298698,
'duration': 95,
'ext': 'mp4', 'ext': 'mp4',
'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',
'thumbnail': 're:^http://.*\.jpg', 'thumbnail': 're:^http://.*\.jpg',
'uploader_id': 'pelikzzle',
'timestamp': 1404298698,
'upload_date': '20140702',
'duration': 95.395,
'age_limit': 0, 'age_limit': 0,
} }
} }
@ -37,58 +43,55 @@ class IzleseneIE(InfoExtractor):
title = self._og_search_title(webpage) title = self._og_search_title(webpage)
description = self._og_search_description(webpage) description = self._og_search_description(webpage)
thumbnail = self._og_search_thumbnail(webpage) thumbnail = self._og_search_thumbnail(webpage)
duration = int(
self._html_search_regex(
r'"videoduration"\s?:\s?"([^"]+)"', webpage, 'duration',
fatal=False, default='0')
) / 1000
view_count = get_element_by_id('videoViewCount',
webpage).replace('.', '')
timestamp = parse_iso8601(self._html_search_meta('uploadDate', webpage,
'upload date', fatal=False))
family_friendly = self._html_search_meta('isFamilyFriendly', webpage,
'age limit', fatal=False)
uploader = self._html_search_regex(r"adduserUsername\s?=\s?'([^']+)';",
webpage, 'uploader', fatal=False,
default='')
comment_count = self._html_search_regex(
r'comment_count\s?=\s?\'([^\']+)\';',
webpage, 'uploader', fatal=False)
content_url = self._html_search_meta('contentURL', webpage, uploader = self._html_search_regex(
'content URL', fatal=False) r"adduserUsername\s*=\s*'([^']+)';", webpage, 'uploader', fatal=False, default='')
ext = determine_ext(content_url) timestamp = parse_iso8601(self._html_search_meta(
'uploadDate', webpage, 'upload date', fatal=False))
duration = int_or_none(self._html_search_regex(
r'"videoduration"\s*:\s*"([^"]+)"', webpage, 'duration', fatal=False))
if duration:
duration /= 1000.0
view_count = str_to_int(get_element_by_id('videoViewCount', webpage))
comment_count = self._html_search_regex(
r'comment_count\s*=\s*\'([^\']+)\';', webpage, 'uploader', fatal=False)
family_friendly = self._html_search_meta(
'isFamilyFriendly', webpage, 'age limit', fatal=False)
content_url = self._html_search_meta(
'contentURL', webpage, 'content URL', fatal=False)
ext = determine_ext(content_url, 'mp4')
# Might be empty for some videos. # Might be empty for some videos.
qualities = self._html_search_regex(r'"quality"\s?:\s?"([^"]+)"', qualities = self._html_search_regex(
webpage, 'qualities', fatal=False, r'"quality"\s*:\s*"([^"]+)"', webpage, 'qualities', fatal=False, default='')
default='')
formats = [] formats = []
for quality in qualities.split('|'): for quality in qualities.split('|'):
json = self._download_json( json = self._download_json(
self._STREAM_URL.format(id=video_id, format=quality), video_id, self._STREAM_URL.format(id=video_id, format=quality), video_id,
note=u'Getting video URL for "%s" quality' % quality, note='Getting video URL for "%s" quality' % quality,
errnote=u'Failed to get video URL for "%s" quality' % quality errnote='Failed to get video URL for "%s" quality' % quality
) )
video_format = '%sp' % quality if quality else 'sd'
formats.append({ formats.append({
'url': json.get('streamurl'), 'url': json.get('streamurl'),
'ext': ext, 'ext': ext,
'format': video_format, 'format_id': '%sp' % quality if quality else 'sd',
'format_id': video_format,
}) })
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'formats': formats,
'description': description, 'description': description,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'uploader_id': uploader,
'timestamp': timestamp,
'duration': duration, 'duration': duration,
'view_count': int_or_none(view_count), 'view_count': int_or_none(view_count),
'timestamp': timestamp,
'age_limit': 18 if family_friendly == 'False' else 0,
'uploader_id': uploader,
'comment_count': int_or_none(comment_count), 'comment_count': int_or_none(comment_count),
'age_limit': 18 if family_friendly == 'False' else 0,
'formats': formats,
} }

View file

@ -852,6 +852,8 @@ def unified_strdate(date_str):
return upload_date return upload_date
def determine_ext(url, default_ext=u'unknown_video'): def determine_ext(url, default_ext=u'unknown_video'):
if url is None:
return default_ext
guess = url.partition(u'?')[0].rpartition(u'.')[2] guess = url.partition(u'?')[0].rpartition(u'.')[2]
if re.match(r'^[A-Za-z0-9]+$', guess): if re.match(r'^[A-Za-z0-9]+$', guess):
return guess return guess