From 0aa0106f517ccacedf69822c4f5030e066a5f93b Mon Sep 17 00:00:00 2001 From: Steven Robertson Date: Sat, 21 Jan 2012 00:03:45 -0500 Subject: [PATCH] Use a profile pathname in worker.py --- worker.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/worker.py b/worker.py index 6dd09ee..795939d 100644 --- a/worker.py +++ b/worker.py @@ -113,7 +113,7 @@ def work(server): push_frame(r, riter.send(((sid, sidx, ftag), float(ftime)))) -def iter_genomes(prof, gpaths): +def iter_genomes(prof, gpaths, pname='540p'): """ Walk a list of genome paths, yielding them in an order suitable for the `genomes` argument of `create_jobs()`. @@ -125,7 +125,7 @@ def iter_genomes(prof, gpaths): gsrc = fp.read() gnm = genome.Genome(json.loads(gsrc)) err, times = gnm.set_profile(prof) - odir = 'out/540p/%s/untracked' % gname + odir = 'out/%s/%s/untracked' % (pname, gname) gtimes = [] for i, t in enumerate(times): opath = os.path.join(odir, '%05d.jpg' % (i+1)) @@ -230,8 +230,9 @@ def client(ppath, gpaths): with open(ppath) as fp: psrc = fp.read() prof = json.loads(psrc) + pname = os.path.basename(ppath).rsplit('.', 1)[0] - jobiter = create_jobs(r, psrc, iter_genomes(prof, gpaths)) + jobiter = create_jobs(r, psrc, iter_genomes(prof, gpaths, pname)) for sidx, gpu_time, ftag, jpg in run_jobs(r, rev, jobiter): with open(ftag, 'w') as fp: fp.write(jpg)