aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorGeorge Brighton <george@gebn.co.uk>2015-06-27 20:36:46 +0100
committerGeorge Brighton <george@gebn.co.uk>2015-06-27 20:36:46 +0100
commitd16ef949ca94ffb998c4db5a8367f0b367d659e3 (patch)
treed6684815e91a86842d39573d001dee7aa20aacec /youtube_dl
parenta8e6f30d8ed13209f2e9815ae97b3edccd38561b (diff)
downloadyoutube-dl-d16ef949ca94ffb998c4db5a8367f0b367d659e3.tar.xz
[moviefap] Allow non-critical fields to change without breaking extraction
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/moviefap.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/youtube_dl/extractor/moviefap.py b/youtube_dl/extractor/moviefap.py
index 1985c53c0..23575d30a 100644
--- a/youtube_dl/extractor/moviefap.py
+++ b/youtube_dl/extractor/moviefap.py
@@ -89,14 +89,14 @@ class MovieFapIE(InfoExtractor):
'display_id': re.compile(self._VALID_URL).match(url).group('name'),
'thumbnails': self.__get_thumbnail_data(xml),
'thumbnail': xml.find('startThumb').text,
- 'description': self._html_search_regex(r'name="description" value="(.*?)"', webpage, 'description'),
- 'uploader_id': self._html_search_regex(r'name="username" value="(.*?)"', webpage, 'uploader_id'),
- 'view_count': str_to_int(self._html_search_regex(r'<br>Views <strong>([0-9]+)</strong>', webpage, 'view_count')),
- 'average_rating': float(self._html_search_regex(r'Current Rating<br> <strong>(.*?)</strong>', webpage, 'average_rating')),
- 'comment_count': str_to_int(self._html_search_regex(r'<span id="comCount">([0-9]+)</span>', webpage, 'comment_count')),
+ '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'),
- 'categories': self._html_search_regex(r'</div>\s*(.*?)\s*<br>', webpage, 'categories').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