diff --git a/youtube_dl/extractor/gaskrank.py b/youtube_dl/extractor/gaskrank.py index c40d35772..d4e7cf5f0 100644 --- a/youtube_dl/extractor/gaskrank.py +++ b/youtube_dl/extractor/gaskrank.py @@ -1,13 +1,13 @@ # coding: utf-8 from __future__ import unicode_literals -from re import sub +import re from .common import InfoExtractor from ..utils import js_to_json class GaskrankIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?gaskrank\.tv/tv(?:/[^/]+)+/(?P[^/]+).htm' + _VALID_URL = r'https?://(?:www\.)?gaskrank\.tv/tv(?:/[^/]+)+/(?P[^/]+)\.htm' _TEST = { 'url': 'http://www.gaskrank.tv/tv/motorrad-fun/strike-einparken-durch-anfaenger-crash-mit-groesserem-flurschaden.htm', 'md5': '200e28a405f6919b914a83f8adfc5739', @@ -21,24 +21,24 @@ class GaskrankIE(InfoExtractor): def _real_extract(self, url): def fix_json(code): - return sub(r'}[\s]*?,[\s]*?}', r'}}', js_to_json(code)) + return re.sub(r'}[\s]*?,[\s]*?}', r'}}', js_to_json(code)) display_id = self._match_id(url) webpage = self._download_webpage(url, display_id) - video_id = self._search_regex(r'https?://movies.gaskrank.tv/([^-]*?).mp4', webpage, 'video id') - categories = self._search_regex(r'https?://(?:www\.)?gaskrank\.tv/tv(?:/([^/]+))+/[^/]+.htm', url, 'categories') - title = self._search_regex(r'movieName[\s\S]*?\'([^\']*?)\'', webpage, 'config', default='{}') - thumbnail = self._search_regex(r'poster[\s\S]*?\'([^\']*?)\'', webpage, 'config', default='{}') + video_id = self._search_regex(r'https?://movies\.gaskrank\.tv/([^-]*?)\.mp4', webpage, 'video id') + categories = self._search_regex(r'https?://(?:www\.)?gaskrank\.tv/tv(?:/([^/]+))+/[^/]+\.htm', url, 'categories', default=None) + title = self._search_regex(r'movieName[^\']*?\'([^\']*?)\'', webpage, 'title') + thumbnail = self._search_regex(r'poster[^\']*?\'([^\']*?)\'', webpage, 'thumbnail', default=None) playlist = self._parse_json( - self._search_regex(r'playlist:[\s\S]*?\[([\s\S]*?)]', webpage, 'config', default='{}'), + self._search_regex(r'playlist:[\s\S]*?\[([\s\S]*?)]', webpage, 'playlist', default='{}'), video_id, transform_source=fix_json, fatal=False) formats = [] - for key in playlist: + for key in sorted(playlist): formats.append({ 'url': playlist[key]['src'], 'format_id': key, - 'quality': playlist[key]['quality'], - 'resolution': playlist[key]['quality']}) + 'quality': playlist[key].get('quality'), + 'resolution': playlist[key].get('quality')}) return { 'id': video_id,