Skip to content

Commit

Permalink
[turner,cnn] move a check for wrong timestamp to CNNIE
Browse files Browse the repository at this point in the history
  • Loading branch information
remitamine committed Aug 29, 2016
1 parent 1fe48af commit da30a20
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
4 changes: 4 additions & 0 deletions youtube_dl/extractor/cnn.py
Expand Up @@ -83,6 +83,10 @@ class CNNIE(TurnerBaseIE):
},
}

def _extract_timestamp(self, video_data):
# TODO: fix timestamp extraction
return None

def _real_extract(self, url):
sub_domain, path, page_title = re.match(self._VALID_URL, url).groups()
if sub_domain not in ('money', 'edition'):
Expand Down
9 changes: 4 additions & 5 deletions youtube_dl/extractor/turner.py
Expand Up @@ -17,6 +17,9 @@


class TurnerBaseIE(InfoExtractor):
def _extract_timestamp(self, video_data):
return int_or_none(xpath_attr(video_data, 'dateCreated', 'uts'))

def _extract_cvp_info(self, data_src, video_id, path_data={}):
video_data = self._download_xml(data_src, video_id)
video_id = video_data.attrib['id'].split('/')[-1].split('.')[0]
Expand Down Expand Up @@ -159,10 +162,6 @@ def _extract_cvp_info(self, data_src, video_id, path_data={}):
'height': int_or_none(image.get('height')),
} for image in video_data.findall('images/image')]

timestamp = None
if 'cnn.com' not in data_src:
timestamp = int_or_none(xpath_attr(video_data, 'dateCreated', 'uts'))

return {
'id': video_id,
'title': title,
Expand All @@ -171,7 +170,7 @@ def _extract_cvp_info(self, data_src, video_id, path_data={}):
'thumbnails': thumbnails,
'description': xpath_text(video_data, 'description'),
'duration': parse_duration(xpath_text(video_data, 'length') or xpath_text(video_data, 'trt')),
'timestamp': timestamp,
'timestamp': self._extract_timestamp(video_data),
'upload_date': xpath_attr(video_data, 'metas', 'version'),
'series': xpath_text(video_data, 'showTitle'),
'season_number': int_or_none(xpath_text(video_data, 'seasonNumber')),
Expand Down

0 comments on commit da30a20

Please sign in to comment.