Changes in / [b349e5d:ad34c30]

Files:

• README (modified) (1 diff)
• client/bin/gbrm (modified) (4 diffs)
• server/lib/gutenbach (modified) (6 diffs)

README

@@ -55 +55 @@
       CUPS_SERVER=servername cancel [ID|-a] queuename
 
-TODO: 
+BUGS:
 
-- include mixer and channel in debconf, or even better, move it to
-  gutenbach-remctl and implement debconf in that package
-
-- this should really not conflict with pulse (the biggest problem at
-  the moment is that pulse will spew a bunch of errors like "Home
-  directory /var/spool/cups/tmp not ours." I can't figure out how to
-  get rid of them, but they're really annoying.  As long as pulse is
-  in system mode, things seem to work otherwise.)
-
-- CUPS issues
-
-    * the CUPS daemon processes do not inherit groups from the lp user
-      (so, for example, even if we add 'lp' to 'audio', the process
-      will not be running in group 'audio').  For the time being, I've
-      set the CUPS daemon to always run under group 'audio', but there
-      should really be a better solution.
-
-    * when the Purge-Jobs command is sent, the jobs are removed, but
-      the current mplayer instance continues playing.  This
-      unfortunately leads to jobs being played over each other when
-      the CUPS server restarts
-
-- Making it easier to use across multiple platforms, regardless of
-  debathena/normal linux/etc?
-
-- Gutenbach should not depend on Debathena -- ideally,
-  gutenbach-server should be debathena free, and then if people want
-  to use zephyr, etc., they can install an additional gutenbach-zephyr
-  package or something
-
-- add client scripts for the remctl package, something maybe like
-  `gbvol [set|get] number`.  Or maybe just leave it with using remctl.
-
-- fix the web interface
-
-- Make it possible to play movies; i.e. add video support (the audio
-  support is already there, obviously)
+Please file bug reports in our Trac instance, located at
+http://gutenbach.mit.edu/trac

client/bin/gbrm

@@ -12 +12 @@
 
 my $q = $ARGV[0];
-my $id = $ARGV[1];
+my @ids = @ARGV[1 .. $#ARGV];
 
-if (!$q or !$id) {
+if (!$q or !@ids) {
     print $usage;
     exit 1
@@ -42 +42 @@
 }
 my @jobs = $printer->getJobs(0, 0);
-
+foreach my $id(@ids){
 if ($id eq "all") {
     foreach $id(@jobs) {
@@ -57 +57 @@
 }
 else {
-    cancel_job($id, $printer);
+    foreach my $item(@jobs) {
+        if($item =~ /$id/){
+            cancel_job($item, $printer);
+        }
+    }
+}
 }
 
@@ -67 +72 @@
 
     print "Canceled job '$title' (id $id)\n";
+ 
 }

server/lib/gutenbach

@@ -116 +116 @@
   print(ZEPH "Playback aborted.\n");
   close(ZEPH);
+
+  open(STATUS, ">", "/var/run/gutenbach/status");
+  print(STATUS "");
+  close(STATUS);
   die;
 }
@@ -130 +134 @@
 my ($newpath);
 
+open(STATUS, ">", "/var/run/gutenbach/status");
+
 if ($magic) {
   # $magic means that Image::ExifTool was able to identify the type of file
   printf(ZEPHYR "%s file %s\n", $magic, $arguments{"job-title"});
+  printf(STATUS "%s file %s\n", $magic, $arguments{"job-title"});
   $status .= sprintf(" Filetype: %s.", $magic);
   $status .= sprintf(" Filename: %s.", $arguments{"job-title"});
@@ -138 +145 @@
   if (exists $fileinfo->{'Title'}) {
     printf(ZEPHYR "\@b{%s}\n", $fileinfo->{'Title'}) if exists $fileinfo->{'Title'};
+    #printf(STATUS "%s\n", $fileinfo->{'Title'}) if exists $fileinfo->{'Title'};
     $status .= sprintf(" Title: %s.", $fileinfo->{'Title'});
   }
@@ -143 +151 @@
     if (exists $fileinfo->{$key}) {
       printf(ZEPHYR "%s\n", $fileinfo->{$key}) if exists $fileinfo->{$key};
+      printf(STATUS "%s\n", $fileinfo->{$key}) if exists $fileinfo->{$key};
       $status .= sprintf(" %s: %s\n", $key, $fileinfo->{$key});
     }
@@ -200 +209 @@
 
 close(ZEPHYR);
+close(STATUS);
 print CUPS "NOTICE: $status\n";
 play_mplayer_audio($filepath, \%arguments);
@@ -329 +339 @@
       print ZEPHYR "Playback completed successfully.\n";
       close(ZEPHYR);
+      open(STATUS, ">", "/var/run/gutenbach/status");
+      print(STATUS "");
+      close(STATUS);
     }
     close(MP3STATUS) || print ZEPHYR "mplayer exited $?\n";