debian/changelog: Annotate bugs to close.

[youtubedl] / youtube_dl / extractor / twitch.py

diff --git a/youtube_dl/extractor/twitch.py b/youtube_dl/extractor/twitch.py
index 87290d002e44850e6b3584a97ff2a3e1be7c1a0f..94bd6345da18815a50b72502a8b91ae4e30ae2b5 100644 (file)
--- a/youtube_dl/extractor/twitch.py
+++ b/youtube_dl/extractor/twitch.py
@@ -23,6 +23,8 @@ class TwitchBaseIE(InfoExtractor):
     _API_BASE = 'https://api.twitch.tv'
     _USHER_BASE = 'http://usher.twitch.tv'
     _LOGIN_URL = 'https://secure.twitch.tv/user/login'
     _API_BASE = 'https://api.twitch.tv'
     _USHER_BASE = 'http://usher.twitch.tv'
     _LOGIN_URL = 'https://secure.twitch.tv/user/login'

+    _LOGIN_POST_URL = 'https://secure-login.twitch.tv/login'
+    _NETRC_MACHINE = 'twitch'

 
     def _handle_error(self, response):
         if not isinstance(response, dict):
 
     def _handle_error(self, response):
         if not isinstance(response, dict):


@@ -34,7 +36,15 @@ class TwitchBaseIE(InfoExtractor):
                 expected=True)
 
     def _download_json(self, url, video_id, note='Downloading JSON metadata'):
                 expected=True)
 
     def _download_json(self, url, video_id, note='Downloading JSON metadata'):

-        response = super(TwitchBaseIE, self)._download_json(url, video_id, note)
+        headers = {
+            'Referer': 'http://api.twitch.tv/crossdomain/receiver.html?v=2',
+            'X-Requested-With': 'XMLHttpRequest',
+        }
+        for cookie in self._downloader.cookiejar:
+            if cookie.name == 'api_token':
+                headers['Twitch-Api-Token'] = cookie.value
+        request = compat_urllib_request.Request(url, headers=headers)
+        response = super(TwitchBaseIE, self)._download_json(request, video_id, note)

         self._handle_error(response)
         return response
 
         self._handle_error(response)
         return response
 


@@ -58,14 +68,14 @@ class TwitchBaseIE(InfoExtractor):
             'authenticity_token': authenticity_token,
             'redirect_on_login': '',
             'embed_form': 'false',
             'authenticity_token': authenticity_token,
             'redirect_on_login': '',
             'embed_form': 'false',

-            'mp_source_action': '',
+            'mp_source_action': 'login-button',

             'follow': '',
             'follow': '',

-            'user[login]': username,
-            'user[password]': password,
+            'login': username,
+            'password': password,

         }
 
         request = compat_urllib_request.Request(
         }
 
         request = compat_urllib_request.Request(

-            self._LOGIN_URL, compat_urllib_parse.urlencode(login_form).encode('utf-8'))
+            self._LOGIN_POST_URL, compat_urllib_parse.urlencode(login_form).encode('utf-8'))

         request.add_header('Referer', self._LOGIN_URL)
         response = self._download_webpage(
             request, None, 'Logging in as %s' % username)
         request.add_header('Referer', self._LOGIN_URL)
         response = self._download_webpage(
             request, None, 'Logging in as %s' % username)


@@ -76,6 +86,14 @@ class TwitchBaseIE(InfoExtractor):
             raise ExtractorError(
                 'Unable to login: %s' % m.group('msg').strip(), expected=True)
 
             raise ExtractorError(
                 'Unable to login: %s' % m.group('msg').strip(), expected=True)
 

+    def _prefer_source(self, formats):
+        try:
+            source = next(f for f in formats if f['format_id'] == 'Source')
+            source['preference'] = 10
+        except StopIteration:
+            pass  # No Source stream present
+        self._sort_formats(formats)
+

 
 class TwitchItemBaseIE(TwitchBaseIE):
     def _download_info(self, item, item_id):
 
 class TwitchItemBaseIE(TwitchBaseIE):
     def _download_info(self, item, item_id):


