From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 4 May 2013 09:44:27 +0000 (+0200)
Subject: twitch.tv chapters: Include uploader (#810)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c43e57242e10eae327d4348390cfb9e574fad5dd;p=youtube-dl

twitch.tv chapters: Include uploader (#810)
---

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 737bf7aa0..96c597396 100755
--- 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: