aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorGeorge Brighton <george@gebn.co.uk>2015-06-27 22:32:56 +0100
committerGeorge Brighton <george@gebn.co.uk>2015-06-27 22:32:56 +0100
commit1a5fd4eebc2717b5173df50d65007f90cb05ee30 (patch)
tree01417d9655260b58f2c42127a0714fbae6558439 /youtube_dl/extractor
parent8a1b49ff19a8a1fdc2c30cf10cc0598ac9bc8819 (diff)
[moviefap] Wrap long lines
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/moviefap.py27
1 files changed, 18 insertions, 9 deletions
diff --git a/youtube_dl/extractor/moviefap.py b/youtube_dl/extractor/moviefap.py
index 295bfe3f0..9de052a99 100644
--- a/youtube_dl/extractor/moviefap.py
+++ b/youtube_dl/extractor/moviefap.py
@@ -78,23 +78,32 @@ class MovieFapIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
# find and retrieve the XML document detailing video download URLs
- info_url = self._html_search_regex(r'flashvars\.config = escape\("(.+?)"', webpage, 'player parameters')
+ info_url = self._html_search_regex( \
+ r'flashvars\.config = escape\("(.+?)"', webpage, 'player parameters')
xml = self._download_xml(info_url, video_id)
info = {
'id': video_id,
- 'title': self._html_search_regex(r'<div id="view_title"><h1>(.*?)</h1>', webpage, 'title'),
+ 'title': self._html_search_regex( \
+ r'<div id="view_title"><h1>(.*?)</h1>', webpage, 'title'),
'display_id': re.compile(self._VALID_URL).match(url).group('name'),
'thumbnails': self.__get_thumbnail_data(xml),
'thumbnail': xpath_text(xml, 'startThumb', 'thumbnail'),
- 'description': self._html_search_regex(r'name="description" value="(.*?)"', webpage, 'description', fatal=False),
- 'uploader_id': self._html_search_regex(r'name="username" value="(.*?)"', webpage, 'uploader_id', fatal=False),
- 'view_count': str_to_int(self._html_search_regex(r'<br>Views <strong>([0-9]+)</strong>', webpage, 'view_count, fatal=False')),
- 'average_rating': float(self._html_search_regex(r'Current Rating<br> <strong>(.*?)</strong>', webpage, 'average_rating', fatal=False)),
- 'comment_count': str_to_int(self._html_search_regex(r'<span id="comCount">([0-9]+)</span>', webpage, 'comment_count', fatal=False)),
+ 'description': self._html_search_regex( \
+ r'name="description" value="(.*?)"', webpage, 'description', fatal=False),
+ 'uploader_id': self._html_search_regex( \
+ r'name="username" value="(.*?)"', webpage, 'uploader_id', fatal=False),
+ 'view_count': str_to_int(self._html_search_regex( \
+ r'<br>Views <strong>([0-9]+)</strong>', webpage, 'view_count, fatal=False')),
+ 'average_rating': float(self._html_search_regex( \
+ r'Current Rating<br> <strong>(.*?)</strong>', webpage, 'average_rating', fatal=False)),
+ 'comment_count': str_to_int(self._html_search_regex( \
+ r'<span id="comCount">([0-9]+)</span>', webpage, 'comment_count', fatal=False)),
'age_limit': 18,
- 'webpage_url': self._html_search_regex(r'name="link" value="(.*?)"', webpage, 'webpage_url', fatal=False),
- 'categories': self._html_search_regex(r'</div>\s*(.*?)\s*<br>', webpage, 'categories', fatal=False).split(', ')
+ 'webpage_url': self._html_search_regex( \
+ r'name="link" value="(.*?)"', webpage, 'webpage_url', fatal=False),
+ 'categories': self._html_search_regex( \
+ r'</div>\s*(.*?)\s*<br>', webpage, 'categories', fatal=False).split(', ')
}
# find and add the format