projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[viidia] Cleaup
[youtube-dl]
/
youtube_dl
/
extractor
/
tube8.py
diff --git
a/youtube_dl/extractor/tube8.py
b/youtube_dl/extractor/tube8.py
index d73ad3762a1b455cfd4bc384c27e2dd85e776dde..c9cb69333f7da0a9f4fe009e79b06433bca83726 100644
(file)
--- a/
youtube_dl/extractor/tube8.py
+++ b/
youtube_dl/extractor/tube8.py
@@
-47,7
+47,7
@@
class Tube8IE(InfoExtractor):
webpage = self._download_webpage(req, display_id)
flashvars = json.loads(self._html_search_regex(
webpage = self._download_webpage(req, display_id)
flashvars = json.loads(self._html_search_regex(
- r'
var flashvars\s*=\s*({.+?})
', webpage, 'flashvars'))
+ r'
flashvars\s*=\s*({.+?});\r?\n
', webpage, 'flashvars'))
video_url = flashvars['video_url']
if flashvars.get('encrypted') is True:
video_url = flashvars['video_url']
if flashvars.get('encrypted') is True:
@@
-58,19
+58,19
@@
class Tube8IE(InfoExtractor):
thumbnail = flashvars.get('image_url')
title = self._html_search_regex(
thumbnail = flashvars.get('image_url')
title = self._html_search_regex(
- r'video
t
itle\s*=\s*"([^"]+)', webpage, 'title')
+ r'video
T
itle\s*=\s*"([^"]+)', webpage, 'title')
description = self._html_search_regex(
description = self._html_search_regex(
- r'>Description:</strong>
(.+?)
<', webpage, 'description', fatal=False)
+ r'>Description:</strong>
\s*(.+?)\s*
<', webpage, 'description', fatal=False)
uploader = self._html_search_regex(
uploader = self._html_search_regex(
- r'<s
trong class="video-username">(?:<a href="[^"]+">)?([^<]+)(?:</a>)?</strong>
',
+ r'<s
pan class="username">\s*(.+?)\s*<
',
webpage, 'uploader', fatal=False)
like_count = int_or_none(self._html_search_regex(
webpage, 'uploader', fatal=False)
like_count = int_or_none(self._html_search_regex(
- r
"rupVar\s*=\s*'(\d+)'"
, webpage, 'like count', fatal=False))
+ r
'rupVar\s*=\s*"(\d+)"'
, webpage, 'like count', fatal=False))
dislike_count = int_or_none(self._html_search_regex(
dislike_count = int_or_none(self._html_search_regex(
- r
"rdownVar\s*=\s*'(\d+)'"
, webpage, 'dislike count', fatal=False))
+ r
'rdownVar\s*=\s*"(\d+)"'
, webpage, 'dislike count', fatal=False))
view_count = self._html_search_regex(
view_count = self._html_search_regex(
- r'<strong>Views: </strong>([\d,\.]+)</li>', webpage, 'view count', fatal=False)
+ r'<strong>Views: </strong>([\d,\.]+)
\s*
</li>', webpage, 'view count', fatal=False)
if view_count:
view_count = str_to_int(view_count)
comment_count = self._html_search_regex(
if view_count:
view_count = str_to_int(view_count)
comment_count = self._html_search_regex(