R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

generic title fix

Browse Source
This commit is contained in:
bhodaya 2020-08-10 14:14:20 +03:00
parent e3e82f7d20
commit 8ebd1ff488
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/facebook.py
View File

@ -692,8 +692,7 @@ class FacebookIE(InfoExtractor):
if not self._valid_video_title(video_title): if not self._valid_video_title(video_title):
video_title = self._og_search_title(webpage, default=None) video_title = self._og_search_title(webpage, default=None)
if not self._valid_video_title(video_title): if not self._valid_video_title(video_title):
video_title = self._html_search_meta( video_title = self._resolve_description(webpage, tahoe_data)
'description', webpage, 'title', default=None)
if not self._valid_video_title(video_title): if not self._valid_video_title(video_title):
values = re.findall(r'videoTitle"\s*:\s*"(.*?)"', tahoe_data.secondary) values = re.findall(r'videoTitle"\s*:\s*"(.*?)"', tahoe_data.secondary)
if values: if values:
@ -816,7 +815,7 @@ class FacebookIE(InfoExtractor):
def _valid_video_title(self, video_title): def _valid_video_title(self, video_title):
if video_title: if video_title:
video_title = video_title.lower() video_title = video_title.lower()
return video_title and not u'log in or sign up to view' in video_title return video_title and not u'log in or sign up to view' in video_title and not u'on facebook watch' in video_title
def validate_webpage(self, webpage): def validate_webpage(self, webpage):
m_msg = re.search(r'class="[^"]*uiInterstitialContent[^"]*"><div>(.*?)</div>', webpage) m_msg = re.search(r'class="[^"]*uiInterstitialContent[^"]*"><div>(.*?)</div>', webpage)
@ -831,6 +830,11 @@ class FacebookIE(InfoExtractor):
elif '>You must log in to continue' in webpage: elif '>You must log in to continue' in webpage:
self.raise_login_required() self.raise_login_required()
def _resolve_description(self, webpage, tahoe_data):
description = self._html_search_meta(
'description', webpage, 'title', default=None)
return description
class FacebookTahoeData: class FacebookTahoeData:
def __init__(self, extractor, page, video_id): def __init__(self, extractor, page, video_id):