From 19a107f21c7544b5e49a58040d09d9465f6858b1 Mon Sep 17 00:00:00 2001 From: Aakash Gajjar Date: Wed, 26 Aug 2020 20:22:32 +0530 Subject: Revert "pull changes from remote master (#190)" (#193) This reverts commit b827ee921fe510a8730a9fab070148ed2b8279b5. --- youtube_dl/extractor/facebook.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'youtube_dl/extractor/facebook.py') diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py index 610d66745..ce64e2683 100644 --- a/youtube_dl/extractor/facebook.py +++ b/youtube_dl/extractor/facebook.py @@ -466,18 +466,15 @@ class FacebookIE(InfoExtractor): return info_dict if '/posts/' in url: - video_id_json = self._search_regex( - r'(["\'])video_ids\1\s*:\s*(?P\[.+?\])', webpage, 'video ids', group='ids', - default='') - if video_id_json: - entries = [ - self.url_result('facebook:%s' % vid, FacebookIE.ie_key()) - for vid in self._parse_json(video_id_json, video_id)] - return self.playlist_result(entries, video_id) - - # Single Video? - video_id = self._search_regex(r'video_id:\s*"([0-9]+)"', webpage, 'single video id') - return self.url_result('facebook:%s' % video_id, FacebookIE.ie_key()) + entries = [ + self.url_result('facebook:%s' % vid, FacebookIE.ie_key()) + for vid in self._parse_json( + self._search_regex( + r'(["\'])video_ids\1\s*:\s*(?P\[.+?\])', + webpage, 'video ids', group='ids'), + video_id)] + + return self.playlist_result(entries, video_id) else: _, info_dict = self._extract_from_url( self._VIDEO_PAGE_TEMPLATE % video_id, -- cgit v1.2.3