projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[periscope:user] Adapt to layout changes (Closes #9563)
[youtube-dl]
/
youtube_dl
/
extractor
/
orf.py
diff --git
a/youtube_dl/extractor/orf.py
b/youtube_dl/extractor/orf.py
index c54775d54ab628203beb41c0dd52705c35821a55..4e3864f0d7bd1f6b63c560e8b04ae38844a283f9 100644
(file)
--- a/
youtube_dl/extractor/orf.py
+++ b/
youtube_dl/extractor/orf.py
@@
-112,6
+112,7
@@
class ORFTVthekIE(InfoExtractor):
% geo_str),
fatal=False)
% geo_str),
fatal=False)
+ self._check_formats(formats, video_id)
self._sort_formats(formats)
upload_date = unified_strdate(sd['created_date'])
self._sort_formats(formats)
upload_date = unified_strdate(sd['created_date'])
@@
-136,7
+137,7
@@
class ORFTVthekIE(InfoExtractor):
class ORFOE1IE(InfoExtractor):
IE_NAME = 'orf:oe1'
IE_DESC = 'Radio Österreich 1'
class ORFOE1IE(InfoExtractor):
IE_NAME = 'orf:oe1'
IE_DESC = 'Radio Österreich 1'
- _VALID_URL = r'http://oe1\.orf\.at/(?:programm/|konsole.*?#\?track_id=)(?P<id>[0-9]+)'
+ _VALID_URL = r'http
s?
://oe1\.orf\.at/(?:programm/|konsole.*?#\?track_id=)(?P<id>[0-9]+)'
# Audios on ORF radio are only available for 7 days, so we can't add tests.
_TEST = {
# Audios on ORF radio are only available for 7 days, so we can't add tests.
_TEST = {
@@
-170,7
+171,7
@@
class ORFOE1IE(InfoExtractor):
class ORFFM4IE(InfoExtractor):
IE_NAME = 'orf:fm4'
IE_DESC = 'radio FM4'
class ORFFM4IE(InfoExtractor):
IE_NAME = 'orf:fm4'
IE_DESC = 'radio FM4'
- _VALID_URL = r'http://fm4\.orf\.at/(?:7tage/?#|player/)(?P<date>[0-9]+)/(?P<show>\w+)'
+ _VALID_URL = r'http
s?
://fm4\.orf\.at/(?:7tage/?#|player/)(?P<date>[0-9]+)/(?P<show>\w+)'
_TEST = {
'url': 'http://fm4.orf.at/player/20160110/IS/',
_TEST = {
'url': 'http://fm4.orf.at/player/20160110/IS/',
@@
-184,6
+185,7
@@
class ORFFM4IE(InfoExtractor):
'timestamp': 1452456073,
'upload_date': '20160110',
},
'timestamp': 1452456073,
'upload_date': '20160110',
},
+ 'skip': 'Live streams on FM4 got deleted soon',
}
def _real_extract(self, url):
}
def _real_extract(self, url):
@@
-221,7
+223,7
@@
class ORFFM4IE(InfoExtractor):
class ORFIPTVIE(InfoExtractor):
IE_NAME = 'orf:iptv'
IE_DESC = 'iptv.ORF.at'
class ORFIPTVIE(InfoExtractor):
IE_NAME = 'orf:iptv'
IE_DESC = 'iptv.ORF.at'
- _VALID_URL = r'http://iptv\.orf\.at/(?:#/)?stories/(?P<id>\d+)'
+ _VALID_URL = r'http
s?
://iptv\.orf\.at/(?:#/)?stories/(?P<id>\d+)'
_TEST = {
'url': 'http://iptv.orf.at/stories/2275236/',
_TEST = {
'url': 'http://iptv.orf.at/stories/2275236/',