Adding a print queue api. Not yet able to print.

.gitignore

@@ -2,3 +2,4 @@
 .pronsolerc
 *.swp
 *.bak
+uploads

pronserve.py

@@ -24,8 +24,11 @@ import textwrap
 import SocketServer
 import socket
 import mdns
+import uuid
+from operator import itemgetter, attrgetter
 
 log = logging.getLogger("root")
+__UPLOADS__ = "./uploads"
 
 # Authentication
 # -------------------------------------------------
@@ -65,6 +68,23 @@ class RootHandler(tornado.web.RequestHandler):
   def get(self):
     self.render("index.html")
 
+class JobsHandler(tornado.web.RequestHandler):
+  def post(self):
+    fileinfo = self.request.files['job'][0]
+    pronserve.jobs.add(fileinfo['filename'], fileinfo['body'])
+    self.finish("ACK")
+
+class JobHandler(tornado.web.RequestHandler):
+  def delete(self, job_id):
+    pronserve.jobs.remove(int(job_id))
+    self.finish("ACK")
+
+  def put(self, job_id):
+    args = {'position': int(self.get_argument("job[position]"))}
+    pronserve.jobs.update(int(job_id), args)
+    self.finish("ACK")
+
+
 class InspectHandler(tornado.web.RequestHandler):
   def prepare(self):
     auth(self, None)
@@ -83,11 +103,26 @@ class ConstructSocketHandler(tornado.websocket.WebSocketHandler):
 
   def open(self):
     pronserve.clients.add(self)
+    self.write_message({'connected': {'jobs': pronserve.jobs.public_list()}})
     print "WebSocket opened. %i sockets currently open." % len(pronserve.clients)
 
   def on_sensor_change(self):
     self.write_message({'sensors': pronserve.sensors, 'timestamp': time.time()})
 
+  def on_job_added(self, job):
+    self.write_message({'job_added': pronserve.jobs.sanitize(job)})
+
+  def on_job_removed(self, job):
+    self.write_message({'job_removed': {
+      "id": job["id"]
+    }})
+
+  def on_job_updated(self, job):
+    print("what the hell?")
+    pprint(pronserve.jobs.sanitize(job))
+    self.write_message({'job_updated': pronserve.jobs.sanitize(job)})
+
+
   def on_pronsole_log(self, msg):
     self.write_message({'log': {msg: msg, level: "debug"}})
 
@@ -103,13 +138,15 @@ dir = os.path.dirname(__file__)
 settings = dict(
   template_path=os.path.join(dir, "server", "templates"),
   static_path=os.path.join(dir, "server", "static"),
-  debug=True,
+  debug=True
 )
 
 application = tornado.web.Application([
   (r"/", RootHandler),
   (r"/inspect", InspectHandler),
-  (r"/socket", ConstructSocketHandler)
+  (r"/socket", ConstructSocketHandler),
+  (r"/jobs", JobsHandler),
+  (r"/jobs/([0-9]*)", JobHandler)
 ], **settings)
 
 
@@ -127,8 +164,11 @@ class Pronserve(pronsole.pronsole):
     self.settings.sensor_poll_rate = 0.3 # seconds
     self.sensors = {'extruder': -1, 'bed': -1}
     self.load_default_rc()
+    self.jobs = PrintJobQueue()
+    self.job_id_incr = 0;
     services = ({'type': '_construct._tcp', 'port': 8888, 'domain': "local."})
     self.mdns = mdns.publisher().save_group({'name': 'pronserve', 'services': services })
+    self.jobs.listeners.append(self)
 
   def run_sensor_loop(self):
     self.request_sensor_update()
@@ -153,14 +193,16 @@ class Pronserve(pronsole.pronsole):
     d = dict([ s.split(":") for s in words])
 
     for key, value in d.iteritems():
-      self.__update_item(key, value)
+      self.__update_sensor(key, value)
 
     self.fire("sensor_change")
 
