debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 10:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch-git: add --git-dir, --tag-prefix arguments

Browse source 
It is often more convenient to use command line arguments than
environment variables.
This commit is contained in:
David Bremner 2022-03-20 13:13:06 -03:00
parent b7c31f6581
commit b7b111b9b5
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
notmuch-git.py
View file

@ -50,13 +50,9 @@ _LOG = _logging.getLogger('nmbug')
_LOG.setLevel(_logging.WARNING) _LOG.setLevel(_logging.WARNING)
_LOG.addHandler(_logging.StreamHandler()) _LOG.addHandler(_logging.StreamHandler())
NMBGIT = _os.path.expanduser( NMBGIT = None
_os.getenv('NMBGIT', _os.path.join('~', '.nmbug'))) TAG_PREFIX = None
_NMBGIT = _os.path.join(NMBGIT, '.git')
if _os.path.isdir(_NMBGIT):
NMBGIT = _NMBGIT
TAG_PREFIX = _os.getenv('NMBPREFIX', 'notmuch::')
_HEX_ESCAPE_REGEX = _re.compile('%[0-9A-F]{2}') _HEX_ESCAPE_REGEX = _re.compile('%[0-9A-F]{2}')
_TAG_DIRECTORY = 'tags/' _TAG_DIRECTORY = 'tags/'
_TAG_FILE_REGEX = _re.compile(_TAG_DIRECTORY + '(?P<id>[^/]*)/(?P<tag>[^/]*)') _TAG_FILE_REGEX = _re.compile(_TAG_DIRECTORY + '(?P<id>[^/]*)/(?P<tag>[^/]*)')
@ -77,10 +73,6 @@ def _hex_quote(string, safe='+@=:,'):
lambda match: match.group(0).lower(), lambda match: match.group(0).lower(),
uppercase_escapes) uppercase_escapes)
_ENCODED_TAG_PREFIX = _hex_quote(TAG_PREFIX, safe='+@=,') # quote ':'
def _xapian_quote(string): def _xapian_quote(string):
""" """
Quote a string for Xapian's QueryParser. Quote a string for Xapian's QueryParser.
@ -686,6 +678,13 @@ if __name__ == '__main__':
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description=__doc__.strip(), description=__doc__.strip(),
formatter_class=argparse.RawDescriptionHelpFormatter) formatter_class=argparse.RawDescriptionHelpFormatter)
parser.add_argument(
'-C', '--git-dir', metavar='REPO',
help='Git repository to operate on.')
parser.add_argument(
'-p', '--tag-prefix', metavar='PREFIX',
default = _os.getenv('NMBPREFIX', 'notmuch::'),
help='Prefix of tags to operate on.')
parser.add_argument( parser.add_argument(
'-l', '--log-level', '-l', '--log-level',
choices=['critical', 'error', 'warning', 'info', 'debug'], choices=['critical', 'error', 'warning', 'info', 'debug'],
@ -795,6 +794,18 @@ if __name__ == '__main__':
args = parser.parse_args() args = parser.parse_args()
if args.git_dir:
NMBGIT = args.git_dir
else:
NMBGIT = _os.path.expanduser(
_os.getenv('NMBGIT', _os.path.join('~', '.nmbug')))
_NMBGIT = _os.path.join(NMBGIT, '.git')
if _os.path.isdir(_NMBGIT):
NMBGIT = _NMBGIT
TAG_PREFIX = args.tag_prefix
_ENCODED_TAG_PREFIX = _hex_quote(TAG_PREFIX, safe='+@=,') # quote ':'
if args.log_level: if args.log_level:
level = getattr(_logging, args.log_level.upper()) level = getattr(_logging, args.log_level.upper())
_LOG.setLevel(level) _LOG.setLevel(level)