[gaskrank] Add new extractor - fixes as requested

This commit is contained in:
motophil 2017-01-20 19:36:21 +01:00
parent 16797933bb
commit 5de648f019

View File

@ -1,16 +1,15 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
from re import search from re import sub
from re import findall
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import js_to_json
class GaskrankIE(InfoExtractor): class GaskrankIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?gaskrank\.tv/tv(?:/[^/]+)+/(?P<id>[^/]+).htm' _VALID_URL = r'https?://(?:www\.)?gaskrank\.tv/tv(?:/[^/]+)+/(?P<id>[^/]+).htm'
_TEST = { _TEST = {
'url': 'http://www.gaskrank.tv/tv/motorrad-fun/strike-einparken-durch-anfaenger-crash-mit-groesserem-flurschaden.htm', 'url': 'http://www.gaskrank.tv/tv/motorrad-fun/strike-einparken-durch-anfaenger-crash-mit-groesserem-flurschaden.htm',
'md5': '1ae88dbac97887d85ebd1157a95fc4f9', 'md5': '200e28a405f6919b914a83f8adfc5739',
'info_dict': { 'info_dict': {
'id': '201601/26955', 'id': '201601/26955',
'ext': 'mp4', 'ext': 'mp4',
@ -20,22 +19,25 @@ class GaskrankIE(InfoExtractor):
} }
def _real_extract(self, url): def _real_extract(self, url):
def fix_json(code):
return sub(r'}[\s]*?,[\s]*?}', r'}}', js_to_json(code))
display_id = self._match_id(url) display_id = self._match_id(url)
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
video_id = self._search_regex(r'https?://movies.gaskrank.tv/([^-]*?).mp4', webpage, 'video id') video_id = self._search_regex(r'https?://movies.gaskrank.tv/([^-]*?).mp4', webpage, 'video id')
playlist = self._search_regex(r'playlist:\s*\[\s*{\s*([\s\S]*(?!}\s*]))', webpage, 'video id') categories = self._search_regex(r'https?://(?:www\.)?gaskrank\.tv/tv(?:/([^/]+))+/[^/]+.htm', url, 'categories')
entries = findall(r'[0-9]+:\s*{[\s\S]*?}', playlist) title = self._search_regex(r'movieName[\s\S]*?\'([^\']*?)\'', webpage, 'config', default='{}')
thumbnail = self._search_regex(r'poster[\s\S]*?\'([^\']*?)\'', webpage, 'config', default='{}')
playlist = self._parse_json(
self._search_regex(r'playlist:[\s\S]*?\[([\s\S]*?)]', webpage, 'config', default='{}'),
video_id, transform_source=fix_json, fatal=False)
formats = [] formats = []
for entry in entries: for key in playlist:
format = dict() formats.append({
format['url'] = search(r'src:[\s]*\"([^\"]*)\"', entry).group(1) 'url': playlist[key]['src'],
format['format_id'] = search(r'([0-9]+):\s*{[\s\S]*?}', entry).group(1) 'format_id': key,
format['quality'] = search(r'quality:[\s]*\"([^\"]*)\"', entry).group(1) 'quality': playlist[key]['quality'],
format['resolution'] = format['quality'] 'resolution': playlist[key]['quality']})
formats.append(format)
title = self._html_search_regex(r'movieName: *\'([^\']*)\'', webpage, 'title')
thumbnail = self._html_search_regex(r'poster: *\'([^\']*)\'', webpage, 'thumbnail')
categories = search(r'https?://(?:www\.)?gaskrank\.tv/tv(?:/([^/]+))+/[^/]+.htm', url).group(1)
return { return {
'id': video_id, 'id': video_id,