Changeset 921 for pykota/trunk/bin/edpykota
- Timestamp:
- 04/15/03 23:58:33 (21 years ago)
- Files:
-
- 1 modified
-
pykota/trunk/bin/edpykota (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/bin/edpykota
r917 r921 23 23 # 24 24 # $Log$ 25 # Revision 1.37 2003/04/15 21:58:33 jalet 26 # edpykota now accepts a --delete option. 27 # Preparation to allow edpykota to accept much more command line options 28 # (WARNING : docstring is OK, but code isn't !) 29 # 25 30 # Revision 1.36 2003/04/15 13:55:28 jalet 26 31 # Options --limitby and --balance added to edpykota … … 160 165 exist on the Quota Storage Server. 161 166 167 -d | --delete Deletes users/groups from the quota storage. 168 Printers are never deleted. 169 170 -c | --charge p[,j] Sets the price per page and per job to charge 171 for a particular printer. Job price is optional. 172 If both are to be set, separate them with a comma. 173 Floating point values are allowed. 174 175 -i | --ingroups g1[,g2...] Puts the users into each of the groups 176 listed, separated by commas. The groups 177 must already exist in the Quota Storage. 178 162 179 -u | --users Edit users print quotas, this is the default. 163 180 … … 212 229 printer lp doesn't exist on the Quota Storage Server then nothing is done. 213 230 214 $ edpykota --add --printer lp - S 50 -H 60 jerome231 $ edpykota --add --printer lp --ingroups coders,it -S 50 -H 60 jerome 215 232 216 233 Same as above, but if either user jerome or printer lp doesn't exist 217 on the Quota Storage Server they are automatically added. 234 on the Quota Storage Server they are automatically added. Also 235 user jerome is put into the groups "coders" and "it" which must 236 already exist in the Quota Storage. 218 237 WARNING : the CUPS PPD file for this printer must still be modified 219 238 manually, as well as pykota's configuration file for a … … 248 267 own currency). You can decrease the account balance with a 249 268 dash prefix, and set it to a fixed amount with no prefix. 269 270 $ edpykota --delete jerome rachel 271 272 This will completely delete jerome and rachel from the Quota Storage 273 database. All their quotas and jobs will be deleted too. 250 274 251 275 This program is free software; you can redistribute it and/or modify … … 322 346 if softlimit is not None : 323 347 self.logger.log_message(_("Undefined soft limit set to hard limit (%s) on printer %s.") % (str(softlimit), printer)) 324 if (not options["reset"] and not options["noquota"] and not options["prototype"] and not options["limitby"] and not options["balance"] ) and ((hardlimit is None) or (softlimit is None)) :348 if (not options["reset"] and not options["noquota"] and not options["prototype"] and not options["limitby"] and not options["balance"] and not options["delete"]) and ((hardlimit is None) or (softlimit is None)) : 325 349 raise PyKotaToolError, _("Both hard and soft limits must be set ! Aborting.") 326 350 if options["add"] : 327 allidnames = [(self.storage.getUserId(n), n) for n in names] 351 if options["groups"] : 352 allidnames = [(self.storage.getGroupId(n), n) for n in names] 353 else : 354 allidnames = [(self.storage.getUserId(n), n) for n in names] 328 355 else : 329 356 if options["groups"] : … … 358 385 self.logger.log_message(_("Quota not found for object %s on printer %s.") % (name, printer)) 359 386 else : 360 limitby = options["limitby"] 361 if limitby : 362 limitby = limitby.lower() 363 if limitby and (limitby not in ('quota', 'balance')) : 364 limitby = 'quota' 365 if options["groups"] : 366 if options["noquota"] or options["prototype"] or ((softlimit is not None) and (hardlimit is not None)) : 367 self.storage.setGroupPQuota(ident, printerid, softlimit, hardlimit) 368 if options["reset"] : 369 self.storage.resetGroupPQuota(ident, printerid) 387 if options["delete"] : 388 if options["groups"] : 389 self.storage.deleteGroup(ident) 390 else : 391 self.storage.deleteUser(ident) 392 else : 393 limitby = options["limitby"] 370 394 if limitby : 371 self.storage.limitGroupBy(ident, limitby) 372 self.warnGroupPQuota(name, printer) 373 else : 374 if options["noquota"] or options["prototype"] or ((softlimit is not None) and (hardlimit is not None)) : 375 self.storage.setUserPQuota(ident, printerid, softlimit, hardlimit) 376 if options["reset"] : 377 self.storage.resetUserPQuota(ident, printerid) 378 if limitby : 379 self.storage.limitUserBy(ident, limitby) 380 balance = options["balance"] 381 if balance : 382 balance = balance.strip() 383 try : 384 balancevalue = float(balance) 385 except ValueError : 386 pass # TODO : log something when incorrect balance value 387 else : 388 if balance.startswith("+") or balance.startswith("-") : 389 self.storage.increaseUserBalance(ident, balancevalue) 390 else : 391 self.storage.setUserBalance(ident, balancevalue) 392 self.warnUserPQuota(name, printer) 395 limitby = limitby.lower() 396 if limitby and (limitby not in ('quota', 'balance')) : 397 limitby = 'quota' 398 if options["groups"] : 399 if options["noquota"] or options["prototype"] or ((softlimit is not None) and (hardlimit is not None)) : 400 self.storage.setGroupPQuota(ident, printerid, softlimit, hardlimit) 401 if options["reset"] : 402 self.storage.resetGroupPQuota(ident, printerid) 403 if limitby : 404 self.storage.limitGroupBy(ident, limitby) 405 self.warnGroupPQuota(name, printer) 406 else : 407 if options["noquota"] or options["prototype"] or ((softlimit is not None) and (hardlimit is not None)) : 408 self.storage.setUserPQuota(ident, printerid, softlimit, hardlimit) 409 if options["reset"] : 410 self.storage.resetUserPQuota(ident, printerid) 411 if limitby : 412 self.storage.limitUserBy(ident, limitby) 413 balance = options["balance"] 414 if balance : 415 balance = balance.strip() 416 try : 417 balancevalue = float(balance) 418 except ValueError : 419 pass # TODO : log something when incorrect balance value 420 else : 421 if balance.startswith("+") or balance.startswith("-") : 422 self.storage.increaseUserBalance(ident, balancevalue) 423 else : 424 self.storage.setUserBalance(ident, balancevalue) 425 self.warnUserPQuota(name, printer) 393 426 394 427 if __name__ == "__main__" : … … 397 430 "printer" : "*", \ 398 431 } 399 short_options = "vh l:b:naugrp:P:S:H:"400 long_options = ["help", "version", " limitby=", "balance=", "noquota", "add", "users", "groups", "reset", "prototype=", "printer=", "softlimit=", "hardlimit="]432 short_options = "vhdc:l:b:i:naugrp:P:S:H:" 433 long_options = ["help", "version", "charge=", "delete", "limitby=", "balance=", "ingroups=", "noquota", "add", "users", "groups", "reset", "prototype=", "printer=", "softlimit=", "hardlimit="] 401 434 402 435 # Initializes the command line tool … … 420 453 options["limitby"] = options["l"] or options["limitby"] 421 454 options["balance"] = options["b"] or options["balance"] 455 options["delete"] = options["d"] or options["delete"] 456 options["ingroups"] = options["i"] or options["ingroups"] 457 options["charge"] = options["c"] or options["charge"] 422 458 423 459 if options["help"] : … … 427 463 elif options["users"] and options["groups"] : 428 464 raise PyKotaToolError, _("incompatible options, see help.") 465 elif (options["add"] or options["prototype"]) and options["delete"] : 466 raise PyKotaToolError, _("incompatible options, see help.") 429 467 elif (options["softlimit"] or options["hardlimit"]) and options["prototype"] : 430 468 raise PyKotaToolError, _("incompatible options, see help.") 431 469 elif options["noquota"] and (options["prototype"] or options["hardlimit"] or options["softlimit"]) : 432 470 raise PyKotaToolError, _("incompatible options, see help.") 433 elif options["groups"] and options["balance"]:471 elif options["groups"] and (options["balance"] or options["ingroups"]) : 434 472 raise PyKotaToolError, _("incompatible options, see help.") 435 473 elif options["groups"] :
