[gameone] Simplified extraction of description

pull/2941/head
Tobias Bell 11 years ago
parent 9e30092361
commit a84d20fc14

@ -26,11 +26,7 @@ class GameOneIE(InfoExtractor):
'title': 'Game One - Folge 288', 'title': 'Game One - Folge 288',
'duration': 1238, 'duration': 1238,
'thumbnail': 'http://s3.gameone.de/gameone/assets/video_metas/teaser_images/000/643/636/big/640x360.jpg', 'thumbnail': 'http://s3.gameone.de/gameone/assets/video_metas/teaser_images/000/643/636/big/640x360.jpg',
'description': 'Puh, das ist ja wieder eine volle Packung! Erst begleiten wir Nils zum ' 'description': 'FIFA-Pressepokal 2014, Star Citizen, Kingdom Come: Deliverance, Project Cars, Schöner Trants Nerdquiz Folge 2 Runde 1',
'FIFA-Pressepokal 2014, den er nach 2010 nun zum zweiten Mal gewinnen will.\n'
'Danach gibts eine Vorschau auf die drei kommenden Hits “Star Citizen”, “Kingdom Come: Deliverance” und “Project Cars”.\n'
'Und dann gehts auch schon weiter mit der nächsten Folge vom Nerdquiz! Der schöne Trant foltert seine Kandidaten wieder '
'mit fiesen Fragen. Hier gibts die erste Hälfte, in Folge 289 gehts weiter.'
} }
} }
@ -40,12 +36,12 @@ class GameOneIE(InfoExtractor):
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
og_video = self._og_search_video_url(webpage, secure=False) og_video = self._og_search_video_url(webpage, secure=False)
description = self._html_search_meta('description', webpage)
mrss_url = self._search_regex(r'mrss=([^&]+)', og_video, 'mrss') mrss_url = self._search_regex(r'mrss=([^&]+)', og_video, 'mrss')
mrss = self._download_xml(mrss_url, video_id, 'Downloading mrss') mrss = self._download_xml(mrss_url, video_id, 'Downloading mrss')
title = mrss.find('.//item/title').text title = mrss.find('.//item/title').text
thumbnail = mrss.find('.//item/image').get('url') thumbnail = mrss.find('.//item/image').get('url')
description = self._extract_description(mrss)
content = mrss.find(xpath_with_ns('.//media:content', NAMESPACE_MAP)) content = mrss.find(xpath_with_ns('.//media:content', NAMESPACE_MAP))
content_url = content.get('url') content_url = content.get('url')
@ -70,7 +66,3 @@ class GameOneIE(InfoExtractor):
'formats': formats, 'formats': formats,
'description': description, 'description': description,
} }
def _extract_description(self, mrss):
description = mrss.find('.//item/description')
return u''.join(t for t in description.itertext())

Loading…
Cancel
Save