NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support/scripts/pkg-stats: factorize date and commit

Browse Source 
The 'dump_html' and 'dump_json' both include commit infos as well as the
current date. It make more sense to retrieve these information once.
This patch simply does this factorization.

Signed-off-by: Victor Huesca <victor.huesca@bootlin.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Victor Huesca 2019-07-19 15:06:30 +02:00 committed by Thomas Petazzoni
parent 500e1d6241
commit 3c9d408207
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
support/scripts/pkg-stats
View File

@ -678,24 +678,21 @@ def dump_html_stats(f, stats):
f.write("</table>\n") f.write("</table>\n")
def dump_gen_info(f): def dump_gen_info(f, date, commit):
# Updated on Mon Feb 19 08:12:08 CET 2018, Git commit aa77030b8f5e41f1c53eb1c1ad664b8c814ba032 # Updated on Mon Feb 19 08:12:08 CET 2018, Git commit aa77030b8f5e41f1c53eb1c1ad664b8c814ba032
o = subprocess.check_output(["git", "log", "master", "-n", "1", "--pretty=format:%H"]) f.write("<p><i>Updated on %s, git commit %s</i></p>\n" % (str(date), commit))
git_commit = o.splitlines()[0]
f.write("<p><i>Updated on %s, git commit %s</i></p>\n" %
(str(datetime.datetime.utcnow()), git_commit))
def dump_html(packages, stats, output): def dump_html(packages, stats, date, commit, output):
with open(output, 'w') as f: with open(output, 'w') as f:
f.write(html_header) f.write(html_header)
dump_html_all_pkgs(f, packages) dump_html_all_pkgs(f, packages)
dump_html_stats(f, stats) dump_html_stats(f, stats)
dump_gen_info(f) dump_gen_info(f, date, commit)
f.write(html_footer) f.write(html_footer)
def dump_json(packages, stats, output): def dump_json(packages, stats, date, commit, output):
# Format packages as a dictionnary instead of a list # Format packages as a dictionnary instead of a list
# Exclude local field that does not contains real date # Exclude local field that does not contains real date
excluded_fields = ['url_worker', 'name'] excluded_fields = ['url_worker', 'name']
@ -717,8 +714,8 @@ def dump_json(packages, stats, output):
o = subprocess.check_output(["git", "log", "master", "-n", "1", "--pretty=format:%H"]) o = subprocess.check_output(["git", "log", "master", "-n", "1", "--pretty=format:%H"])
final = {'packages': pkgs, final = {'packages': pkgs,
'stats': statistics, 'stats': statistics,
'commit': o.splitlines()[0], 'commit': commit,
'date': str(datetime.datetime.utcnow())} 'date': str(date)}
with open(output, 'w') as f: with open(output, 'w') as f:
json.dump(final, f, indent=2, separators=(',', ': ')) json.dump(final, f, indent=2, separators=(',', ': '))
@ -749,6 +746,9 @@ def __main__():
package_list = args.packages.split(",") package_list = args.packages.split(",")
else: else:
package_list = None package_list = None
date = datetime.datetime.utcnow()
commit = subprocess.check_output(['git', 'log', 'master', '-n', '1',
'--pretty=format:%H']).splitlines()[0]
print("Build package list ...") print("Build package list ...")
packages = get_pkglist(args.npackages, package_list) packages = get_pkglist(args.npackages, package_list)
print("Getting package make info ...") print("Getting package make info ...")
@ -770,10 +770,10 @@ def __main__():
stats = calculate_stats(packages) stats = calculate_stats(packages)
if args.html: if args.html:
print("Write HTML") print("Write HTML")
dump_html(packages, stats, args.html) dump_html(packages, stats, date, commit, args.html)
if args.json: if args.json:
print("Write JSON") print("Write JSON")
dump_json(packages, stats, args.json) dump_json(packages, stats, date, commit, args.json)
__main__() __main__()