From 13146320233e33d37be39b3b164a12e77c2d36be Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Fri, 10 Dec 2010 16:53:39 +0100 Subject: [PATCH] fix item delete --- telemeta/models/core.py | 3 ++- telemeta/web/base.py | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/telemeta/models/core.py b/telemeta/models/core.py index 98572b9f..a5ed16a1 100644 --- a/telemeta/models/core.py +++ b/telemeta/models/core.py @@ -228,10 +228,11 @@ class EnhancedQuerySet(models.query.QuerySet): CHUNK=1024 objects = self.model._meta.get_all_related_objects() ii = self.count() + values = self.values_list('pk') for related in objects: i = 0 while i < ii: - ids = [v[0].values_list('pk') for v in self[i:i + CHUNK]] + ids = [v[0] for v in values[i:i + CHUNK]] filter = {related.field.name + '__pk__in': ids} q = related.model.objects.filter(**filter) if isinstance(related.field, WeakForeignKey): diff --git a/telemeta/web/base.py b/telemeta/web/base.py index 569ebb81..d9599856 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -81,7 +81,7 @@ def stream_from_file(file): yield _chunk f.close() -class WebView: +class WebView(object): """Provide web UI methods""" graphers = timeside.core.processors(timeside.api.IGrapher) @@ -221,15 +221,14 @@ class WebView: mime_type = encoder.mime_type() file = public_id + '.' + encoder.file_extension() - item = MediaItem.objects.get(public_id=public_id) audio = item.file.path decoder = timeside.decoder.FileDecoder(audio) if decoder.format() == mime_type: # source > stream - #print item.file.path response = HttpResponse(stream_from_file(audio), mimetype = mime_type) + else: if not self.cache_export.exists(file): # source > encoder > stream -- 2.39.5