From 445553f3376b25da9ed549c0f8abf2a3c15bf3f4 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Thu, 18 Aug 2011 21:42:02 +0200
Subject: [PATCH 1/2] fix typo

---
 pandora/archive/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora/archive/models.py b/pandora/archive/models.py
index a94d1394..77a08d92 100644
--- a/pandora/archive/models.py
+++ b/pandora/archive/models.py
@@ -529,7 +529,7 @@ class Stream(models.Model):
 
     def json(self):
         if settings.XSENDFILE or settings.XACCELREDIRECT:
-            base_url = '/%s' % self.file.itemId
+            base_url = '/%s' % self.file.item.itemId
         else:
             base_url = os.path.dirname(self.video.url)
         return {

From 43c8ad7b27b4611215292b5793009383ea77b969 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Thu, 18 Aug 2011 22:35:43 +0200
Subject: [PATCH 2/2] actually extract derivatives

---
 pandora/archive/models.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pandora/archive/models.py b/pandora/archive/models.py
index 77a08d92..047f4321 100644
--- a/pandora/archive/models.py
+++ b/pandora/archive/models.py
@@ -494,12 +494,12 @@ class Stream(models.Model):
             for f in settings.VIDEO_FORMATS:
                 derivative, created = Stream.objects.get_or_create(file=self.file,
                                                   resolution=resolution, format=f)
-            if created:
-                derivative.source = self
-                name = derivative.name()
-                derivative.video.name = os.path.join(os.path.dirname(self.video.name), name)
-                derivative.encode()
-                derivative.save()
+                if created:
+                    derivative.source = self
+                    name = derivative.name()
+                    derivative.video.name = os.path.join(os.path.dirname(self.video.name), name)
+                    derivative.encode()
+                    derivative.save()
         return True
 
     def encode(self):