Changeset d45520a

Timestamp:

Nov 6, 2005, 12:29:14 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:

733c2f8

Parents:

102b732

Message:

do not sys.exit, add keywords to act_on_data
do not sys.exit, add keywords to act_on_data

Location:

python/aubio/bench

Files:

• config.py (modified) (1 diff)
• node.py (modified) (2 diffs)

python/aubio/bench/config.py

@@ -14 +14 @@
         filefound = 1
 except IOError:
-        print "no user configuration file found in", filename
+        #print "no user configuration file found in", filename
+        pass
 
 if filefound == 0:

python/aubio/bench/node.py

@@ -15 +15 @@
                 print 'error:',status,output
                 print 'command returning error was',cmd
-                sys.exit(1)
+                #sys.exit(1)
         return output 
 
@@ -22 +22 @@
         return runcommand(cmd)
 
+def list_wav_files(datapath,maxdepth=1):
+        return list_files(datapath, filter="f -name '*.wav' -maxdepth %d"%maxdepth)
+
+def list_dirs(datapath):
+        return list_files(datapath, filter="d")
+
 def mkdir(path):
         cmd = '%s%s' % ('mkdir -p ',path)
         return runcommand(cmd)
 
-def act_on_data (action,datapath,respath,suffix='.txt',filter='f'):
+def act_on_data (action,datapath,respath,suffix='.txt',filter='f',sub='\.wav$',**keywords):
         """ execute action(datafile,resfile) on all files in datapath """
         dirlist = list_files(datapath,filter=filter)
+        if dirlist == ['']: dirlist = []
         respath_in_datapath = re.split(datapath, respath,maxsplit=1)[1:]
         if(respath_in_datapath and suffix == ''): 
                 print 'error: respath in datapath and no suffix used'
-                sys.exit(1)
+                #sys.exit(1)
         for i in dirlist:
-                s = re.split(datapath, i,maxsplit=1)[1]
-                j = "%s%s%s%s"%(respath,'/',s,suffix)
-                action(i,j)
+                j = re.split(datapath, i,maxsplit=1)[1]
+                j = re.sub(sub,'',j)
+                #j = "%s%s%s"%(respath,j,suffix)
+                j = "%s%s"%(respath,j)
+                if sub != '':
+                        j = re.sub(sub,suffix,j)
+                else:
+                        j = "%s%s" % (j,suffix)
+                action(i,j,**keywords)
 
 def act_on_results (action,datapath,respath,filter='d'):