Skip to content

Commit

Permalink
[pornhub] Fix tags and categories extraction (closes #13720)
Browse files Browse the repository at this point in the history
  • Loading branch information
JChris246 authored and dstftw committed Feb 5, 2019
1 parent 48fb963 commit d2d970d
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions youtube_dl/extractor/pornhub.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from ..utils import (
ExtractorError,
int_or_none,
js_to_json,
orderedSet,
remove_quotes,
str_to_int,
Expand Down Expand Up @@ -303,14 +302,17 @@ def parse_js_value(inp):
comment_count = self._extract_count(
r'All Comments\s*<span>\(([\d,.]+)\)', webpage, 'comment')

page_params = self._parse_json(self._search_regex(
r'page_params\.zoneDetails\[([\'"])[^\'"]+\1\]\s*=\s*(?P<data>{[^}]+})',
webpage, 'page parameters', group='data', default='{}'),
video_id, transform_source=js_to_json, fatal=False)
tags = categories = None
if page_params:
tags = page_params.get('tags', '').split(',')
categories = page_params.get('categories', '').split(',')
def _get_items(class_name):
div = self._search_regex(
r'<div class="' + class_name + '">([\S\s]+?)</div>',
webpage, class_name, default=None)
if div:
return [a for a in re.findall(r'<a href=[^>]+>([^<]+)', div)]
else:
return None

categories = _get_items('categoriesWrapper')
tags = _get_items('tagsWrapper')

return {
'id': video_id,
Expand Down

0 comments on commit d2d970d

Please sign in to comment.