twitch.tv chapters: Include uploader (#810)

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 737bf7aa0699d7d2d8eab91d55a91d0361716bb6..96c5973962c47cb0cab1b224288a8b84f859bdb4 100755 (executable)
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -3384,11 +3384,12 @@ class JustinTVIE(InfoExtractor):
             video_ext = video_url.rpartition('.')[2] or u'flv'
 
             chapter_api_url = u'https://api.twitch.tv/kraken/videos/c' + chapter_id
-            chapter_info_json = self._download_webpage(chapter_api_url, video_id,
+            chapter_info_json = self._download_webpage(chapter_api_url, u'c' + chapter_id,
                                    note='Downloading chapter metadata',
                                    errnote='Download of chapter metadata failed')
             chapter_info = json.loads(chapter_info_json)
 
+
             # TODO determine start (and probably fix up file)
             #  youtube-dl -v http://www.twitch.tv/firmbelief/c/1757457
             #video_url += u'?start=' + a.find('./start_timestamp').text
@@ -3401,6 +3402,8 @@ class JustinTVIE(InfoExtractor):
                 'title': chapter_info['title'],
                 'thumbnail': chapter_info['preview'],
                 'description': chapter_info['description'],
+                'uploader': chapter_info['channel']['display_name'],
+                'uploader_id': chapter_info['channel']['name'],
             }
             return [info]
         else: