@@ -695,16 +695,52 @@ def dump_html(packages, stats, output):
f.write(html_footer)
+def dump_json(packages, stats, output):
+ # Format packages as a dictionnary instead of a list
+ # Exclude local field that does not contains real date
+ excluded_fields = ['url_worker', 'name']
+ pkgs = {
+ pkg.name: {
+ k: v
+ for k, v in pkg.__dict__.items()
+ if k not in excluded_fields
+ } for pkg in packages
+ }
+ # Aggregate infrastructures into a single dict entry
+ statistics = {
+ k: v
+ for k, v in stats.items()
+ if not k.startswith('infra-')
+ }
+ statistics['infra'] = {k[6:]: v for k, v in stats.items() if k.startswith('infra-')}
+ # The actual structure to dump, add commit and date to it
+ o = subprocess.check_output(["git", "log", "master", "-n", "1", "--pretty=format:%H"])
+ final = {'packages': pkgs,
+ 'stats': statistics,
+ 'commit': o.splitlines()[0],
+ 'date': str(datetime.datetime.utcnow())}
+
+ with open(output, 'w') as f:
+ json.dump(final, f, indent=2, separators=(',', ': '))
+ f.write('\n')
+
+
def parse_args():
parser = argparse.ArgumentParser()
- parser.add_argument('-o', dest='output', action='store', required=True,
+ output = parser.add_argument_group('output', 'Output file(s)')
+ output.add_argument('--html', dest='html', action='store',
help='HTML output file')
+ output.add_argument('--json', dest='json', action='store',
+ help='JSON output file')
packages = parser.add_mutually_exclusive_group()
packages.add_argument('-n', dest='npackages', type=int, action='store',
help='Number of packages')
packages.add_argument('-p', dest='packages', action='store',
help='List of packages (comma separated)')
- return parser.parse_args()
+ args = parser.parse_args()
+ if not args.html and not args.json:
+ parser.error('at least one of --html or --json (or both) is required')
+ return args
def __main__():
@@ -732,8 +768,12 @@ def __main__():
check_package_latest_version(packages)
print("Calculate stats")
stats = calculate_stats(packages)
- print("Write HTML")
- dump_html(packages, stats, args.output)
+ if args.html:
+ print("Write HTML")
+ dump_html(packages, stats, args.html)
+ if args.json:
+ print("Write JSON")
+ dump_json(packages, stats, args.json)
__main__()
Pkg-stats is a great script that get a lot of interesting info from buildroot packages. Unfortunately it is currently designed to output a static HTML page only. While this is great to include on the buildroot's website, the HTML is not designed to be easily parsable and thus it is difficult to reuse it in other scripts. This patch provide a new option to output a JSON file in addition to the HTML one. The old 'output' option has been renamed to 'html' to distinguish from the new 'json' option. Signed-off-by: Victor Huesca <victor.huesca@bootlin.com> --- Changes v2 --> v3: - Use better names for the argparse group - Comment the tricky steps in dump_json --- support/scripts/pkg-stats | 48 +++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-)