From: Paul Brossier <piem@altern.org>
Date: Fri, 16 Dec 2005 01:22:58 +0000 (+0000)
Subject: clarify list functions, add task class
X-Git-Tag: bzr2git~801
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=257debc559c5e912337cbd755fbcea37f09dccff;p=aubio.git

clarify list functions, add task class
clarify list functions, add task class
---

diff --git a/python/aubio/bench/node.py b/python/aubio/bench/node.py
index 91318ee7..c5b37152 100644
--- a/python/aubio/bench/node.py
+++ b/python/aubio/bench/node.py
@@ -15,17 +15,24 @@ def runcommand(cmd,debug=0):
                 print 'error:',status,output
                 print 'command returning error was',cmd
                 #sys.exit(1)
+	if output == '' or output == ['']: return
         return output 
 
-def list_files(datapath,filter='f'):
-        cmd = '%s%s%s%s' % ('find ',datapath,' -type ',filter)
+def list_files(datapath,filter='f', maxdepth = -1):
+	if maxdepth >= 0: maxstring = " -maxdepth %d " % maxdepth	
+	else: maxstring = ""
+        cmd = '%s' * 5 % ('find ',datapath,maxstring,' -type ',filter)
         return runcommand(cmd)
 
-def list_wav_files(datapath,maxdepth=1):
-	return list_files(datapath, filter="f -name '*.wav' -maxdepth %d"%maxdepth)
+def list_wav_files(datapath,maxdepth = -1):
+	return list_files(datapath, filter="f -name '*.wav'",maxdepth = maxdepth)
 
-def list_snd_files(datapath,maxdepth=1):
-	return list_files(datapath, filter="f -name '*.wav' -o -name '*.aif' -maxdepth %d"%maxdepth)
+def list_snd_files(datapath,maxdepth = -1):
+	return list_files(datapath, filter="f -name '*.wav' -o -name '*.aif'", 
+		maxdepth = maxdepth)
+
+def list_res_files(datapath,maxdepth = -1):
+	return list_files(datapath, filter="f -name '*.txt'", maxdepth = maxdepth)
 
 def list_dirs(datapath):
 	return list_files(datapath, filter="d")
@@ -62,3 +69,35 @@ def act_on_results (action,datapath,respath,filter='d'):
         for i in dirlist:
                 s = re.split(datapath, i ,maxsplit=1)[1]
                 action("%s%s%s"%(respath,'/',s))
+
+class task:
+
+	def __init__(self,datadir,resdir):
+		self.datadir = datadir
+		self.resdir = resdir
+		print "Checking data directory", self.datadir
+		self.checkdata()
+		self.checkres()
+	
+	def checkdata(self):
+		print "Listing directories in data directory",
+		self.dirlist = list_dirs(self.datadir)
+		print " (%d elements)" % len(self.dirlist)
+		#for each in self.dirlist: print each
+		print "Listing sound files in data directory",
+		self.sndlist = list_snd_files(self.datadir)
+		print " (%d elements)" % len(self.sndlist)
+		#for each in self.sndlist: print each
+		print "Listing annotations in data directory",
+		self.reslist = list_res_files(self.datadir)
+		print " (%d elements)" % len(self.reslist)
+		#for each in self.reslist: print each
+		if not self.reslist or len(self.reslist) < len (self.sndlist):
+			print "ERR: not enough annotations"
+			return -1
+		else:
+			print "Found enough annotations"
+	
+	def checkres(self):
+		print "Creating results directory"
+		act_on_results(mkdir,self.datadir,self.resdir,filter='d')