From 068be1293c097ccd73f38bb374d9fc12a03745ec Mon Sep 17 00:00:00 2001 From: Thomas Christlieb Date: Mon, 30 Jan 2017 13:27:02 +0100 Subject: [PATCH 1/3] Added new Regex for prosiebensat1 Extractor Description. Fixes #11810 --- youtube_dl/extractor/prosiebensat1.py | 1 + 1 file changed, 1 insertion(+) diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py index 03e1b1f7f..9a7a07f52 100644 --- a/youtube_dl/extractor/prosiebensat1.py +++ b/youtube_dl/extractor/prosiebensat1.py @@ -349,6 +349,7 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE): r'

\s*(.+?)\s*

', r'

\s*(.+?)

', r']+id="veeseoDescription"[^>]*>(.+?)', + r'', ] _UPLOAD_DATE_REGEXES = [ r'', From 6e6b3a481380faac97b6e1072c187eda505657f1 Mon Sep 17 00:00:00 2001 From: Thomas Christlieb Date: Mon, 30 Jan 2017 15:21:45 +0100 Subject: [PATCH 2/3] Added new Site gaskrank.TV Fixes #11659 --- youtube_dl/extractor/extractors.py | 1 + youtube_dl/extractor/gaskrank.py | 32 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 youtube_dl/extractor/gaskrank.py diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 2590b5e1b..ace44fae3 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -339,6 +339,7 @@ from .gameone import ( from .gamersyde import GamersydeIE from .gamespot import GameSpotIE from .gamestar import GameStarIE +from .gaskrank import GaskrankIE from .gazeta import GazetaIE from .gdcvault import GDCVaultIE from .generic import GenericIE diff --git a/youtube_dl/extractor/gaskrank.py b/youtube_dl/extractor/gaskrank.py new file mode 100644 index 000000000..d1b0937e3 --- /dev/null +++ b/youtube_dl/extractor/gaskrank.py @@ -0,0 +1,32 @@ +# coding: utf-8 +from __future__ import unicode_literals + +from .common import InfoExtractor + +class GaskrankIE(InfoExtractor): + IE_NAME = 'Gaskrank' + _VALID_URL = r'(http.?://)www\.gaskrank\.tv/tv/.*?/(?P.*?)\.htm.?' + _TEST = { + 'url': 'http://www.gaskrank.tv/tv/motorradtreffen/elefantentreffen-2017-mit-suzuki-gsx-r-750-auf-winterreifen.htm', + 'md5': '23c91b49a5d599430824e586854081dd', + 'info_dict': { + 'id': 'elefantentreffen-2017-mit-suzuki-gsx-r-750-auf-winterreifen', + 'ext': 'mp4', + 'title': 'Elefantentreffen 2017 mit Suzuki GSX-R 750 auf Winterreifen ' + } + } + + def _real_extract(self, url): + video_id = self._match_id(url) + webpage = self._download_webpage(url, video_id) + + title = self._html_search_regex(r'(.*?)', webpage, 'title') + url_medium_qual = self._html_search_regex(r'0: { src:"(.*?)", type:', webpage, 'url') + url_high_qual = self._html_search_regex(r'1: { src:"(.*?)", type:', webpage, 'url') + + return { + 'id': video_id, + 'title': title, + 'url': url_high_qual + } + From a6edbb10a4cd2d932c953bec786f33246364f160 Mon Sep 17 00:00:00 2001 From: Thomas Christlieb Date: Mon, 30 Jan 2017 19:42:35 +0100 Subject: [PATCH 3/3] Fixed Unittest for gaskrank Extractor --- youtube_dl/extractor/gaskrank.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/gaskrank.py b/youtube_dl/extractor/gaskrank.py index d1b0937e3..78f439714 100644 --- a/youtube_dl/extractor/gaskrank.py +++ b/youtube_dl/extractor/gaskrank.py @@ -8,11 +8,11 @@ class GaskrankIE(InfoExtractor): _VALID_URL = r'(http.?://)www\.gaskrank\.tv/tv/.*?/(?P.*?)\.htm.?' _TEST = { 'url': 'http://www.gaskrank.tv/tv/motorradtreffen/elefantentreffen-2017-mit-suzuki-gsx-r-750-auf-winterreifen.htm', - 'md5': '23c91b49a5d599430824e586854081dd', + 'md5': '204b930c74e1fc7d42e424c6de4e4d71', 'info_dict': { 'id': 'elefantentreffen-2017-mit-suzuki-gsx-r-750-auf-winterreifen', 'ext': 'mp4', - 'title': 'Elefantentreffen 2017 mit Suzuki GSX-R 750 auf Winterreifen ' + 'title': 'Elefantentreffen 2017 mit Suzuki GSX-R 750 auf Winterreifen' } }