projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[screenwavemedia] Add support for player2 URLs (Closes #5696)
[youtube-dl]
/
youtube_dl
/
extractor
/
traileraddict.py
diff --git
a/youtube_dl/extractor/traileraddict.py
b/youtube_dl/extractor/traileraddict.py
index 3b1a6fb61dbe84c3ce648de430674fb1c589740c..1c53a3fd09459f31fdf188dc852141ef000af4a6 100644
(file)
--- a/
youtube_dl/extractor/traileraddict.py
+++ b/
youtube_dl/extractor/traileraddict.py
@@
-6,6
+6,7
@@
from .common import InfoExtractor
class TrailerAddictIE(InfoExtractor):
class TrailerAddictIE(InfoExtractor):
+ _WORKING = False
_VALID_URL = r'(?:http://)?(?:www\.)?traileraddict\.com/(?:trailer|clip)/(?P<movie>.+?)/(?P<trailer_name>.+)'
_TEST = {
'url': 'http://www.traileraddict.com/trailer/prince-avalanche/trailer',
_VALID_URL = r'(?:http://)?(?:www\.)?traileraddict\.com/(?:trailer|clip)/(?P<movie>.+?)/(?P<trailer_name>.+)'
_TEST = {
'url': 'http://www.traileraddict.com/trailer/prince-avalanche/trailer',
@@
-24,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)
@@
-42,12
+43,12
@@
class TrailerAddictIE(InfoExtractor):
fvar = "fvar"
info_url = "http://www.traileraddict.com/%s.php?tid=%s" % (fvar, str(video_id))
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_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>',