X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Forf.py;h=4e293392b3d39b46ad1612d884068a2dbfaeef23;hb=121c09c7be1ac2944f3432122104c1952bfd1f04;hp=4fed83bd615172140f7e163534cee58924b8bc0d;hpb=43bc88903d0665c42f205bddd0a2f5017581e8be;p=youtube-dl diff --git a/youtube_dl/extractor/orf.py b/youtube_dl/extractor/orf.py index 4fed83bd6..4e293392b 100644 --- a/youtube_dl/extractor/orf.py +++ b/youtube_dl/extractor/orf.py @@ -128,13 +128,16 @@ class ORFTVthekIE(InfoExtractor): } -# Audios on ORF radio are only available for 7 days, so we can't add tests. - - class ORFOE1IE(InfoExtractor): IE_NAME = 'orf:oe1' IE_DESC = 'Radio Österreich 1' - _VALID_URL = r'http://oe1\.orf\.at/programm/(?P[0-9]+)' + _VALID_URL = r'http://oe1\.orf\.at/(?:programm/|konsole.*?#\?track_id=)(?P[0-9]+)' + + # Audios on ORF radio are only available for 7 days, so we can't add tests. + _TEST = { + 'url': 'http://oe1.orf.at/konsole?show=on_demand#?track_id=394211', + 'only_matching': True, + } def _real_extract(self, url): show_id = self._match_id(url) @@ -160,7 +163,7 @@ class ORFOE1IE(InfoExtractor): class ORFFM4IE(InfoExtractor): - IE_DESC = 'orf:fm4' + IE_NAME = 'orf:fm4' IE_DESC = 'radio FM4' _VALID_URL = r'http://fm4\.orf\.at/7tage/?#(?P[0-9]+)/(?P\w+)'