From: yomguy <yomguy@parisson.com>
Date: Mon, 4 Apr 2011 15:46:28 +0000 (+0200)
Subject: playlists need public_ids !
X-Git-Tag: 1.1~300
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5d130add648c00fac5be8a486ea43b8eb7b502d4;p=telemeta.git

playlists need public_ids !
---

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 90131cca..86708d4f 100644
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -512,6 +512,8 @@ class WebView(object):
             
         else:        
             if not self.cache_export.exists(file):
+                if not decoder:
+                    decoder = timeside.decoder.FileDecoder(audio)
                 # source > encoder > stream
                 decoder.setup()
                 media = self.cache_export.dir + os.sep + file
@@ -940,11 +942,11 @@ class WebView(object):
                 resources = []
                 for resource in playlist_resources:
                     if resource.resource_type == 'item':
-                        element = MediaItem.objects.get(pk=resource.resource_id)
+                        element = MediaItem.objects.get(public_id=resource.resource_id)
                     if resource.resource_type == 'collection':
-                        element = MediaCollection.objects.get(pk=resource.resource_id)
+                        element = MediaCollection.objects.get(public_id=resource.resource_id)
                     if resource.resource_type == 'marker':
-                        element = MediaItemMarker.objects.get(pk=resource.resource_id)
+                        element = MediaItemMarker.objects.get(public_id=resource.resource_id)
                     resources.append({'element': element, 'type': resource.resource_type, 'public_id': resource.public_id })
                 playlists.append({'playlist': playlist, 'resources': resources})
         return playlists