-  def __update_item(self, key, value):
+  def __update_sensor(self, key, value):
     sensor_name = self.settings.sensor_names[key]
     self.sensors[sensor_name] = float(value)
 
+  def receive_event(self, src, event_name, content=None):
+    self.fire(event_name, content)
 
   def fire(self, event_name, content=None):
     for client in self.clients:
@@ -177,6 +219,84 @@ class Pronserve(pronsole.pronsole):
   def write_prompt(self):
     None
 
+class PrintJobQueue():
+
+  def __init__(self):
+    self.list = []
+    self.__last_id = 0
+    self.listeners = []
+
+  def public_list(self):
+    # A sanitized version of list for public consumption via construct
+    l2 = []
+    for job in self.list:
+      l2.append(self.sanitize(job))
+    return l2
+
+  def sanitize(self, job):
+    return dict(
+      id = job["id"],
+      original_file_name = job["original_file_name"],
+      rank = job["rank"]
+    )
+
+  def order(self):
+    sorted(self.list, key=lambda job: job['rank'])
+
+
+  def add(self, original_file_name, body):
+    ext = os.path.splitext(original_file_name)[1]
+    file_name = str(uuid.uuid4()) + ext
+    job = dict(
+      id = self.__last_id,
+      rank = len(self.list),
+      original_file_name=original_file_name,
+      path= __UPLOADS__ + "/" + file_name,
+    )
+    self.__last_id += 1
+
+    fh = open(job['path'], 'w')
+    fh.write(body)
+
+    self.list.append(job)
+    print "Added %s as %s"%(original_file_name, file_name)
+    self.fire("job_added", job)
+
+  def display_summary(self):
+    print "Print Jobs:"
+    for job in self.list:
+      print "  %i: %s"%(job['id'], job['original_file_name'])
+    print ""
+    return True
+
+  def remove(self, job_id):
+    job = self.find_by_id(job_id)
+    if job == None:
+      return False
+    self.list.remove(job)
+    print "Print Job Removed"
+    self.fire("job_removed", job)
+
+  def update(self, job_id, job_attrs):
+    job = self.find_by_id(job_id)
+    if job == None:
+      return False
+    job['rank'] = job_attrs['position']
+    self.order()
+    print "Print Job Updated"
+    self.fire("job_updated", job)
+
+  def find_by_id(self, job_id):
+    for job in self.list:
+      if job['id'] == job_id: return job
+    return None
+
+  def fire(self, event_name, content):
+    self.display_summary()
+    for listener in self.listeners:
+      listener.receive_event(self, event_name, content)
+
+
 
 # Server Start Up
 # -------------------------------------------------

server/static/js/inspect.js

@@ -5,11 +5,11 @@
 
   $(window).focus(function() {
       windowFocus = true;
-      if ($console) $console.append("Window refocused, restarting log.\n");
+      //if ($console) $console.append("Window refocused, restarting graph.\n");
       $(".focus-lost-overlay").addClass("out").removeClass("in");
   }).blur(function() {
       windowFocus = false;
-      if ($console) $console.append("Window's focus, lost stopping logging...\n");
+      //if ($console) $console.append("Window's focus, lost stopping graph...\n");
       $(".focus-lost-overlay").addClass("in").removeClass("out");
   }.debounce());
 
@@ -75,8 +75,6 @@
     if(windowFocus == false) return;
     updateSensorsUi();
     updateGraphUi();
-    $console.append($console.data("toBeWritten"));
-    $console.data("toBeWritten", "");
     $consoleWrapper.scrollTop($console.innerHeight());
   }
 
@@ -101,14 +99,13 @@
           values[name] = val;
           $("."+name+" .val").data("val", val.format(1))
         }
-        if(windowFocus)
-        {
-          var previous = $console.data("toBeWritten") || "";
-          $console.data("toBeWritten", previous + evt.data + "\n");
-        }
         updateGraphData(values);
         requestAnimationFrame(updateUi);
       }
+      else
+      {
+        $console.append(evt.data + "\n");
+      }
     };
     ws.onclose = function()
     {