Changeset 2620618 for server/lib/gutenbach/server/player.py

Timestamp:

Jan 12, 2012, 12:58:40 AM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

609a9b0

Parents:

190bfb4

git-author:

Jessica B. Hamrick <jhamrick@…> (01/12/12 00:58:40)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/12/12 00:58:40)

Message:

Test cases for playing/pausing/stopping jobs

File:

• server/lib/gutenbach/server/player.py (modified) (6 diffs)

server/lib/gutenbach/server/player.py

@@ -18 +18 @@
             self._callback = None
             self._paused = False
+            self._done = False
+            self._dryrun = False
+            self._dryrun_time = 0.5
 
     @property
     def is_playing(self):
         with self.lock:
-            playing = self.player and self.player.poll() is None
+            if self._dryrun:
+                playing = self.isAlive() and not self.is_done
+            else:
+                playing = self.isAlive() and \
+                          not self.is_done and \
+                          self.player is not None and \
+                          self.player.poll() is None
         return playing
 
@@ -33 +42 @@
     @property
     def is_done(self):
-        with self.lock:
-            done = self.player and self.player.poll() is not None
-        return done
+        return self._done
 
     @property
@@ -50 +57 @@
         
         self.mplayer_play()
+        self._done = True
         with self.lock:
             if self.callback:
@@ -60 +68 @@
         logger.info("playing file '%s'" % self.fh.name)
         self._paused = False
+
+        if self._dryrun:
+            step = 0.01
+            while self._dryrun_time > 0:
+                time.sleep(step)
+                self._dryrun_time -= step
+                while self.is_paused:
+                    time.sleep(0.01)
+            return
         
         # open mplayer
@@ -79 +96 @@
 
         logger.info("mplayer finished with code %d" % self.player.returncode)
-
+        
         # get output from mplayer and log it
         with self.lock:
@@ -91 +108 @@
 
     def mplayer_pause(self):
-        if not self.isAlive():
-            return
-        
         with self.lock:
             if self.is_playing:
-                self.player.stdin.write("pause\n")
+                if not self._dryrun:
+                    self.player.stdin.write("pause\n")
                 self._paused = not(self._paused)
+                logger.info("paused: %s", self.is_paused)
+            else:
+                logger.warning("trying to pause non-playing job")
                 
     def mplayer_stop(self):
-        if not self.isAlive():
-            return
-        
         with self.lock:
             if self.is_playing:
-                self.player.stdin.write("quit\n")
+                if not self._dryrun:
+                    self.player.stdin.write("quit\n")
+                else:
+                    self._dryrun_time = 0.0
+                logger.info("stopped")
+            else:
+                logger.warning("trying to stop non-playing job")