R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed potential break when div not found

Browse Source
This commit is contained in:
JChris246 2019-02-02 15:14:12 -04:00 committed by GitHub
parent 77020f033b
commit eb6f5ea0b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
youtube_dl/extractor/pornhub.py
View File

@ -159,6 +159,12 @@ class PornHubIE(PornHubBaseIE):
return str_to_int(self._search_regex( return str_to_int(self._search_regex(
pattern, webpage, '%s count' % name, fatal=False)) pattern, webpage, '%s count' % name, fatal=False))
def _get_text(self, str):
l = []
for a in re.finditer(r'<a href=[^>]+>([^<]+)', str):
l.append(a.group(1))
return l
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
host = mobj.group('host') or 'pornhub.com' host = mobj.group('host') or 'pornhub.com'
@ -302,15 +308,17 @@ class PornHubIE(PornHubBaseIE):
comment_count = self._extract_count( comment_count = self._extract_count(
r'All Comments\s*<span>\(([\d,.]+)\)', webpage, 'comment') r'All Comments\s*<span>\(([\d,.]+)\)', webpage, 'comment')
categories = [] div = re.search(r'<div class="categoriesWrapper">\s+[^\n]+\s+([^\n]+)', webpage)
cat_div = re.search(r'<div class="categoriesWrapper">\s+Categories:&nbsp;\s+([^\n]+)', webpage) if div:
for a in re.finditer(r'<a href=[^>]+Category[^>]*>([^<]+)', cat_div.group(1)): categories = self._get_text(div.group(1))
categories.append(a.group(1)) else:
categories = None
tags = [] div = re.search(r'<div class="tagsWrapper">\s+Tags:&nbsp;\s+([^\n]+)', webpage)
tag_div = re.search(r'<div class="tagsWrapper">\s+Tags:&nbsp;\s+([^\n]+)', webpage) if div:
for a in re.finditer(r'<a href=[^>]+>([^<]+)', tag_div.group(1)): tags = self._get_text(div.group(1))
tags.append(a.group(1)) else:
tags = None
return { return {
'id': video_id, 'id': video_id,