fix media import in one collection only

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index be9d9aaf3b1e03ca6b50f1cf098a52d2f7a68411..f77a2155ddd775f9756b3dae093ba5de8c913986 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -160,7 +160,7 @@ class WebView:
                                       'value':str(value)})
                 
             self.cache.write_analyzer_xml(analyzers, file)
-
+        
         return render(request, template, 
                     {'item': item, 'export_formats': formats, 
                     'visualizers': graphers, 'visualizer_id': grapher_id,'analysers': analyzers,  #FIXME analysers

diff --git a/tools/scripts/telemeta-media-import.py b/tools/scripts/telemeta-media-import.py
index 229fa9e2f4bffc4478e0340a59c4213f8ac2674d..730fb5ca520281800b200bb50d7dd0d6d99bba30 100755 (executable)
--- a/tools/scripts/telemeta-media-import.py
+++ b/tools/scripts/telemeta-media-import.py
@@ -43,39 +43,36 @@ class TelemetaMediaImport:
         self.media_dir = media_dir + os.sep + 'items'
         self.medias = os.listdir(self.media_dir)
         self.buffer_size = 0x1000
+        
+    def set_collection(self, collection_name):
+        collections = telemeta.models.media.MediaCollection.objects.filter(code=collection_name)
+        if not collections:
+            c = telemeta.models.media.MediaCollection(code=collection_name)
+            c.title = collection_name
+            c.save()
+            msg = 'added'
+            self.logger.write_info(collection_name, msg)
+            collection = c
+        else:
+            collection = collections[0]
+        return collection
 
     def media_import(self):
         import telemeta.models
+        self.collection_name = 'awdio'
+        self.collection = self.set_collection(self.collection_name)
+
         for media in self.medias:
-            print media
             filename,  ext = os.path.splitext(media)
-            data = filename.split('.')
-            date = data[0]
-            collection_name = data[1]
-            other = ''
-            if len(data) > 2:
-                other = '.'.join(data[2:])
-                
             item = telemeta.models.media.MediaItem.objects.filter(code=filename)
-            collections = telemeta.models.media.MediaCollection.objects.filter(code=collection_name)
-            
-            if not collections:
-                c = telemeta.models.media.MediaCollection(code=collection_name)
-                c.title = collection_name
-                c.save()
-                msg = 'added'
-                self.logger.write_info(collection_name, msg)
-                collection = c
-            else:
-                collection = collections[0]
-                
             if not item:
-                item = telemeta.models.media.MediaItem(collection=collection, code=filename)
+                print media
+                item = telemeta.models.media.MediaItem(collection=self.collection, code=filename)
                 item.title = filename
-                item.file = self.media_dir + os.sep + media
+                item.file = media
                 item.save()
                 msg = 'added item : ' + filename
-                self.logger.write_info(collection_name, msg)
+                self.logger.write_info(self.collection_name, msg)
 
 
 def run():