Mostly working

audiogram/index.js

@@ -19,6 +19,7 @@ function Audiogram(id) {
 
   // File locations to use
   this.dir = path.join(serverSettings.workingDirectory, this.id);
+
   this.audioPath = path.join(this.dir, "audio");
   this.videoPath = path.join(this.dir, "video.mp4");
   this.frameDir = path.join(this.dir, "frames");
@@ -40,11 +41,11 @@ Audiogram.prototype.getDuration = function(cb) {
       return cb(err);
     }
 
-    if (self.settings.maxDuration && self.settings.maxDuration < duration) {
-      cb("Exceeds max duration of " + self.settings.maxDuration + "s");
+    if (self.settings.theme.maxDuration && self.settings.theme.maxDuration < duration) {
+      cb("Exceeds max duration of " + self.settings.theme.maxDuration + "s");
     }
 
-    self.set("numFrames", self.numFrames = Math.floor(duration * self.settings.framesPerSecond));
+    self.set("numFrames", self.numFrames = Math.floor(duration * self.settings.theme.framesPerSecond));
 
     cb(null);
 
@@ -61,7 +62,7 @@ Audiogram.prototype.getWaveform = function(cb) {
 
   getWaveform(this.audioPath, {
     numFrames: this.numFrames,
-    samplesPerFrame: this.settings.samplesPerFrame
+    samplesPerFrame: this.settings.theme.samplesPerFrame
   }, function(err, waveform){
 
     return cb(err, self.waveform = waveform);
@@ -104,7 +105,7 @@ Audiogram.prototype.drawFrames = function(cb) {
 
   this.status("renderer");
 
-  initializeCanvas(this.settings, function(err, renderer){
+  initializeCanvas(this.settings.theme, function(err, renderer){
 
     if (err) {
       return cb(err);
@@ -113,8 +114,8 @@ Audiogram.prototype.drawFrames = function(cb) {
     self.status("frames");
 
     drawFrames(renderer, {
-      width: self.settings.width,
-      height: self.settings.height,
+      width: self.settings.theme.width,
+      height: self.settings.theme.height,
       numFrames: self.numFrames,
       frameDir: self.frameDir,
       caption: self.settings.caption,
@@ -137,7 +138,7 @@ Audiogram.prototype.combineFrames = function(cb) {
     framePath: path.join(this.frameDir, "%06d.png"),
     audioPath: this.audioPath,
     videoPath: this.videoPath,
-    framesPerSecond: this.settings.framesPerSecond
+    framesPerSecond: this.settings.theme.framesPerSecond
   }, cb);
 
 };

bin/worker

@@ -10,15 +10,15 @@ pluckJob();
 
 function pluckJob(){
 
-  transports.getJob(function(err, settings){
+  transports.getJob(function(err, job){
 
     if (err) {
       throw err;
     }
 
-    if (settings) {
+    if (job) {
 
-      return render(settings);
+      return render(job);
 
     }
 
@@ -28,12 +28,11 @@ function pluckJob(){
 
 }
 
-function render(settings) {
+function render(job) {
 
-  var audiogram = new Audiogram(settings.id);
+  var audiogram = new Audiogram(job.id);
 
-  // TODO rename to theme
-  audiogram.settings = settings;
+  audiogram.settings = job;
 
   audiogram.render(function(err){
 

client/index.js

@@ -45,16 +45,13 @@ function submitted() {
 
   var formData = new FormData();
 
-  var settings = $.extend({}, theme, {
-    caption: caption,
-    start: selection.start,
-    end: selection.end
-  });
-
-  delete settings.backgroundImageFile;
-
   formData.append("audio", file);
-  formData.append("settings", JSON.stringify(settings));
+  if (selection.start || selection.end) {
+    formData.append("start", selection.start);
+    formData.append("end", selection.end);
+  }
+  formData.append("theme", JSON.stringify($.extend({}, theme, { backgroundImageFile: null })));
+  formData.append("caption", caption);
 
   setClass("loading");
   d3.select("#loading-message").text("Uploading audio...");

server/render.js

@@ -9,7 +9,7 @@ function validate(req, res, next) {
 
   try {
 
-    req.body.settings = JSON.parse(req.body.settings);
+    req.body.theme = JSON.parse(req.body.theme);
 
   } catch(e) {
 
@@ -22,12 +22,12 @@ function validate(req, res, next) {
   }
 
   // Start at the beginning, or specified time
-  if (req.body.settings.start) {
-    req.body.settings.start = +req.body.settings.start;
+  if (req.body.start) {
+    req.body.start = +req.body.start;
   }
 
-  if (req.body.settings.end) {
-    req.body.settings.end = +req.body.settings.end;
+  if (req.body.end) {
+    req.body.end = +req.body.end;
   }
 
   return next();
@@ -45,11 +45,7 @@ function route(req, res) {
     }
 
     // Queue up the job with a timestamp
-    transports.addJob({
-      created: (new Date()).getTime(),
-      settings: req.body.settings,
-      caption: req.body.caption
-    });
+    transports.addJob(_.extend({ id: id, created: (new Date()).getTime() }, req.body));
 
     res.json({ id: id });