Changeset 7cdd65d for client

Timestamp:

Aug 14, 2010, 9:30:39 PM (14 years ago)

Author:

Kyle Brogle <broglek@…>

Branches:

master, debian, mac, no-cups

Children:

618236b, 9dee329

Parents:

55b24d1

git-author:

Kyle Brogle <broglek@…> (08/14/10 21:30:39)

git-committer:

Kyle Brogle <broglek@…> (08/14/10 21:30:39)

Message:

Implemented default queue in client scripts.
Queue argument now optional for gb{r,rm,q}, and also takes form of -q QUEUE
now.

gutenbach-client-config -sset-default QUEUE will set default queue

Updated manpages accordingly.

Location:

client/bin

Files:

• gbq (modified) (1 diff)
• gbq.1 (modified) (2 diffs)
• gbr (modified) (1 diff)
• gbr.1 (modified) (2 diffs)
• gbrm (modified) (1 diff)
• gbrm.1 (modified) (2 diffs)
• gutenbach-client-config (modified) (2 diffs)
• gutenbach-client-config.1 (modified) (2 diffs)

client/bin/gbq

@@ -8 +8 @@
 use Net::CUPS;
 use Net::CUPS::Destination;
+use Getopt::Long;
 
-my $usage = "Usage: gbq QUEUE\n";
+my $usage = "Usage: gbq [-q QUEUE]\n";
 
-my $q = $ARGV[0];
+my $q = "";
+GetOptions ('q|queue=s' => \$q);
 
 if (!$q) {
-    print $usage;
-    exit 1
+    $q = "DEFAULT";
 }
 

client/bin/gbq.1

@@ -4 +4 @@
 .SH SYNOPSIS
 .B gbq 
-\fIQUEUE\fR
+[-q \fIQUEUE\fR]
 .SH DESCRIPTION
 Uses the perl Net::CUPS library to access a remote queue and display
@@ -10 +10 @@
 Gutenbach queue must have previously been added with
 .B gutenbach-client-config
-so that gbq knows which host to use.
+so that gbq knows which host to use.  If no queue is specified,
+.B gbq
+will try to use the default queue, if one is configured.
 .SH SEE ALSO
 gbr(1), gbrm(1), gutenbach-client-config(1)

client/bin/gbr

@@ -8 +8 @@
 use Net::CUPS;
 use Net::CUPS::Destination;
+use Getopt::Long;
 use Image::ExifTool qw(ImageInfo);
 
 my $usage = "Usage: gbr QUEUE FILES\n";
 
-my $q = $ARGV[0];
-my @files = @ARGV[1 .. $#ARGV];
+my $q = "";
+GetOptions ('q|queue=s' => \$q);
 
-if (!$q or !@files) {
+my @files = @ARGV[0 .. $#ARGV];
+
+if (!$q){
+    $q = "DEFAULT";
+}
+if (!@files) {
     print $usage;
     exit 1

client/bin/gbr.1

@@ -4 +4 @@
 .SH SYNOPSIS
 .B gbr 
-\fIQUEUE\fR \fIFILES\fR
+[-q \fIQUEUE\fR] \fIFILES\fR
 .SH DESCRIPTION
 Prints files to a Gutenbach queue, given the queue name and the path
@@ -15 +15 @@
 must have previously been added with
 .B gutenbach-client-config
-so that gbr knows which host to use.
+so that gbr knows which host to use.  If no queue is specified,
+.B gbr
+will try to use the default queue, if one is configured.
 .SH SEE ALSO
 gbq(1), gbrm(1), gutenbach-client-config(1)

client/bin/gbrm

@@ -8 +8 @@
 use Net::CUPS;
 use Net::CUPS::Destination;
+use Getopt::Long;
 
-my $usage = "Usage: gbq QUEUE ID\n";
+my $usage = "Usage: gbq [-q QUEUE] ID\n";
+my $q = "";
+GetOptions ('q|queue=s' => \$q);
 
-my $q = $ARGV[0];
-my @ids = @ARGV[1 .. $#ARGV];
+my @ids = @ARGV[0 .. $#ARGV];
 
-if (!$q or !@ids) {
+if (!$q){
+    $q = "DEFAULT";
+}
+if (!@ids) {
     print $usage;
     exit 1
 }
+
 
 my $configpath = "$ENV{'HOME'}/.gutenbach/$q";

client/bin/gbrm.1

@@ -4 +4 @@
 .SH SYNOPSIS
 .B gbrm 
-\fIQUEUE\fR [all|current|\fIID\fR]
+[-q \fIQUEUE\fR] [all|current|\fIID\fR]
 .SH DESCRIPTION
 Removes a single job from a Gutenbach queue, given the job id, which
@@ -19 +19 @@
 queue.  The queue must have previously been added with
 .B gutenbach-client-config
-so that gbrm knows which host to use.
+so that gbrm knows which host to use.  If no queue is specified,
+.B gbr
+will try to use the default queue, if one is configured.
 .SH SEE ALSO
 gbr(1), gbq(1), gutenbach-client-config(1)

client/bin/gutenbach-client-config

@@ -19 +19 @@
 my $delete = "";
 my $host = "";
+my $default = "";
 
 GetOptions ('l|list' => \$list,
+            's|set-default=s' => \$default,
             'a|add=s' => \$add,
             'd|delete=s' => \$delete,
@@ -30 +32 @@
     mkdir "$configpath";
 }
+#set given queue to default
+if($default and !$add and !$delete and !$list) {
+    unless(-e "$configpath/$default") {
+        print "Error: queue '$default' doesn't exist yet...you should add it first.\n";
+        exit 1;
+    }
+    if( -e "$configpath/DEFAULT"){
+        unlink("$configpath/DEFAULT") or die "Couldn't remove config file '$configpath/DEFAULT'";
+    }
+    my $symlink_exists = eval { symlink("",""); 1 };
+    if ($symlink_exists){
+        symlink("$configpath/$default","$configpath/DEFAULT");
+        print "Changed default queue to $default.\n";
+    }
+    else
+    {
+        print "Error creating symlink to $configpath/$default";
+        exit 1;
+    }
+}
+    
+        
 
 # list the existing queues
-if ($list and !$add and !$delete) {
+elsif ($list and !$add and !$delete and !$default) {
     my @queues = glob("$configpath/*") or die "Couldn't find configuration files at '$configpath'";
 

client/bin/gutenbach-client-config.1

@@ -4 +4 @@
 .SH SYNOPSIS
 .B gutenbach-client-config 
-[-l|--list|-a|--add|-d|--delete] [\fIQUEUE\fR] [--host \fIHOST\fR]
+[-l|--list|-a|--add|-d|--delete|-s|--set-default] [\fIQUEUE\fR] [--host \fIHOST\fR]
 .SH DESCRIPTION
 Provides options to add, remove, or list remote Gutenbach queues.  The
@@ -34 +34 @@
 \fB\-h\fR, \fB\-\-host\fR HOST
 Hostname for the queue
+.TP
+\fB\-s\fR, \fB\-\-set\-default\fR QUEUE
+Set the default queue
 .SH SEE ALSO
 gbr(1), gbrm(1), gbq(1)