From fca156f5c7de84a51e49eb20ff30abec3cbdda70 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Fri, 8 Apr 2011 10:20:59 +0200
Subject: [PATCH] use instance name if possible

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

diff --git a/pandora/archive/models.py b/pandora/archive/models.py
index 99c3ccd..422010f 100644
--- a/pandora/archive/models.py
+++ b/pandora/archive/models.py
@@ -297,6 +297,7 @@ class File(models.Model):
         return 'unknown'
 
     def get_instance(self):
+        #FIXME: what about other instances?
         if self.instances.all().count() > 0:
             return self.instances.all()[0]
         return None
@@ -318,7 +319,8 @@ class File(models.Model):
         return u''
 
     def get_name(self):
-        if self.is_extra:
+        instance = self.get_instance()
+        if instance:
             return self.get_instance().name
         if self.item:
             name = self.item.get('title', 'Untitled')
diff --git a/pandora/item/views.py b/pandora/item/views.py
index 99da4bd..66b7962 100644
--- a/pandora/item/views.py
+++ b/pandora/item/views.py
@@ -226,7 +226,7 @@ Positions
             response['data']['items'] = [only_p(m['json']) for m in qs.values('json')]
     else: # otherwise stats
         items = query['qs']
-        files = File.objects.all().filter(item__in=items).filter(size__gt=0)
+        files = File.objects.filter(item__in=items).filter(size__gt=0)
         r = files.aggregate(
             Sum('duration'),
             Sum('pixels'),