From: Guillaume Pellerin Date: Wed, 1 Dec 2010 09:51:34 +0000 (+0100) Subject: fix module X-Git-Tag: 1.1~486^2~12 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c80d5d58e7e7c680237f387511b31ce25fce0185;p=telemeta.git fix module --- diff --git a/telemeta/web/base.py b/telemeta/web/base.py index 63099ebb..8201a393 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -165,7 +165,7 @@ class WebView: }) def item_analyze(self): - pass + pass def item_visualize(self, request, public_id, visualizer_id, width, height): item = MediaItem.objects.get(public_id=public_id) @@ -180,7 +180,7 @@ class WebView: size = width + '_' + height file = '.'.join([public_id, grapher_id, size, 'png']) - + if not self.cache.exists(file): if item.file: item = MediaItem.objects.get(public_id=public_id) diff --git a/tools/scripts/telemeta-media-import.py b/tools/scripts/telemeta-media-import.py index 730fb5ca..4fed8fb0 100755 --- a/tools/scripts/telemeta-media-import.py +++ b/tools/scripts/telemeta-media-import.py @@ -43,6 +43,7 @@ class TelemetaMediaImport: self.media_dir = media_dir + os.sep + 'items' self.medias = os.listdir(self.media_dir) self.buffer_size = 0x1000 + import telemeta.models def set_collection(self, collection_name): collections = telemeta.models.media.MediaCollection.objects.filter(code=collection_name) @@ -58,7 +59,6 @@ class TelemetaMediaImport: return collection def media_import(self): - import telemeta.models self.collection_name = 'awdio' self.collection = self.set_collection(self.collection_name)