fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[moviefap] Wrap long lines

This commit is contained in:
George Brighton 2015-06-27 22:32:56 +01:00
parent 8a1b49ff19
commit 1a5fd4eebc
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
youtube_dl/extractor/moviefap.py
View File

@ -78,23 +78,32 @@ class MovieFapIE(InfoExtractor):
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
# find and retrieve the XML document detailing video download URLs # 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) xml = self._download_xml(info_url, video_id)
info = { info = {
'id': video_id, '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'), 'display_id': re.compile(self._VALID_URL).match(url).group('name'),
'thumbnails': self.__get_thumbnail_data(xml), 'thumbnails': self.__get_thumbnail_data(xml),
'thumbnail': xpath_text(xml, 'startThumb', 'thumbnail'), 'thumbnail': xpath_text(xml, 'startThumb', 'thumbnail'),
'description': self._html_search_regex(r'name="description" value="(.*?)"', webpage, 'description', fatal=False), 'description': self._html_search_regex( \
'uploader_id': self._html_search_regex(r'name="username" value="(.*?)"', webpage, 'uploader_id', fatal=False), r'name="description" value="(.*?)"', webpage, 'description', fatal=False),
'view_count': str_to_int(self._html_search_regex(r'<br>Views <strong>([0-9]+)</strong>', webpage, 'view_count, fatal=False')), 'uploader_id': self._html_search_regex( \
'average_rating': float(self._html_search_regex(r'Current Rating<br> <strong>(.*?)</strong>', webpage, 'average_rating', fatal=False)), r'name="username" value="(.*?)"', webpage, 'uploader_id', fatal=False),
'comment_count': str_to_int(self._html_search_regex(r'<span id="comCount">([0-9]+)</span>', webpage, 'comment_count', 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, 'age_limit': 18,
'webpage_url': self._html_search_regex(r'name="link" value="(.*?)"', webpage, 'webpage_url', fatal=False), 'webpage_url': self._html_search_regex( \
'categories': self._html_search_regex(r'</div>\s*(.*?)\s*<br>', webpage, 'categories', fatal=False).split(', ') 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 # find and add the format