Changeset 4d37d85

Timestamp:

11/17/11 12:40:35 (19 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, dev2, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

d7f192a

Parents:

ecfd068

git-author:

yomguy <yomguy@…> (11/17/11 12:40:35)

git-committer:

yomguy <yomguy@…> (11/17/11 12:40:35)

Message:

import: overwrite mode, create collections, more conditions

File:

• tools/scripts/telemeta-crem-import.py (modified) (6 diffs)

tools/scripts/telemeta-crem-import.py

@@ -45 +45 @@
         self.source_dir = source_dir
         self.collections = os.listdir(self.source_dir)
-        self.buffer_size = 0x1000
         self.pattern = pattern
         self.user = User.objects.filter(username='admin')
 
-    def write_file(self, item, wav_file, user):
+    def write_file(self, item, wav_file, overwrite=False):
         if os.path.exists(wav_file):
-            if not item.file :
+            if not item.file or overwrite:
                 f = open(wav_file, 'r')
                 file_content = ContentFile(f.read())
@@ -60 +59 @@
                 item.set_revision(self.user)
             else:
-                msg = code + ' : fichier ' + wav_file + ' déjà ajouté !'
+                msg = code + ' : fichier ' + wav_file + ' déjà existant !'
                 self.logger.error(collection, msg)
         else:
@@ -70 +69 @@
         
         for collection in self.collections:
-            collection_dir = self.source_dir + os.sep + collection
+            collection_dir = self.source_dir + os.sep + collection 
+            collection_files = os.listdir(collection_dir)
             if not '/.' in collection_dir and self.pattern in collection_dir:
                 collection_name = collection.split(os.sep)[-1]
                 c = MediaCollection.objects.filter(code=collection_name)
-                if not c:
+                if not c and collection + '.csv' in collection_files:
                     sys.exit(msg = collection + ' collection NON présente dans la base de données, SORTIE ')
+                elif not c:
+                    msg = 'collection NON présente dans la base de données, SORTIE '
+                    self.logger.info(collection, msg)
+                    c = MediaCollection(code=collection_name)
+                    c.save()
+                    c.set_revision(self.user)
+                else:
+                    msg = 'collection présente dans la base de données, CONTINUE '
+                    self.logger.info(collection, msg)
                     
         for collection in self.collections:
@@ -102 +111 @@
                         items = MediaItem.objects.filter(code=code)
                         if len(items) != 0:
-                            msg = item.code+' : id = '+str(item.id)+" : title = "+item.title
+                            msg = ' : id = '+str(item.id)+" : title = "+item.title+' SELECTION'
+                            self.logger.info(item, msg)
                             self.logger.info(collection, msg)
                             item = items[0]
@@ -109 +119 @@
                             self.logger.info(item, msg)
                             item = MediaItem(code=code, collection=c)
-                        self.write_file(item, wav_file)
+                        self.write_file(item, wav_file, True)
 
                 else:
@@ -123 +133 @@
                             msg = item.old_code + ' : id = ' + str(item.id) + " : title = " + item.title
                             self.logger.info(item, msg)
-                            self.write_file(item, wav_file)
+                            self.write_file(item, wav_file, True)
                         else:
-                            msg = old_ref + ' : item inexistant dans la base de données !'
+                            msg = old_ref + ' : item inexistant dans la base de données ! PASS'
                             self.logger.error(item, msg)