Changeset c5a98db for client

Timestamp:

Jul 5, 2010, 3:30:19 PM (14 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

master, debian, mac, no-cups, web

Children:

618236b, a81397c

Parents:

03e2535

git-author:

Jessica B. Hamrick <jhamrick@…> (07/05/10 15:30:19)

git-committer:

Jessica B. Hamrick <jhamrick@…> (07/05/10 15:30:19)

Message:

• Fixed support for playing YouTube? videos
• Fixed error with CUPS_SERVER in gbr and gbrm
• Added support for playing YouTube? URLs with gbr

Location:

client/bin

Files:

• gbr (modified) (1 diff)
• gbr.1 (modified) (1 diff)
• gbrm (modified) (1 diff)

client/bin/gbr

@@ -31 +31 @@
 }
 
-my @args = ("CUPS_SERVER=$host", "lp", "-d$queue", "$file");
-exec (@args) or die "Couldn't execute lp command";
+$ENV{CUPS_SERVER}="$host";
+
+if ($file =~ m|http://www\.youtube\.com/watch\?v=|) {
+    open(LP, "|-", "lp", "-d$queue");
+    print LP "$file";
+    close LP;
+}
+else {
+    my @args = ("lp", "-d$queue", "$file");
+    exec (@args) or die "Couldn't execute lp command";
+}

client/bin/gbr.1

@@ -7 +7 @@
 .SH DESCRIPTION
 Prints a file to a Gutenbach queue, given the queue name and the path
-to the file.  The Gutenbach queue must have previously been added with
+to the file.  The path may also be a URL to a 
+.B YouTube 
+video (e.g. http://www.youtube.com/watch?v=foo).  The Gutenbach queue
+must have previously been added with
 .B gutenbach-client-config
 so that gbr knows which host to use.

client/bin/gbrm

@@ -34 +34 @@
 
 if ($id eq "all") {
-    @args = ("CUPS_SERVER=$host", "cancel", "-a", "$queue");
+    @args = ("cancel", "-a", "$queue");
 }
 else {
-    @args = ("CUPS_SERVER=$host", "cancel", "$id", "$queue");
+    @args = ("cancel", "$id", "$queue");
 }
+$ENV{CUPS_SERVER}="$host";
 exec (@args) or die "Couldn't execute cancel command";