Changeset 38388ac for client

Timestamp:

Jul 5, 2010, 5:48:11 PM (14 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

master, debian, mac, no-cups, web

Children:

b58aada

Parents:

a81397c

git-author:

Jessica B. Hamrick <jhamrick@…> (07/05/10 17:48:11)

git-committer:

Jessica B. Hamrick <jhamrick@…> (07/05/10 17:48:11)

Message:

Add support for pathname expansion/multiple files in gbr.

Location:

client/bin

Files:

• gbr (modified) (2 diffs)
• gbr.1 (modified) (1 diff)

client/bin/gbr

@@ -6 +6 @@
 use warnings;
 
-my $usage = "Usage: gbr QUEUE FILE\n";
+my $usage = "Usage: gbr QUEUE FILES\n";
 
 my $q = $ARGV[0];
-my $file = $ARGV[1];
+my @files = @ARGV[1 .. $#ARGV];
 
-if (!$q or !$file) {
+if (!$q or !@files) {
     print $usage;
     exit 1
@@ -33 +33 @@
 $ENV{CUPS_SERVER}="$host";
 
-if ($file =~ m|http://www\.youtube\.com/watch\?v=|) {
-    open(LP, "|-", "lp", "-d$queue");
-    print LP "$file";
-    close LP;
+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;
+    }
+    else {
+        my $pid = open(LP, "-|");
+        if (not $pid) {
+            my @args = ("lp", "-d$queue", "$file");
+            exec(@args) or die "Couldn't execute lp command";
+        }
+    }
+
+    print "Sent job '$file'\n";
 }
-else {
-    my @args = ("lp", "-d$queue", "$file");
-    exec (@args) or die "Couldn't execute lp command";
-}

client/bin/gbr.1

@@ -4 +4 @@
 .SH SYNOPSIS
 .B gbr 
-\fIQUEUE\fR \fIFILE\fR
+\fIQUEUE\fR \fIFILES\fR
 .SH DESCRIPTION
-Prints a file to a Gutenbach queue, given the queue name and the path
-to the file.  The path may also be a URL to a 
+Prints files to a Gutenbach queue, given the queue name and the path
+to the files.  gbr correctly handles pathname expansion, so (for
+example), if you wish to play all .mp3 files in a directory, the
+command `gbr $queue *.mp3` will send each .mp3 as a separate job.  The
+path may also be a URL to a
 .B YouTube 
 video (e.g. http://www.youtube.com/watch?v=foo).  The Gutenbach queue