From: Sergey M․ <dstftw@gmail.com>
Date: Sun, 13 Nov 2016 15:29:36 +0000 (+0700)
Subject: [nrk] Improve geo restriction detection
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;ds=sidebyside;h=50913b82414488bbf625a00f1844ca84dec094dd;p=youtube-dl

[nrk] Improve geo restriction detection
---

diff --git a/youtube_dl/extractor/nrk.py b/youtube_dl/extractor/nrk.py
index 1f2204833..c89aac63e 100644
--- a/youtube_dl/extractor/nrk.py
+++ b/youtube_dl/extractor/nrk.py
@@ -93,8 +93,9 @@ class NRKBaseIE(InfoExtractor):
                 }]
 
         if not entries:
-            message_type = data.get('messageType')
-            if message_type == 'ProgramIsGeoBlocked' and not self._faked_ip:
+            message_type = data.get('messageType', '')
+            # Can be ProgramIsGeoBlocked or ChannelIsGeoBlocked*
+            if 'IsGeoBlocked' in message_type and not self._faked_ip:
                 self.report_warning(
                     'Video is geo restricted, trying to fake IP')
                 self._fake_ip()