Changes in / [279640c:7f1098c]

Location:

server

Files:

• lib/TODO (modified) (2 diffs)
• lib/gutenbach-config (modified) (1 diff)
• lib/gutenbach/server/job.py (modified) (1 diff)
• lib/gutenbach/server/player.py (modified) (3 diffs)
• test/server/job.py (modified) (2 diffs)

server/lib/TODO

@@ -16 +16 @@
 
 - add support in printer.py for:
-     [ ] print job
-     [ ] validate job
+     [x] print job
+     [x] validate job
      [x] pause printer
      [x] resume printer
@@ -30 +30 @@
      [x] resume job
 
-- finish test cases for printer.py
-- write test cases for requests.py
-- write convenience client-side API
-- write test cases for future client API
-- all the documentation
-- deal with all the code marked 'XXX'
-- setuptools entry points for notification system (e.g. zephyr)
-- check test case coverage ( http://nedbatchelder.com/code/coverage/ )
-- deal with queue management/reordering
-- add support for volume management
-- make sure all CUPS commands are compatible
-- rewrite gbr/gbq/etc. scripts to use client API
-- rewrite server-side queue display to use API
-- support authentication/security
-- why doesn't the bug tracker work?! relatedly, figure out a
-  solution that makes it easier for non-MIT developers to contribute
+- server stuff
+     [ ] write convenience client-side API
+     [ ] setuptools entry points for notification system (e.g. zephyr)
+     [ ] deal with queue management/reordering
+     [ ] add support for volume management
+     [ ] support authentication/security
+
+- client-ish stuff
+     [ ] rewrite gbr/gbq/etc. scripts to use client API
+     [ ] rewrite server-side queue display to use API
+
+- misc
+     [ ] make sure all CUPS commands are compatible
+     [ ] deal with all the code marked 'XXX'
+
+- documentation and testing
+     [ ] finish test cases for printer.py
+     [ ] write test cases for requests.py
+     [ ] write test cases for future client API
+     [ ] all the documentation
+     [ ] check test case coverage ( http://nedbatchelder.com/code/coverage/ )
+     [ ] why doesn't the bug tracker work?! relatedly, figure out a
+         solution that makes it easier for non-MIT developers to contribute
 
 Ponies

server/lib/gutenbach-config

@@ -1 +1 @@
 port: 8000
 loglevel: debug
-logfile: gutenbach.log
+#logfile: gutenbach.log
 
 printers:

server/lib/gutenbach/server/job.py

@@ -56 +56 @@
     def __del__(self):
         if self.player:
-            self.player.mplayer_stop()
+            if self.player.is_playing:
+                self.player.mplayer_stop()
+            if self.player.fh:
+                if self.player.fh.closed:
+                    self.player.fh.close()
             self.player = None
-        if self.document and not self.document.closed:
-            self.document.close()
-            self.document = None
-
+
+        self.document = None
         self.id = None
         self.creator = None

server/lib/gutenbach/server/player.py

@@ -28 +28 @@
     def is_playing(self):
         if self._dryrun:
-            return self.isAlive() and not self.is_done
+            return self.ident is not None and \
+                   self.isAlive() and \
+                   not self.is_done
         else:
-            return self.isAlive() and \
-                      not self.is_done and \
-                      self.player is not None and \
-                      self.player.poll() is None
-
+            return self.ident is not None and \
+                   self.isAlive() and \
+                   not self.is_done and \
+                   self.player is not None and \
+                   self.player.poll() is None
+        
     @property
     @sync
@@ -121 +124 @@
                 logger.warning("trying to pause non-playing job")
         time.sleep(self._lag)
-                
+
     def mplayer_stop(self):
-        # Note: Inner Lock due to join.
+        # Note: Inner lock due to join.
         with self.lock:
             if self.is_playing:
@@ -134 +137 @@
                 logger.warning("trying to stop non-playing job")
         self.join()
+

server/test/server/job.py

@@ -6 +6 @@
 import sys
 import time
+import logging
 
 def make_tempfile():
@@ -204 +205 @@
 
 if __name__ == "__main__":
+    logging.basicConfig(loglevel=logging.CRITICAL)
     unittest.main()