From 95fa5fb569c9a29d1dfb7da744022373d279fcb7 Mon Sep 17 00:00:00 2001 From: Sergey M Date: Sun, 19 Oct 2014 00:48:05 +0700 Subject: [PATCH] [sexykarma] Improve and simplify --- youtube_dl/extractor/sexykarma.py | 99 ++++++++++++++++++++----------- 1 file changed, 64 insertions(+), 35 deletions(-) diff --git a/youtube_dl/extractor/sexykarma.py b/youtube_dl/extractor/sexykarma.py index 629499e72..4a6345758 100644 --- a/youtube_dl/extractor/sexykarma.py +++ b/youtube_dl/extractor/sexykarma.py @@ -1,77 +1,106 @@ # coding: utf-8 from __future__ import unicode_literals -from .common import InfoExtractor import re -import datetime + +from .common import InfoExtractor +from ..utils import ( + unified_strdate, + parse_duration, + int_or_none, +) + class SexyKarmaIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?sexykarma\.com/gonewild/video/.+\-(?P[a-zA-Z0-9\-]+)(.html)' + _VALID_URL = r'https?://(?:www\.)?sexykarma\.com/gonewild/video/(?P[^/]+)-(?P[a-zA-Z0-9]+)\.html' _TESTS = [{ 'url': 'http://www.sexykarma.com/gonewild/video/taking-a-quick-pee-yHI70cOyIHt.html', 'md5': 'b9798e7d1ef1765116a8f516c8091dbd', 'info_dict': { 'id': 'yHI70cOyIHt', + 'display_id': 'taking-a-quick-pee', 'ext': 'mp4', 'title': 'Taking a quick pee.', - 'uploader_id': 'wildginger7', + 'description': '', 'thumbnail': 're:^https?://.*\.jpg$', - 'duration': int, - 'view_count': int, + 'uploader': 'wildginger7', 'upload_date': '20141007', + 'duration': 81, + 'view_count': int, + 'comment_count': int, + 'categories': list, } }, { 'url': 'http://www.sexykarma.com/gonewild/video/pot-pixie-tribute-8Id6EZPbuHf.html', 'md5': 'dd216c68d29b49b12842b9babe762a5d', 'info_dict': { 'id': '8Id6EZPbuHf', + 'display_id': 'pot-pixie-tribute', 'ext': 'mp4', 'title': 'pot_pixie tribute', - 'uploader_id': 'banffite', + 'description': 'tribute', 'thumbnail': 're:^https?://.*\.jpg$', - 'duration': int, - 'view_count': int, + 'uploader': 'banffite', 'upload_date': '20141013', + 'duration': 16, + 'view_count': int, + 'comment_count': int, + 'categories': list, } }] def _real_extract(self, url): - video_id = self._match_id(url) + mobj = re.match(self._VALID_URL, url) + video_id = mobj.group('id') + display_id = mobj.group('display_id') - webpage = self._download_webpage(url, video_id) - - title = self._html_search_regex(r'

(.*?)', webpage, 'title') - uploader_id = self._html_search_regex(r'class="aupa">\n*(.*?)', webpage, 'uploader') - url = self._html_search_regex(r'

[\n\s]*Time: [\n\s]*(.+)\n*', webpage, 'duration') - duration = self._to_seconds(str_duration) + webpage = self._download_webpage(url, display_id) - str_views = self._html_search_regex(r'[\n\s]*Views: [\n\s]*(.+)', webpage, 'view_count') - view_count = int(str_views) - # print view_count + video_url = self._html_search_regex( + r'

Save this video to your computer:

Added: (.*?)', webpage, 'date') - d = datetime.datetime.strptime(date, '%B %d, %Y') - upload_date = d.strftime('%Y%m%d') + title = self._html_search_regex( + r'

(.*?)', + webpage, 'title') + description = self._html_search_meta( + 'description', webpage, 'description', fatal=False, default='') + thumbnail = self._html_search_regex( + r'(.*?)', webpage) + uploader = self._html_search_regex( + r'class="aupa">\s*(.*?)', + webpage, 'uploader') + upload_date = unified_strdate(self._html_search_regex( + r'Added: (.+?)', webpage, 'upload date', fatal=False)) + + duration = parse_duration(self._search_regex( + r'Time:\s*\s*\s*(.+?)\s*', + webpage, 'duration', fatal=False)) + + view_count = int_or_none(self._search_regex( + r'Views:\s*\s*\s*(\d+)\s*', + webpage, 'view count', fatal=False)) + comment_count = int_or_none(self._search_regex( + r'Comments:\s*\s*\s*(\d+)\s*', + webpage, 'comment count', fatal=False)) + + categories = self._html_search_meta( + 'keywords', webpage, 'categories', + fatal=False, default='').split(',') return { 'id': video_id, + 'display_id': display_id, + 'url': video_url, 'title': title, - 'uploader_id': uploader_id, - 'url': url, + 'description': description, 'thumbnail': thumbnail, + 'uploader': uploader, + 'upload_date': upload_date, 'duration': duration, 'view_count': view_count, - 'upload_date': upload_date, + 'comment_count': comment_count, 'categories': categories, } - - def _to_seconds(self, timestr): - seconds= 0 - for part in timestr.split(':'): - seconds= seconds*60 + int(part) - return seconds