aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-03-03 12:34:34 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-03-03 12:34:34 +0100
commitf92259c0260880ac8e5f285b4b267183b97761c0 (patch)
tree924c80b158948360985feb791275c99f98c62c27
parent0afef30b23dbf5e590f510924a1271f515512ac3 (diff)
parent2acc1f8f50065aeb6a904b5b14e1e6d5b79a1484 (diff)
downloadyoutube-dl-f92259c0260880ac8e5f285b4b267183b97761c0.tar.xz
Merge remote-tracking branch 'origin/master'
-rw-r--r--youtube_dl/extractor/orf.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/youtube_dl/extractor/orf.py b/youtube_dl/extractor/orf.py
index 5f5694393..03421d1d5 100644
--- a/youtube_dl/extractor/orf.py
+++ b/youtube_dl/extractor/orf.py
@@ -8,6 +8,7 @@ from .common import InfoExtractor
from ..utils import (
HEADRequest,
unified_strdate,
+ ExtractorError,
)
@@ -35,7 +36,15 @@ class ORFIE(InfoExtractor):
data_json = self._search_regex(
r'initializeAdworx\((.+?)\);\n', webpage, 'video info')
all_data = json.loads(data_json)
- sdata = all_data[0]['values']['segments']
+
+ def get_segments(all_data):
+ for data in all_data:
+ if data['name'] == 'Tracker::EPISODE_DETAIL_PAGE_OVER_PROGRAM':
+ return data['values']['segments']
+
+ sdata = get_segments(all_data)
+ if not sdata:
+ raise ExtractorError('Unable to extract segments')
def quality_to_int(s):
m = re.search('([0-9]+)', s)