aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Bell <tobias.bell@gmail.com>2014-05-19 22:33:51 +0200
committerTobias Bell <tobias.bell@gmail.com>2014-05-19 22:33:51 +0200
commite5c3a4b54995422dcef1d2fbb032446e35358e8d (patch)
tree1f3e338273ed5e23adc5425666fce47267f07936
parent305d0683628d26c8e9ba04c77c4b3c7283106f80 (diff)
[gameone] Fix indentation and removed unused constants
-rw-r--r--youtube_dl/extractor/gameone.py30
1 files changed, 20 insertions, 10 deletions
diff --git a/youtube_dl/extractor/gameone.py b/youtube_dl/extractor/gameone.py
index 008eb90a5..2544ea521 100644
--- a/youtube_dl/extractor/gameone.py
+++ b/youtube_dl/extractor/gameone.py
@@ -14,10 +14,10 @@ NAMESPACE_MAP = {
}
# URL prefix to download the mp4 files directly instead of streaming via rtmp
-# Credits go to XBox-Maniac http://board.jdownloader.org/showpost.php?p=185835&postcount=31
+# Credits go to XBox-Maniac
+# http://board.jdownloader.org/showpost.php?p=185835&postcount=31
RAW_MP4_URL = 'http://cdn.riptide-mtvn.com/'
-PUB_DATE_FORMAT = '%Y-%m-%d %H:%M:%S %z'
class GameOneIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?gameone\.de/tv/(?P<id>\d+)'
@@ -44,7 +44,14 @@ class GameOneIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
og_video = self._og_search_video_url(webpage, secure=False)
description = self._html_search_meta('description', webpage)
- age_limit = int(self._search_regex(r'age=(\d+)', self._html_search_meta('age-de-meta-label', webpage), 'age_limit', '0'))
+ age_limit = int(
+ self._search_regex(
+ r'age=(\d+)',
+ self._html_search_meta(
+ 'age-de-meta-label',
+ webpage),
+ 'age_limit',
+ '0'))
mrss_url = self._search_regex(r'mrss=([^&]+)', og_video, 'mrss')
mrss = self._download_xml(mrss_url, video_id, 'Downloading mrss')
@@ -54,16 +61,19 @@ class GameOneIE(InfoExtractor):
content = mrss.find(xpath_with_ns('.//media:content', NAMESPACE_MAP))
content_url = content.get('url')
- content = self._download_xml(content_url, video_id, 'Downloading media:content')
+ content = self._download_xml(
+ content_url,
+ video_id,
+ 'Downloading media:content')
rendition_items = content.findall('.//rendition')
duration = int(rendition_items[0].get('duration'))
formats = [
- {
- 'url': re.sub(r'.*/(r2)', RAW_MP4_URL + r'\1', r.find('./src').text),
- 'width': int(r.get('width')),
- 'height': int(r.get('height')),
- 'tbr': int(r.get('bitrate')),
- }
+ {
+ 'url': re.sub(r'.*/(r2)', RAW_MP4_URL + r'\1', r.find('./src').text),
+ 'width': int(r.get('width')),
+ 'height': int(r.get('height')),
+ 'tbr': int(r.get('bitrate')),
+ }
for r in rendition_items
]