no wav check, fix collection detection

git-svn-id: http://svn.parisson.org/svn/crem@184 3bf09e05-f825-4182-b9bc-eedd7160adf0

diff --git a/trunk/import/audio_import/crem_checker.py b/trunk/import/audio_import/crem_checker.py
index 6963ba0357f505ef1bf9432bf9687e63e6149416..0c5f487579e3fe7439bad98e6175c3e64176d44a 100755 (executable)
--- a/trunk/import/audio_import/crem_checker.py
+++ b/trunk/import/audio_import/crem_checker.py
@@ -36,7 +36,6 @@ import sys
 import csv
 import xlrd
 import logging
-import scikits.audiolab as audiolab
 
 COLLECTION_OLD_PATTERN = [
         { 'format': 'BM.aaa.nnn.mmm',           'regex': r'^(BM)\.([0-9]{3})\.([0-9]{3})\.([0-9]{3})$'},
@@ -197,14 +196,6 @@ class CremItemFile:
     def set_media(self, media):
         self.media = media
 
-    def is_wav(self):
-        try:
-            audio_file = audiolab.Sndfile(self.media, 'r')
-            if audio_file.nframes and audio_file.nframes != 0:
-                return True
-        except IOError:
-            return False
-
     def properties(self):
         self.frames = self.audio_file.get_nframes()
         self.samplerate = self.audio_file.get_samplerate()
@@ -225,10 +216,6 @@ class CremCheck:
                list.append(dir)
         self.dir_list = list
 
-
-    def check_wav(self):
-        pass
-
     def check_new_refs(self):
         for name in self.new_refs:
             return check_name(ITEM_PATTERN, name)
@@ -300,7 +287,7 @@ class CremCheck:
                         self.logger.write_error(collection.dir, msg)
                         error = True
 
-                    if item[0:17] != collection.dir_name :
+                    if not collection.dir_name in item:
                         msg = 'Ligne ' + str(i+xls.first_row+1) + ' : la référence d\'item ' + item.encode('utf8') + ' ne correspond pas à celle de la collection'
                         self.logger.write_error(collection.dir, msg)
                         error = True
@@ -310,9 +297,9 @@ class CremCheck:
                         self.logger.write_error(collection.dir, 'Le fichier ' + item.encode('utf8') + '.wav n\'existe pas')
                     else:
                         item_file.set_media(collection.dir + os.sep + name_wav)
-                        if not item_file.is_wav():
-                            self.logger.write_error(collection.dir, 'Le fichier ' + item.encode('utf8') + '.wav n\'est pas valide')
-                            error = True
+                        #if not item_file.is_wav():
+                        #    self.logger.write_error(collection.dir, 'Le fichier ' + item.encode('utf8') + '.wav n\'est pas valide')
+                        #    error = True
 
                     if not error:
                         csv_file.csv.writerow([xls.original_refs[i], xls.new_refs[i]])