projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[README.md] Make download URLs consistent
[youtube-dl]
/
youtube_dl
/
extractor
/
traileraddict.py
diff --git
a/youtube_dl/extractor/traileraddict.py
b/youtube_dl/extractor/traileraddict.py
index b1a440e79fb256c4b069c2886781c564deb6d951..747370d12d7fc8fd1c66b1ac101db0ba01c963e5 100644
(file)
--- a/
youtube_dl/extractor/traileraddict.py
+++ b/
youtube_dl/extractor/traileraddict.py
@@
-7,7
+7,7
@@
from .common import InfoExtractor
class TrailerAddictIE(InfoExtractor):
_WORKING = False
class TrailerAddictIE(InfoExtractor):
_WORKING = False
- _VALID_URL = r'(?:http://)?(?:www\.)?traileraddict\.com/(?:trailer|clip)/(?P<movie>.+?)/(?P<trailer_name>.+)'
+ _VALID_URL = r'(?:http
s?
://)?(?:www\.)?traileraddict\.com/(?:trailer|clip)/(?P<movie>.+?)/(?P<trailer_name>.+)'
_TEST = {
'url': 'http://www.traileraddict.com/trailer/prince-avalanche/trailer',
'md5': '41365557f3c8c397d091da510e73ceb4',
_TEST = {
'url': 'http://www.traileraddict.com/trailer/prince-avalanche/trailer',
'md5': '41365557f3c8c397d091da510e73ceb4',
@@
-25,7
+25,7
@@
class TrailerAddictIE(InfoExtractor):
webpage = self._download_webpage(url, name)
title = self._search_regex(r'<title>(.+?)</title>',
webpage = self._download_webpage(url, name)
title = self._search_regex(r'<title>(.+?)</title>',
- webpage, 'video title').replace(' - Trailer Addict', '')
+
webpage, 'video title').replace(' - Trailer Addict', '')
view_count_str = self._search_regex(
r'<span class="views_n">([0-9,.]+)</span>',
webpage, 'view count', fatal=False)
view_count_str = self._search_regex(
r'<span class="views_n">([0-9,.]+)</span>',
webpage, 'view count', fatal=False)
@@
-38,17
+38,17
@@
class TrailerAddictIE(InfoExtractor):
# Presence of (no)watchplus function indicates HD quality is available
if re.search(r'function (no)?watchplus()', webpage):
# Presence of (no)watchplus function indicates HD quality is available
if re.search(r'function (no)?watchplus()', webpage):
- fvar =
"fvarhd"
+ fvar =
'fvarhd'
else:
else:
- fvar =
"fvar"
+ fvar =
'fvar'
- info_url =
"http://www.traileraddict.com/%s.php?tid=%s"
% (fvar, str(video_id))
- info_webpage = self._download_webpage(info_url, video_id,
"Downloading the info webpage"
)
+ info_url =
'http://www.traileraddict.com/%s.php?tid=%s'
% (fvar, str(video_id))
+ info_webpage = self._download_webpage(info_url, video_id,
'Downloading the info webpage'
)
final_url = self._search_regex(r'&fileurl=(.+)',
final_url = self._search_regex(r'&fileurl=(.+)',
- info_webpage, 'Download url').replace('%3F', '?')
+
info_webpage, 'Download url').replace('%3F', '?')
thumbnail_url = self._search_regex(r'&image=(.+?)&',
thumbnail_url = self._search_regex(r'&image=(.+?)&',
- info_webpage, 'thumbnail url')
+
info_webpage, 'thumbnail url')
description = self._html_search_regex(
r'(?s)<div class="synopsis">.*?<div class="movie_label_info"[^>]*>(.*?)</div>',
description = self._html_search_regex(
r'(?s)<div class="synopsis">.*?<div class="movie_label_info"[^>]*>(.*?)</div>',