Changeset 1437

Timestamp:

04/16/04 18:47:58 (21 years ago)

Author:

jalet

Message:

pkprinters now accept the --list command line option

Location:

pykota/trunk

Files:

• bin/pkprinters (modified) (7 diffs)
• man/edpykota.1 (modified) (2 diffs)
• man/pkhint.1 (modified) (1 diff)
• man/pkprinters.1 (modified) (2 diffs)
• man/pykotme.1 (modified) (1 diff)
• man/repykota.1 (modified) (1 diff)
• man/warnpykota.1 (modified) (1 diff)
• NEWS (modified) (1 diff)
• po/br/pykota.mo (modified) (previous)
• po/br/pykota.po (modified) (1 diff)
• po/en/pykota.po (modified) (1 diff)
• po/es/pykota.mo (modified) (previous)
• po/es/pykota.po (modified) (1 diff)
• po/fr/pykota.mo (modified) (previous)
• po/fr/pykota.po (modified) (1 diff)
• po/pt/pykota.mo (modified) (previous)
• po/pt/pykota.po (modified) (1 diff)
• po/pykota.pot (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/pkprinters

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.4  2004/04/16 16:47:57  jalet
+# pkprinters now accept the --list command line option
+#
 # Revision 1.3  2004/02/04 13:24:41  jalet
 # pkprinters can now remove printers from printers groups.
@@ -80 +83 @@
                        printer groups.
                        
+  -l | --list          List informations about the printer(s) and the
+                       printers groups it is a member of.
+                       
   -r | --remove        In combination with the --groups option above,                       
                        remove printers from the specified printers groups.
@@ -130 +136 @@
     def main(self, names, options) :
         """Manage printers."""
+        if options["list"] and not names :
+            names = ["*"]
+            
         if options["groups"] :        
             printersgroups = self.storage.getMatchingPrinters(options["groups"])
@@ -167 +176 @@
             if options["delete"] :
                 printer.delete()
+            elif options["list"] :    
+                parents = ", ".join([p.Name for p in self.storage.getParentPrinters(printer)])
+                if parents : 
+                    parents = "%s %s" % (_("in"), parents)
+                print "%s (%s + %s) %s" % \
+                      (printer.Name, printer.PricePerJob, \
+                       printer.PricePerPage, parents)
             else :    
                 if options["charge"] :
@@ -180 +196 @@
     retcode = 0
     try :
-        short_options = "hvac:dg:r"
-        long_options = ["help", "version", "add", "charge=", "delete", "groups=", "remove"]
+        short_options = "hvac:dg:lr"
+        long_options = ["help", "version", "add", "charge=", "delete", "groups=", "list", "remove"]
         
         # Initializes the command line tool
@@ -196 +212 @@
         options["delete"] = options["d"] or options["delete"] 
         options["groups"] = options["g"] or options["groups"]
+        options["list"] = options["l"] or options["list"]
         options["remove"] = options["r"] or options["remove"]
         
@@ -202 +219 @@
         elif options["version"] :
             manager.display_version_and_quit()
-        elif options["delete"] and (options["add"] or options["groups"] or options["charge"] or options["remove"]) :    
+        elif (options["delete"] and (options["add"] or options["groups"] or options["charge"] or options["remove"])) \
+           or (options["list"] and (options["add"] or options["delete"] or options["groups"] or options["charge"] or options["remove"])) :
             raise PyKotaToolError, _("incompatible options, see help.")
         elif options["remove"] and not options["groups"] :    
             raise PyKotaToolError, _("You have to pass printer groups names on the command line")
-        elif not args :    
+        elif (not args) and (not options["list"]) :    
             raise PyKotaToolError, _("You have to pass printer names on the command line")
         else :

pykota/trunk/man/edpykota.1

@@ -1 +1 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH EDPYKOTA "1" "March 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
+.TH EDPYKOTA "1" "April 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-edpykota \- manual page for edpykota 1.18_unofficial
+edpykota \- manual page for edpykota 1.19alpha2_unofficial
 .SH DESCRIPTION
-edpykota v1.18_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
+edpykota v1.19alpha2_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
 A Print Quota editor for PyKota.
 .PP
@@ -81 +81 @@
 by its account balance or by its page quota.
 The default value is 'quota'. Allowed values
-are 'quota' and 'balance'.
+are 'quota' 'balance' 'quota-then-balance' and
+\&'balance-then-quota'.
+WARNING : quota-then-balance and balance-then-quota
+are not yet implemented.
 .TP
 \fB\-b\fR | \fB\-\-balance\fR b

pykota/trunk/man/pkhint.1

@@ -1 +1 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH PKHINT "1" "March 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
+.TH PKHINT "1" "April 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-pkhint \- manual page for pkhint 1.18_unofficial
+pkhint \- manual page for pkhint 1.19alpha2_unofficial
 .SH DESCRIPTION
-pkhint v1.18_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
+pkhint v1.19alpha2_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
 A tool to give hints on what accounting method is best for each printer.
 .PP

pykota/trunk/man/pkprinters.1

@@ -1 +1 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH PKPRINTERS "1" "March 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
+.TH PKPRINTERS "1" "April 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-pkprinters \- manual page for pkprinters 1.18_unofficial
+pkprinters \- manual page for pkprinters 1.19alpha2_unofficial
 .SH DESCRIPTION
-pkprinters v1.18_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
+pkprinters v1.19alpha2_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
 A Printers Manager for PyKota.
 .PP
@@ -46 +46 @@
 default action is to add printers to the specified
 printer groups.
+.TP
+\fB\-l\fR | \fB\-\-list\fR
+List informations about the printer(s) and all
+the printers groups it is a member of.
 .TP
 \fB\-r\fR | \fB\-\-remove\fR

pykota/trunk/man/pykotme.1

@@ -1 +1 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH PYKOTME "1" "March 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
+.TH PYKOTME "1" "April 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-pykotme \- manual page for pykotme 1.18_unofficial
+pykotme \- manual page for pykotme 1.19alpha2_unofficial
 .SH DESCRIPTION
-pykotme v1.18_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
+pykotme v1.19alpha2_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
 .PP
 Gives print quotes to users.

pykota/trunk/man/repykota.1

@@ -1 +1 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH REPYKOTA "1" "March 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
+.TH REPYKOTA "1" "April 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-repykota \- manual page for repykota 1.18_unofficial
+repykota \- manual page for repykota 1.19alpha2_unofficial
 .SH DESCRIPTION
-repykota v1.18_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
+repykota v1.19alpha2_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
 .PP
 Generates print quota reports.

pykota/trunk/man/warnpykota.1

@@ -1 +1 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH WARNPYKOTA "1" "March 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
+.TH WARNPYKOTA "1" "April 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-warnpykota \- manual page for warnpykota 1.18_unofficial
+warnpykota \- manual page for warnpykota 1.19alpha2_unofficial
 .SH DESCRIPTION
-warnpykota v1.18_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
+warnpykota v1.19alpha2_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
 .PP
 Sends mail to users over print quota.

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.19alpha3 :
+    
+        - pkprinters now accepts the --list command line argument
+          to list informations about printers.
+          
     - 1.19alpha2 :
     

pykota/trunk/po/br/pykota.po

@@ -479 +479 @@
 msgstr "Problema modificando entrada LDAP (%s, %s)"
 
+#, python-format
+msgid "in"
+msgstr "em"

pykota/trunk/po/en/pykota.po

@@ -442 +442 @@
 msgid "Problem modifying LDAP entry (%s, %s)"
 msgstr ""
+
+#, python-format
+msgid "in"
+msgstr ""

pykota/trunk/po/es/pykota.po

@@ -483 +483 @@
 msgstr "Problema al modificar entrada LDAP (%s, %s)"
 
+#, python-format
+msgid "in"
+msgstr "en"

pykota/trunk/po/fr/pykota.po

@@ -470 +470 @@
 msgstr "Probl� durant la modification de l'entr�LDAP (%s, %s)"
 
+#, python-format
+msgid "in"
+msgstr "dans"

pykota/trunk/po/pt/pykota.po

@@ -479 +479 @@
 msgstr "Ocorreu um problema ao modificar a entrada LDAP (%s, %s)"
 
+#, python-format
+msgid "in"
+msgstr "em"

pykota/trunk/po/pykota.pot

@@ -442 +442 @@
 msgid "Problem modifying LDAP entry (%s, %s)"
 msgstr ""
+
+#, python-format
+msgid "in"
+msgstr ""

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.19alpha2_unofficial"
+__version__ = "1.19alpha3_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""