From d31de949734654e5d482cfe2ee141d97915937e9 Mon Sep 17 00:00:00 2001
From: juzza1 <juzza1@gmail.com>
Date: Sun, 19 May 2019 17:33:23 +0300
Subject: [PATCH 1/2] attempt to authenticate video url

---
 youtube_dl/extractor/ruutu.py | 44 +++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/youtube_dl/extractor/ruutu.py b/youtube_dl/extractor/ruutu.py
index f984040aa..eb60d4fe2 100644
--- a/youtube_dl/extractor/ruutu.py
+++ b/youtube_dl/extractor/ruutu.py
@@ -6,6 +6,7 @@ from ..compat import compat_urllib_parse_urlparse
 from ..utils import (
     determine_ext,
     ExtractorError,
+    find_xpath_attr,
     int_or_none,
     xpath_attr,
     xpath_text,
@@ -85,6 +86,18 @@ class RuutuIE(InfoExtractor):
         formats = []
         processed_urls = []
 
+        def authenticate_video_url(url):
+            """Authenticate video url
+
+            Returns original video url with authentication token
+            appended. Required for most videos since early 2019.
+            """
+            authenticated_url = self._download_webpage(
+                'https://gatling.nelonenmedia.fi/auth/access/v2',
+                video_id, query={'stream': url},
+                note='Authenticating video url', fatal=False)
+            return authenticated_url
+
         def extract_formats(node):
             for child in node:
                 if child.tag.endswith('Files'):
@@ -95,6 +108,15 @@ class RuutuIE(InfoExtractor):
                             or any(p in video_url for p in ('NOT_USED', 'NOT-USED'))):
                         continue
                     processed_urls.append(video_url)
+                    # Authentication may not be needed for some videos
+                    if not self._request_webpage(
+                            video_url, video_id,
+                            note='Checking if video is available without authentication',
+                            errnote='Authentication required',
+                            fatal=False):
+                        video_url = authenticate_video_url(video_url)
+                        if not video_url:
+                            continue
                     ext = determine_ext(video_url)
                     if ext == 'm3u8':
                         formats.extend(self._extract_m3u8_formats(
@@ -136,9 +158,27 @@ class RuutuIE(InfoExtractor):
 
         extract_formats(video_xml.find('./Clip'))
 
+        # If there are no formats, it's probably a Ruutu+ video
+        # Nevertheless, try to guess Ruutu+ status from xml
+        # to avoid false error messages
+        paid_tag = find_xpath_attr(
+            video_xml, './Clip/PassthroughVariables/variable', 'name',
+            val='paid')
+        if paid_tag is not None:
+            ruutuplus = int_or_none(xpath_attr(paid_tag, '.', 'value'))
+        else:
+            ruutuplus = None
         drm = xpath_text(video_xml, './Clip/DRM', default=None)
-        if not formats and drm:
-            raise ExtractorError('This video is DRM protected.', expected=True)
+        if not formats:
+            if drm:
+                raise ExtractorError(
+                    'This video is DRM protected.', expected=True)
+            elif ruutuplus:
+                raise ExtractorError(
+                    ("Probably a Ruutu+ video, authentication required. "
+                     "Consider sending PR for proper handling of Ruutu+ "
+                     "videos with credentials."),
+                    expected=True)
 
         self._sort_formats(formats)
 

From 05807d9c1f16513f190f0f29a77c8b314ce59161 Mon Sep 17 00:00:00 2001
From: juzza1 <juzza1@gmail.com>
Date: Sun, 19 May 2019 23:34:19 +0300
Subject: [PATCH 2/2] remove unneeded repetition and whitespace

---
 youtube_dl/extractor/ruutu.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/youtube_dl/extractor/ruutu.py b/youtube_dl/extractor/ruutu.py
index eb60d4fe2..36402df9d 100644
--- a/youtube_dl/extractor/ruutu.py
+++ b/youtube_dl/extractor/ruutu.py
@@ -92,11 +92,10 @@ class RuutuIE(InfoExtractor):
             Returns original video url with authentication token
             appended. Required for most videos since early 2019.
             """
-            authenticated_url = self._download_webpage(
+            return self._download_webpage(
                 'https://gatling.nelonenmedia.fi/auth/access/v2',
                 video_id, query={'stream': url},
                 note='Authenticating video url', fatal=False)
-            return authenticated_url
 
         def extract_formats(node):
             for child in node:
@@ -112,8 +111,7 @@ class RuutuIE(InfoExtractor):
                     if not self._request_webpage(
                             video_url, video_id,
                             note='Checking if video is available without authentication',
-                            errnote='Authentication required',
-                            fatal=False):
+                            errnote='Authentication required', fatal=False):
                         video_url = authenticate_video_url(video_url)
                         if not video_url:
                             continue
@@ -177,8 +175,7 @@ class RuutuIE(InfoExtractor):
                 raise ExtractorError(
                     ("Probably a Ruutu+ video, authentication required. "
                      "Consider sending PR for proper handling of Ruutu+ "
-                     "videos with credentials."),
-                    expected=True)
+                     "videos with credentials."), expected=True)
 
         self._sort_formats(formats)