Changeset 1dae4eb

Timestamp:

Dec 22, 2005, 5:50:37 PM (19 years ago)

Author:

Paul Brossier <piem@altern.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

c32976a5

Parents:

af445db

Message:

new act_on_files, avoids using find too much; add some error checking
new act_on_files, avoids using find too much; add some error checking

File:

• python/aubio/bench/node.py (modified) (4 diffs)

python/aubio/bench/node.py

@@ -78 +78 @@
                 action("%s%s%s"%(respath,'/',s))
 
+def act_on_files (action,listfiles,listres=None,suffix='.txt',filter='f',sub='\.wav$',**keywords):
+        """ execute action(respath) an all subdirectories in respath """
+        if listres and len(listfiles) <= len(listres): 
+                for i in listfiles:
+                        action(i,listres[i],**keywords)
+        else:
+                for i in listfiles:
+                        action(i,None,**keywords)
+
 class bench:
         """ class to run benchmarks on directories """
         def __init__(self,datadir,resdir=None,checkres=False,checkanno=False):
                 self.datadir = datadir
+                # path to write results path to
                 self.resdir = resdir
+                # list of annotation files
+                self.reslist = []
+                # list used to gather results
                 self.results = []
                 print "Checking data directory", self.datadir
@@ -90 +103 @@
         
         def checkdata(self):
+                if os.path.isfile(self.datadir):
+                        self.dirlist = os.path.dirname(self.datadir)
+                        print "DBG: found a file"
+                elif os.path.isdir(self.datadir):
+                        self.dirlist = list_dirs(self.datadir)
+                        print "DBG: found a dir"
+                # allow dir* matching through find commands?
+                else:
+                        print "ERR: path not understood"
+                        sys.exit(1)
                 print "Listing directories in data directory",
-                self.dirlist = list_dirs(self.datadir)
                 if self.dirlist:
                         print " (%d elements)" % len(self.dirlist)
@@ -106 +128 @@
                         print "ERR: no sound files were found in", self.datadir
                         sys.exit(1)
-                #for each in self.sndlist: print each
         
         def checkanno(self):
@@ -132 +153 @@
                 self.orig, self.missed, self.merged, self.expc, \
                         self.bad, self.doubled = 0, 0, 0, 0, 0, 0
-                act_on_data(self.file_exec,self.datadir,self.resdir, \
+                act_on_files(self.file_exec,self.sndlist,self.reslist, \
                         suffix='',filter=sndfile_filter)