From e3bd260b553a9c04f66181510f81ff5431df5690 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Sat, 26 Mar 2011 15:18:21 +0100
Subject: [PATCH] only add target once, add ,to derivatives

---
 pandora/archive/extract.py | 2 +-
 pandora/item/models.py     | 2 +-
 pandora/settings.py        | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pandora/archive/extract.py b/pandora/archive/extract.py
index 5b4e3223..a2a20702 100644
--- a/pandora/archive/extract.py
+++ b/pandora/archive/extract.py
@@ -192,7 +192,7 @@ def stream(video, target, profile, info):
 
     if format == 'webm':
         cmd += ['-f', 'webm', target]
-    if format == 'mp4':
+    elif format == 'mp4':
         #mp4 needs postprocessing(qt-faststart), write to temp file
         cmd += ["%s.mp4"%target]
     else :
diff --git a/pandora/item/models.py b/pandora/item/models.py
index ca014163..bd571793 100644
--- a/pandora/item/models.py
+++ b/pandora/item/models.py
@@ -913,7 +913,7 @@ class Stream(models.Model):
     info = fields.DictField(default={})
 
     def __unicode__(self):
-        return u"%s/%s" % (self.item, self.profile)
+        return u"%s/%s" % (self.item.itemId, self.profile)
 
     def path(self):
         return self.item.path(self.profile)
diff --git a/pandora/settings.py b/pandora/settings.py
index 7ca64396..f727c494 100644
--- a/pandora/settings.py
+++ b/pandora/settings.py
@@ -162,10 +162,8 @@ VIDEO_PROFILE = '480p.webm'
 VIDEO_DERIVATIVES = [
     '96p.webm',
     '240p.webm',
-    '360p.webm'
     '96p.mp4',
     '240p.mp4',
-    '360p.mp4',
     '480p.mp4',
 ]
 '''