Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-12 00:57:15 +08:00
Code Issues Releases Wiki Activity

Merge branch 'ok-ru-timestamp' into fix.25.12.2018

Browse Source
This commit is contained in:
Avi Peretz 2018-12-27 23:43:37 +02:00
commit 068351c5c0
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
youtube_dl/extractor/odnoklassniki.py
View File

@ -127,8 +127,8 @@ class OdnoklassnikiIE(InfoExtractor):
'http://ok.ru/video/%s' % video_id, video_id)
error = self._search_regex(
r'[^>]+class="vp_video_stub_txt"[^>]*>([^<]+)<',
webpage, 'error', default=None)
r'<div class="vp_video_stub_txt">(?P<error>.*?)<\/div>',
webpage, name='error',group='error', default=None)
if error:
raise ExtractorError(error, expected=True)
@ -172,6 +172,32 @@ class OdnoklassnikiIE(InfoExtractor):
upload_date = unified_strdate(self._html_search_meta(
'ya:ovs:upload_date', webpage, 'upload date', default=None))
if upload_date is None:
upload_date_str = self._search_regex(
r'vp-layer-info_date">(?P<date>.*?)<\/span>',
webpage, 'upload date', group='date')
if upload_date_str:
from datetime import datetime
upload_date_time = None
try:
upload_date_time = datetime.strptime(upload_date_str, '%d %b %Y')
except:
pass
try:
upload_date_time = datetime.strptime(upload_date_str, '%d %b')
upload_date_time = upload_date_time.replace(year=datetime.utcnow().year)
except:
pass
try:
upload_date_time = datetime.strptime(upload_date_str, '%H:%M')
upload_date_time = upload_date_time.replace(year=datetime.utcnow().year)
upload_date_time = upload_date_time.replace(day=datetime.utcnow().day)
except:
pass
if upload_date_time:
upload_date = upload_date_time.strftime('%Y%m%d')
age_limit = None
adult = self._html_search_meta(
'ya:ovs:adult', webpage, 'age limit', default=None)