@@ -131,7 +149,7 @@ class TwitchItemBaseIE(TwitchBaseIE):
 
 class TwitchVideoIE(TwitchItemBaseIE):
     IE_NAME = 'twitch:video'
 
 class TwitchVideoIE(TwitchItemBaseIE):
     IE_NAME = 'twitch:video'

-    _VALID_URL = r'%s/[^/]+/b/(?P<id>[^/]+)' % TwitchBaseIE._VALID_URL_BASE
+    _VALID_URL = r'%s/[^/]+/b/(?P<id>\d+)' % TwitchBaseIE._VALID_URL_BASE

     _ITEM_TYPE = 'video'
     _ITEM_SHORTCUT = 'a'
 
     _ITEM_TYPE = 'video'
     _ITEM_SHORTCUT = 'a'
 


@@ -147,7 +165,7 @@ class TwitchVideoIE(TwitchItemBaseIE):
 
 class TwitchChapterIE(TwitchItemBaseIE):
     IE_NAME = 'twitch:chapter'
 
 class TwitchChapterIE(TwitchItemBaseIE):
     IE_NAME = 'twitch:chapter'

-    _VALID_URL = r'%s/[^/]+/c/(?P<id>[^/]+)' % TwitchBaseIE._VALID_URL_BASE
+    _VALID_URL = r'%s/[^/]+/c/(?P<id>\d+)' % TwitchBaseIE._VALID_URL_BASE

     _ITEM_TYPE = 'chapter'
     _ITEM_SHORTCUT = 'c'
 
     _ITEM_TYPE = 'chapter'
     _ITEM_SHORTCUT = 'c'
 


@@ -166,7 +184,7 @@ class TwitchChapterIE(TwitchItemBaseIE):
 
 class TwitchVodIE(TwitchItemBaseIE):
     IE_NAME = 'twitch:vod'
 
 class TwitchVodIE(TwitchItemBaseIE):
     IE_NAME = 'twitch:vod'

-    _VALID_URL = r'%s/[^/]+/v/(?P<id>[^/]+)' % TwitchBaseIE._VALID_URL_BASE
+    _VALID_URL = r'%s/[^/]+/v/(?P<id>\d+)' % TwitchBaseIE._VALID_URL_BASE

     _ITEM_TYPE = 'vod'
     _ITEM_SHORTCUT = 'v'
 
     _ITEM_TYPE = 'vod'
     _ITEM_SHORTCUT = 'v'
 


@@ -200,6 +218,7 @@ class TwitchVodIE(TwitchItemBaseIE):
             '%s/vod/%s?nauth=%s&nauthsig=%s'
             % (self._USHER_BASE, item_id, access_token['token'], access_token['sig']),
             item_id, 'mp4')
             '%s/vod/%s?nauth=%s&nauthsig=%s'
             % (self._USHER_BASE, item_id, access_token['token'], access_token['sig']),
             item_id, 'mp4')

+        self._prefer_source(formats)

         info['formats'] = formats
         return info
 
         info['formats'] = formats
         return info
 


@@ -340,14 +359,14 @@ class TwitchStreamIE(TwitchBaseIE):
             'p': random.randint(1000000, 10000000),
             'player': 'twitchweb',
             'segment_preference': '4',
             'p': random.randint(1000000, 10000000),
             'player': 'twitchweb',
             'segment_preference': '4',

-            'sig': access_token['sig'],
-            'token': access_token['token'],
+            'sig': access_token['sig'].encode('utf-8'),
+            'token': access_token['token'].encode('utf-8'),

         }
         }

-

         formats = self._extract_m3u8_formats(
             '%s/api/channel/hls/%s.m3u8?%s'
         formats = self._extract_m3u8_formats(
             '%s/api/channel/hls/%s.m3u8?%s'

-            % (self._USHER_BASE, channel_id, compat_urllib_parse.urlencode(query).encode('utf-8')),
+            % (self._USHER_BASE, channel_id, compat_urllib_parse.urlencode(query)),

             channel_id, 'mp4')
             channel_id, 'mp4')

+        self._prefer_source(formats)

 
         view_count = stream.get('viewers')
         timestamp = parse_iso8601(stream.get('created_at'))
 
         view_count = stream.get('viewers')
         timestamp = parse_iso8601(stream.get('created_at'))