From dcfe3eedf5c9bb537bf39c6fbd7337d5ae4d881a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A9stin=20Reed?= <trox1972@users.noreply.github.com>
Date: Sun, 26 Jun 2016 01:29:48 +0200
Subject: [PATCH 1/2] [DBTV] Add support for articles

---
 youtube_dl/extractor/dbtv.py       | 26 ++++++++++++++++++++++++++
 youtube_dl/extractor/extractors.py |  5 ++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/dbtv.py b/youtube_dl/extractor/dbtv.py
index 133cdc50b..dab9bee13 100644
--- a/youtube_dl/extractor/dbtv.py
+++ b/youtube_dl/extractor/dbtv.py
@@ -79,3 +79,29 @@ class DBTVIE(InfoExtractor):
             'categories': video.get('tags'),
             'formats': formats,
         }
+
+
+class DagbladetArticleIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?dagbladet\.no/(?:\d+/){3}(?:[\w-]+/)+(?P<id>\d+)'
+    _TEST = {
+        'url': 'http://www.dagbladet.no/2016/02/23/nyheter/nordlys/ski/troms/ver/43254897/',
+        'info_dict': {
+            'id': '43254897',
+            'title': 'Etter ett \xe5rs planlegging, klaffet endelig alt: - Jeg m\xe5tte ta en liten dans',
+        },
+        'playlist_count': 3,
+    }
+
+    def _real_extract(self, url):
+        article_id = self._match_id(url)
+        webpage = self._download_webpage(url, article_id)
+
+        iframe_urls = re.findall(r'<iframe src="([^"]+(?:lazy)?player[^"]+)"', webpage)
+
+        if len(iframe_urls) == 1:
+            return self.url_result(self._proto_relative_url(iframe_urls), DBTVIE)
+
+        entries = [self.url_result(self._proto_relative_url(iframe_url))
+            for iframe_url in iframe_urls]
+
+        return self.playlist_result(entries, article_id, self._og_search_title(webpage))
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 9f98a1490..41ce04588 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -183,7 +183,10 @@ from .daum import (
     DaumPlaylistIE,
     DaumUserIE,
 )
-from .dbtv import DBTVIE
+from .dbtv import (
+    DBTVIE,
+    DagbladetArticleIE,
+)
 from .dcn import (
     DCNIE,
     DCNVideoIE,

From 3435358c9b52d4c0642820253d4dbd75f80f207d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A9stin=20Reed?= <trox1972@users.noreply.github.com>
Date: Sun, 26 Jun 2016 01:49:05 +0200
Subject: [PATCH 2/2] [DagbladetArticle] Simplify extraction

---
 youtube_dl/extractor/dbtv.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/youtube_dl/extractor/dbtv.py b/youtube_dl/extractor/dbtv.py
index dab9bee13..7b2410785 100644
--- a/youtube_dl/extractor/dbtv.py
+++ b/youtube_dl/extractor/dbtv.py
@@ -95,13 +95,8 @@ class DagbladetArticleIE(InfoExtractor):
     def _real_extract(self, url):
         article_id = self._match_id(url)
         webpage = self._download_webpage(url, article_id)
-
         iframe_urls = re.findall(r'<iframe src="([^"]+(?:lazy)?player[^"]+)"', webpage)
 
-        if len(iframe_urls) == 1:
-            return self.url_result(self._proto_relative_url(iframe_urls), DBTVIE)
-
         entries = [self.url_result(self._proto_relative_url(iframe_url))
             for iframe_url in iframe_urls]
-
         return self.playlist_result(entries, article_id, self._og_search_title(webpage))