From 3126ad38d7c368b5212f93e95287f1866b63a172 Mon Sep 17 00:00:00 2001 From: phaer Date: Wed, 10 May 2017 00:46:24 +0200 Subject: [PATCH] [orf] re-introduce separate classes for ORF radios... ...to preserve ie_keys. --- youtube_dl/extractor/extractors.py | 3 ++- youtube_dl/extractor/orf.py | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 4e5e16fb1..3a0e81e2b 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -680,7 +680,8 @@ from .openload import OpenloadIE from .ora import OraTVIE from .orf import ( ORFTVthekIE, - ORFRadioIE, + ORFFM4IE, + ORFOE1IE, ORFIPTVIE, ) from .pandatv import PandaTVIE diff --git a/youtube_dl/extractor/orf.py b/youtube_dl/extractor/orf.py index bafee701b..3a1f505eb 100644 --- a/youtube_dl/extractor/orf.py +++ b/youtube_dl/extractor/orf.py @@ -143,9 +143,6 @@ class ORFTVthekIE(InfoExtractor): class ORFRadioIE(InfoExtractor): - IE_NAME = 'orf:radio' - IE_DESC = 'ORF Radio' - _VALID_URL = r'https?://(?Poe1|fm4)\.orf\.at/(?:7tage/?#|player/)(?P[0-9]+)/(?P\w+)' _TESTS = [ @@ -214,6 +211,16 @@ class ORFRadioIE(InfoExtractor): } +class ORFFM4IE(ORFRadioIE): + IE_NAME = 'orf:fm4' + IE_DESC = 'radio FM4' + + +class ORFOE1IE(ORFRadioIE): + IE_NAME = 'orf:oe1' + IE_DESC = 'Radio Österreich 1' + + class ORFIPTVIE(InfoExtractor): IE_NAME = 'orf:iptv' IE_DESC = 'iptv.ORF.at'