X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbup%2Foptions.py;h=394b71daed2311e9417cd97353e9b12975b7b288;hb=c40b3dd5fd74e72024fbaad3daf5a958aefa1c54;hp=716ab9c93f1a3e16757238b0aa4fb1517f872b3c;hpb=b0b2171510ae41d17db00821fbb9d4fe15c74314;p=bup.git diff --git a/lib/bup/options.py b/lib/bup/options.py index 716ab9c..394b71d 100644 --- a/lib/bup/options.py +++ b/lib/bup/options.py @@ -3,19 +3,19 @@ # # (This license applies to this file but not necessarily the other files in # this package.) -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: -# +# # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. -# +# # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# +# # THIS SOFTWARE IS PROVIDED BY AVERY PENNARUN ``AS IS'' AND ANY # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -45,10 +45,11 @@ longer one, but the short one can be omitted. Long option flags are used as the option's key for the OptDict produced when parsing options. -When the flag definition is ended with an equal sign, the option takes one -string as an argument. Otherwise, the option does not take an argument and -corresponds to a boolean flag that is true when the option is given on the -command line. +When the flag definition is ended with an equal sign, the option takes +one string as an argument, and that string will be converted to an +integer when possible. Otherwise, the option does not take an argument +and corresponds to a boolean flag that is true when the option is +given on the command line. The option's description is found at the right of its flags definition, after one or more spaces. The description ends at the end of the line. If the @@ -59,27 +60,55 @@ Options can be put in different groups. Options in the same group must be on consecutive lines. Groups are formed by inserting a line that begins with a space. The text on that line will be output after an empty line. """ + +from __future__ import absolute_import import sys, os, textwrap, getopt, re, struct -class OptDict: +try: + import fcntl +except ImportError: + fcntl = None + +try: + import termios +except ImportError: + termios = None + + +def _invert(v, invert): + if invert: + return not v + return v + + +def _remove_negative_kv(k, v): + if k.startswith('no-') or k.startswith('no_'): + return k[3:], not v + return k,v + + +class OptDict(object): """Dictionary that exposes keys as attributes. - Keys can bet set or accessed with a "no-" or "no_" prefix to negate the + Keys can be set or accessed with a "no-" or "no_" prefix to negate the value. """ - def __init__(self): + def __init__(self, aliases): self._opts = {} + self._aliases = aliases + + def _unalias(self, k): + k, reinvert = _remove_negative_kv(k, False) + k, invert = self._aliases[k] + return k, invert ^ reinvert def __setitem__(self, k, v): - if k.startswith('no-') or k.startswith('no_'): - k = k[3:] - v = not v - self._opts[k] = v + k, invert = self._unalias(k) + self._opts[k] = _invert(v, invert) def __getitem__(self, k): - if k.startswith('no-') or k.startswith('no_'): - return not self._opts[k[3:]] - return self._opts[k] + k, invert = self._unalias(k) + return _invert(self._opts[k], invert) def __getattr__(self, k): return self[k] @@ -106,24 +135,18 @@ def _atoi(v): return 0 -def _remove_negative_kv(k, v): - if k.startswith('no-') or k.startswith('no_'): - return k[3:], not v - return k,v - -def _remove_negative_k(k): - return _remove_negative_kv(k, None)[0] - - -def _tty_width(): - s = struct.pack("HHHH", 0, 0, 0, 0) - try: - import fcntl, termios - s = fcntl.ioctl(sys.stderr.fileno(), termios.TIOCGWINSZ, s) - except (IOError, ImportError): - return _atoi(os.environ.get('WIDTH')) or 70 - (ysize,xsize,ypix,xpix) = struct.unpack('HHHH', s) - return xsize or 70 +if not fcntl and termios: + def _tty_width(): + return 70 +else: + def _tty_width(): + s = struct.pack("HHHH", 0, 0, 0, 0) + try: + s = fcntl.ioctl(sys.stderr.fileno(), termios.TIOCGWINSZ, s) + except IOError: + return 70 + ysize, xsize, ypix, xpix = struct.unpack('HHHH', s) + return xsize or 70 class Options: @@ -148,7 +171,7 @@ class Options: self._longopts = ['help', 'usage'] self._hasparms = {} self._defaults = {} - self._usagestr = self._gen_usage() + self._usagestr = self._gen_usage() # this also parses the optspec def _gen_usage(self): out = [] @@ -178,16 +201,17 @@ class Options: has_parm = 0 g = re.search(r'\[([^\]]*)\]$', extra) if g: - defval = g.group(1) + defval = _intify(g.group(1)) else: defval = None flagl = flags.split(',') flagl_nice = [] + flag_main, invert_main = _remove_negative_kv(flagl[0], False) + self._defaults[flag_main] = _invert(defval, invert_main) for _f in flagl: - f,dvi = _remove_negative_kv(_f, _intify(defval)) - self._aliases[f] = _remove_negative_k(flagl[0]) + f,invert = _remove_negative_kv(_f, 0) + self._aliases[f] = (flag_main, invert_main ^ invert) self._hasparms[f] = has_parm - self._defaults[f] = dvi if f == '#': self._shortopts += '0123456789' flagl_nice.append('-#') @@ -196,7 +220,8 @@ class Options: flagl_nice.append('-' + f) else: f_nice = re.sub(r'\W', '_', f) - self._aliases[f_nice] = _remove_negative_k(flagl[0]) + self._aliases[f_nice] = (flag_main, + invert_main ^ invert) self._longopts.append(f + (has_parm and '=' or '')) self._longopts.append('no-' + f) flagl_nice.append('--' + _f) @@ -237,35 +262,29 @@ class Options: """ try: (flags,extra) = self.optfunc(args, self._shortopts, self._longopts) - except getopt.GetoptError, e: + except getopt.GetoptError as e: self.fatal(e) - opt = OptDict() + opt = OptDict(aliases=self._aliases) - for k,v in self._defaults.iteritems(): - k = self._aliases[k] + for k,v in self._defaults.items(): opt[k] = v for (k,v) in flags: k = k.lstrip('-') if k in ('h', '?', 'help', 'usage'): self.usage() - if k.startswith('no-'): - k = self._aliases[k[3:]] - v = 0 - elif (self._aliases.get('#') and + if (self._aliases.get('#') and k in ('0','1','2','3','4','5','6','7','8','9')): v = int(k) # guaranteed to be exactly one digit - k = self._aliases['#'] + k, invert = self._aliases['#'] opt['#'] = v else: - k = self._aliases[k] + k, invert = opt._unalias(k) if not self._hasparms[k]: assert(v == '') v = (opt._opts.get(k) or 0) + 1 else: v = _intify(v) - opt[k] = v - for (f1,f2) in self._aliases.iteritems(): - opt[f1] = opt._opts.get(f2) + opt[k] = _invert(v, invert) return (opt,flags,extra)