RepoMirrors/nvchecker
1
0
Fork 0
mirror of https://github.com/lilydjwg/nvchecker synced 2025-01-20 21:30:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208 from trathborne/Add-JSON-output-to-cmp

Browse Source 
Split comparison process from output and provide JSON output
This commit is contained in:
依云 2022-02-10 16:59:53 +08:00 committed by GitHub
commit b61fbe5a37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
nvchecker/tools.py
View File

@ -5,6 +5,7 @@
import sys
import argparse
import structlog
import json
from . import core
@ -69,10 +70,13 @@ def take() -> None:
def cmp() -> None:
parser = argparse.ArgumentParser(description='compare version records of nvchecker')
core.add_common_arguments(parser)
parser.add_argument('-j', '--json', action='store_true',
help='Output JSON array of dictionaries with {name, newver, oldver, [delta]} '
'(or array of names if --quiet)')
parser.add_argument('-q', '--quiet', action='store_true',
help="Quiet mode, output only the names.")
parser.add_argument('-s', '--sort',
choices=('parse_version', 'vercmp'), default='parse_version',
choices=('parse_version', 'vercmp', 'none'), default='parse_version',
help='Version compare method to backwards the arrow '
'(default: parse_version)')
parser.add_argument('-n', '--newer', action='store_true',
@ -94,22 +98,47 @@ def cmp() -> None:
oldvers = core.read_verfile(oldverf)
newvers = core.read_verfile(newverf)
for name, newver in sorted(newvers.items()):
oldver = oldvers.get(name, None)
if oldver != newver:
if args.quiet:
print(name)
else:
from .lib.nicelogger import Colors, support_color
c = Colors(support_color(sys.stdout))
arrow = "->"
if args.sort != "none" and oldver is not None and newver is not None:
differences = []
for name, newver in sorted(newvers.items()): # accumulate differences
oldver = oldvers.get(name, None)
if oldver != newver:
diff = {
'name': name,
'oldver': oldver,
'newver': newver
}
if oldver is not None and newver is not None:
if args.sort == "none":
diff['delta'] = 'new' # assume it's a new version if we're not comparing
else:
from .sortversion import sort_version_keys
version = sort_version_keys[args.sort]
if version(oldver) > version(newver): # type: ignore
arrow = f'{c.red}<-{c.normal}'
if args.newer:
continue
print(f'{name} {c.red}{oldver}{c.normal} {arrow} {c.green}{newver}{c.normal}')
if version(oldver) > version(newver): # type: ignore
diff['delta'] = 'old'
if args.newer:
continue # don't store this diff
else:
diff['delta'] = 'new'
differences.append(diff)
if args.json:
if args.quiet:
print(json.dumps([diff['name'] for diff in differences], separators=(',', ':')))
else:
print(json.dumps(differences, sort_keys=True, separators=(',', ':')))
elif args.quiet:
[print(diff['name']) for diff in differences]
else:
from .lib.nicelogger import Colors, support_color
c = Colors(support_color(sys.stdout))
arrow = f'{c.red}<-{c.normal}' if diff.get('delta') == 'old' else '->'
[print(f'{diff["name"]} {c.red}{diff["oldver"]}{c.normal} {arrow} {c.green}{diff["newver"]}{c.normal}') for diff in differences]