Changeset e20354c

Timestamp:

Jun 24, 2010, 1:48:08 AM (14 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

master, debian, mac, no-cups, nodebathena, web

Children:

b30ec0c

Parents:

7bc8b29

git-author:

Jessica B. Hamrick <jhamrick@…> (05/12/10 22:47:15)

git-committer:

Jessica B. Hamrick <jhamrick@…> (06/24/10 01:48:08)

Message:

Fix perl bugs in the filter, change 'daemon' to 'lp'

Location:

debian

Files:

• control (modified) (1 diff)
• gutenbach.postinst (modified) (1 diff)
• inst/create-filter-config (modified) (1 diff)
• lib/gutenbach (modified) (10 diffs)

debian/control

@@ -10 +10 @@
 Pre-Depends: debconf
 Depends: ${shlibs:Depends}, ${misc:Depends}, mplayer, libimage-exiftool-perl, lprng | debathena-lprng, sysv-rc, adduser, debathena-zephyr-config, libzephyr3-krb, alsa-base
-Conflicts: pulseaudio
-Provides: pulseaudio
 Description: Server for playing music files from a remote machine
  Allows remote machines to play music files on this machine

debian/gutenbach.postinst

@@ -41 +41 @@
 
 
-        inaudio=$(groups daemon | grep audio || true)
+        inaudio=$(groups lp | grep audio || true)
         if [ -z "$inaudio" ]; then
-            adduser daemon audio
+            adduser lp audio
         fi
 

debian/inst/create-filter-config

@@ -25 +25 @@
 mixer="PCM"
 channel="Front Left"
+config_file="/usr/lib/gutenbach/config/gutenbach-filter-config.pl"
 
 if [ -z "$failed" ]; then
-    echo "\$zephyr_class = \""$zephyrclass"\";" >> /usr/lib/gutenbach/config/gutenbach-filter-config.pl
-    echo "\$host = \""$hostname"\";" >> /usr/lib/gutenbach/config/gutenbach-filter-config.pl
-    echo "\$queue = \""$printername"\";" >> /usr/lib/gutenbach/config/gutenbach-filter-config.pl
-    echo "\$mixer = \""$mixer"\";" >> /usr/lib/gutenbach/config/gutenbach-filter-config.pl
-    echo "\$channel = \""$channel"\";" >> /usr/lib/gutenbach/config/gutenbach-filter-config.pl
+    echo "\$zephyr_class = \""$zephyrclass"\";" >> "$config_file"
+    echo "\$host = \""$hostname"\";" >> "$config_file"
+    echo "\$queue = \""$printername"\";" >> "$config_file"
+    echo "\$mixer = \""$mixer"\";" >> "$config_file"
+    echo "\$channel = \""$channel"\";" >> "$config_file"
+    echo "1;" >> "$config_file"
 else
     echo "Error: One of /usr/lib/gutenbach/config/{printername,hostname,zephyrclass} does not exist!" >&2

debian/lib/gutenbach

@@ -25 +25 @@
 use IPC::Open2;
 use English;
+
+use vars qw/$zephyr_class $host $queue $mixer $channel/;
 
 require "/usr/lib/gutenbach/config/gutenbach-filter-config.pl" or die "Unable to load configuration";
@@ -65 +67 @@
 
 my %arguments = (
-                 job-id => $ARGV[0],
+                 "job-id" => $ARGV[0],
                  user => $ARGV[1],
-                 job-title => $ARGV[2],
+                 "job-title" => $ARGV[2],
                  copies => $ARGV[3],
                  options => {split(/[= ]/, $ARGV[4])},
@@ -83 +85 @@
   }
   close($fh);
+  $arguments{"file"} = $file;
 }
 
@@ -93 +96 @@
 open(ZEPHYR, "|-", @zwrite_command) or die "Couldn't launch zwrite: $!";
 
-print(ZEPHYR "$arguments{user}\@$arguments{options}{job-originating-host-name} is playing:\n");
-my $status = "User: $arguments{user}\@$arguments{options}{job-originating-host-name}.");
+print(ZEPHYR $arguments{"user"},"\@",$arguments{"options"}{"job-originating-host-name"}," is playing:\n");
+my $status = "User: ".$arguments{"user"}."\@".$arguments{"options"}{"job-originating-host-name"};
 
 # SIGHUP handler, in case we were aborted
@@ -107 +110 @@
 
 # Read the metadata information from the file.
-my ($filepath) = $options{"file"};
+my ($filepath) = $arguments{"file"};
 my ($fileinfo) = ImageInfo($filepath);
 my ($magic) = $fileinfo->{FileType};
+my ($tempdir);
+my ($newpath);
 
 if ($magic) {
@@ -128 +133 @@
   }
 
-  my $tempdir = tempdir();
+  $tempdir = tempdir();
   #awful hack -- geofft
   #== -- quentin
@@ -135 +140 @@
   # filename. I think this is because mplayer sometimes uses the file
   # extension to identify a filetype.
-  my $newpath = $tempdir . '/' . basename($arguments{"job-title"});
+  $newpath = $tempdir . '/' . basename($arguments{"job-title"});
   symlink($filepath, $newpath);
   $filepath = $newpath;
@@ -184 +189 @@
   my ($filepath, $arguments) = @_;
 
-  my $format, $uri, $userpass;
+  my ($format, $uri, $userpass);
 
   open(FILE, "<", $filepath) or die "Couldn't open spool file";
@@ -250 +255 @@
 
   my $response = $ua->get($uri);
+  my (@titles, @uris);
 
   foreach (split("\n", $response->content())) {
@@ -261 +267 @@
 
   # choose a random server
-  $server = int(rand scalar(@uris));
+  my $server = int(rand scalar(@uris));
   # print the name of the stream if available
   print ZEPHYR "$titles[$server]\n";