Changeset b58aada

Timestamp:

Jul 5, 2010, 8:01:47 PM (14 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

master, debian, mac, no-cups, web

Children:

d768767

Parents:

38388ac

git-author:

Jessica B. Hamrick <jhamrick@…> (07/05/10 20:01:47)

git-committer:

Jessica B. Hamrick <jhamrick@…> (07/05/10 20:01:47)

Message:

Use perl bindings for gbr and gbrm in addition to gbq. Update README.

Files:

• .gitignore (modified) (1 diff)
• README (modified) (2 diffs)
• client/bin/gbq (modified) (1 diff)
• client/bin/gbr (modified) (2 diffs)
• client/bin/gbrm (modified) (1 diff)
• server/lib/gutenbach (modified) (1 diff)

.gitignore

@@ -1 +1 @@
 *~
 client/bin/*.1.gz
+debian/

README

@@ -87 +87 @@
   package or something
 
-- add regex support to the client scripts, so you can do something
-  like `gbr sipbmp3 *.mp3` and have it send separate jobs to the queue
-
 - add client scripts for the remctl package, something maybe like
   `gbvol [set|get] number`.  Or maybe just leave it with using remctl.
@@ -95 +92 @@
 - fix the web interface
 
-- fix the youtube feature.  Additionally, make it possible to play
-  movies!
+- Make it possible to play movies; i.e. add video support (the audio
+  support is already there, obviously)

client/bin/gbq

@@ -38 +38 @@
 
 print "Queue listing for queue '$queue' on '$host'\n\n";
-print "Job ID\t\tOwner\t\tFile\n";
+print "Job ID\t\tOwner\t\tTitle\n";
 print "-----------------------------------------------------------------\n";
 

client/bin/gbr

@@ -5 +5 @@
 use strict;
 use warnings;
+
+use Net::CUPS;
+use Net::CUPS::Destination;
+use Image::ExifTool qw(ImageInfo);
 
 my $usage = "Usage: gbr QUEUE FILES\n";
@@ -31 +35 @@
 }
 
-$ENV{CUPS_SERVER}="$host";
+my $cups = Net::CUPS->new();
+$cups->setServer("$host");
+my $printer = $cups->getDestination("$queue");
+my ($jobid, $title);
 
 foreach my $file(@files) {
     if ($file =~ m|http://www\.youtube\.com/watch\?v=|) {
-        open(LP, "|-", "lp", "-d$queue") or die "Couldn't execute lp command";
-        print LP "$file";
-        close LP;
+        open FILE, ">", "/tmp/gutenbach-youtube\n" or die "Couldn't create temporary file";
+        print FILE $file;
+        $title = $file;
+        $file = "/tmp/gutenbach-youtube";
+        $printer->addOption("copies", 42);
     }
     else {
-        my $pid = open(LP, "-|");
-        if (not $pid) {
-            my @args = ("lp", "-d$queue", "$file");
-            exec(@args) or die "Couldn't execute lp command";
+        my $fileinfo = ImageInfo($file);
+        my $magic = $fileinfo->{FileType};
+
+        if ($magic) {
+            $title = $fileinfo->{'Title'}." - ".$fileinfo->{'Artist'}." - ".$fileinfo->{'Album'};
+        }
+        else {
+            $title = $file;
         }
     }
 
-    print "Sent job '$file'\n";
+    $jobid = $printer->printFile($file, $title);
+    
+    if ($jobid) {
+        print "Sent job '$title' (id $jobid)\n";
+    }
+    else {
+        print "Error sending job '$title'\n";
+    }
 }

client/bin/gbrm

@@ -34 +34 @@
 }
 
-my @args;
+my $cups = Net::CUPS->new();
+$cups->setServer("$host");
+my $printer = $cups->getDestination("$queue");
+my @jobs = $printer->getJobs(0, 0);
 
 if ($id eq "all") {
-    @args = ("cancel", "-a", "$queue");
+    foreach $id(@jobs) {
+        $printer->cancelJob($id);
+    }
 }
 elsif ($id eq "current") {
-    my $cups = Net::CUPS->new();
-    $cups->setServer("$host");
-    my $printer = $cups->getDestination("$queue");
-    my @jobs = $printer->getJobs(0, 0);
-    my $id = $jobs[0];
-    @args = ("cancel", "$id", "$queue");
+    $id = $jobs[0];
+    $printer->cancelJob($id);
 }
 else {
-    @args = ("cancel", "$id", "$queue");
+    $printer->cancelJob($id);
 }
-$ENV{CUPS_SERVER}="$host";
-exec (@args) or die "Couldn't execute cancel command";

server/lib/gutenbach

@@ -121 +121 @@
 $SIG{HUP} = \&clear_status;
 $SIG{TERM} = \&clear_status;
+$SIG{INT} = \&clear_status;
 
 # Read the metadata information from the file.