|
@@ -678,24 +678,21 @@ def dump_html_stats(f, stats):
|
|
|
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
|
|
|
- o = subprocess.check_output(["git", "log", "master", "-n", "1", "--pretty=format:%H"])
|
|
|
- git_commit = o.splitlines()[0]
|
|
|
- f.write("<p><i>Updated on %s, git commit %s</i></p>\n" %
|
|
|
- (str(datetime.datetime.utcnow()), git_commit))
|
|
|
+ f.write("<p><i>Updated on %s, git commit %s</i></p>\n" % (str(date), commit))
|
|
|
|
|
|
|
|
|
-def dump_html(packages, stats, output):
|
|
|
+def dump_html(packages, stats, date, commit, output):
|
|
|
with open(output, 'w') as f:
|
|
|
f.write(html_header)
|
|
|
dump_html_all_pkgs(f, packages)
|
|
|
dump_html_stats(f, stats)
|
|
|
- dump_gen_info(f)
|
|
|
+ dump_gen_info(f, date, commit)
|
|
|
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
|
|
|
# Exclude local field that does not contains real date
|
|
|
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"])
|
|
|
final = {'packages': pkgs,
|
|
|
'stats': statistics,
|
|
|
- 'commit': o.splitlines()[0],
|
|
|
- 'date': str(datetime.datetime.utcnow())}
|
|
|
+ 'commit': commit,
|
|
|
+ 'date': str(date)}
|
|
|
|
|
|
with open(output, 'w') as f:
|
|
|
json.dump(final, f, indent=2, separators=(',', ': '))
|
|
@@ -749,6 +746,9 @@ def __main__():
|
|
|
package_list = args.packages.split(",")
|
|
|
else:
|
|
|
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 ...")
|
|
|
packages = get_pkglist(args.npackages, package_list)
|
|
|
print("Getting package make info ...")
|
|
@@ -770,10 +770,10 @@ def __main__():
|
|
|
stats = calculate_stats(packages)
|
|
|
if args.html:
|
|
|
print("Write HTML")
|
|
|
- dump_html(packages, stats, args.html)
|
|
|
+ dump_html(packages, stats, date, commit, args.html)
|
|
|
if args.json:
|
|
|
print("Write JSON")
|
|
|
- dump_json(packages, stats, args.json)
|
|
|
+ dump_json(packages, stats, date, commit, args.json)
|
|
|
|
|
|
|
|
|
__main__()
|