diff --git a/youtube_dl/extractor/yourporn.py b/youtube_dl/extractor/yourporn.py index c8dc29bd8..b37561602 100644 --- a/youtube_dl/extractor/yourporn.py +++ b/youtube_dl/extractor/yourporn.py @@ -27,17 +27,29 @@ class YourPornIE(InfoExtractor): self._search_regex( r'data-vnfo=(["\'])(?P{.+?})\1', webpage, 'data info', group='data'), - video_id)[video_id]).replace('/cdn/', '/cdn3/') + video_id)[video_id]).replace('/cdn/', '/cdn4/') title = (self._search_regex( r'<[^>]+\bclass=["\']PostEditTA[^>]+>([^<]+)', webpage, 'title', default=None) or self._og_search_description(webpage)).strip() + if '#' in title: + title = title[0:title.index('#')].strip() thumbnail = self._og_search_thumbnail(webpage) + durationraw = self._search_regex(r'Video Info -> duration:([0-9:]+)', + webpage, 'duration') + if len(durationraw.split(":")) == 3: + duration = int((durationraw.split(":")[0])) * 3600 + \ + int((durationraw.split(":")[1])) * 60 + int((durationraw.split(":")[2])) + elif len(durationraw.split(":")) == 2: + duration = int((durationraw.split(":")[0])) * 60 + int((durationraw.split(":")[1])) + else: + duration = int((durationraw.split(":")[1])) return { 'id': video_id, 'url': video_url, 'title': title, + 'duration': duration, 'thumbnail': thumbnail, 'age_limit': 18 } diff --git a/youtube_dl/extractor/yourporn.pyc b/youtube_dl/extractor/yourporn.pyc new file mode 100644 index 000000000..3312898dd Binary files /dev/null and b/youtube_dl/extractor/yourporn.pyc differ