Relax regex.

This commit is contained in:
Avi Peretz 2019-01-20 10:27:20 +02:00
parent f8ae9b34da
commit 9062246371

View File

@ -466,7 +466,7 @@ class FacebookIE(InfoExtractor):
uploader_id = self._search_regex( uploader_id = self._search_regex(
r'ownerid:"([\d]+)', webpage, r'ownerid:"([\d]+)', webpage,
'uploader_id', default=None) or self._search_regex( 'uploader_id', default=None) or self._search_regex(
r'\"ownerid\":"(\d+)"', tahoe_secondary_data, r'[\'\"]ownerid[\'\"]\s*:\s*[\'\"](\d+)[\'\"]', tahoe_secondary_data,
'uploader_id', fatal=False) 'uploader_id', fatal=False)
thumbnail = self._og_search_thumbnail(webpage) thumbnail = self._og_search_thumbnail(webpage)
@ -474,11 +474,11 @@ class FacebookIE(InfoExtractor):
view_count = parse_count(self._search_regex( view_count = parse_count(self._search_regex(
r'\bpostViewCount\s*:\s*["\']([\d,.]+)', webpage, 'view count', r'\bpostViewCount\s*:\s*["\']([\d,.]+)', webpage, 'view count',
default=None) or self._search_regex( default=None) or self._search_regex(
r'\"postViewCount\"\s*:\s*(\d+)', tahoe_secondary_data, 'view count', r'[\'\"]postViewCount[\'\"]\s*:\s*(\d+)', tahoe_secondary_data, 'view count',
default=None) or self._search_regex( default=None) or self._search_regex(
r'\bviewCount\s*:\s*["\']([\d,.]+)', webpage, 'view count', r'\bviewCount\s*:\s*["\']([\d,.]+)', webpage, 'view count',
default=None) or self._search_regex( default=None) or self._search_regex(
r'\"viewCount\"\s*:\s*(\d+)', tahoe_secondary_data, 'view count', r'[\'\"]viewCount[\'\"]\s*:\s*(\d+)', tahoe_secondary_data, 'view count',
default=None) default=None)
) )