djsundog/NopSCADlib
1
0
Fork 0
mirror of https://github.com/DJSundog/NopSCADlib.git synced 2024-11-27 01:03:51 -05:00
Code Issues Projects Releases Wiki Activity

Times for parts that no longer exist pruned from build times.

Browse Source 
Now shows changes to the total time.
This commit is contained in:
Chris Palmer 2021-02-06 10:39:39 +00:00
parent 4cb324ed37
commit cb30f0c63d
3 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/exports.py
View File

@ -72,10 +72,11 @@ def make_parts(target, part_type, parts = None):
# #
# Decide which files to make # Decide which files to make
# #
all_parts = bom_to_parts(bom_dir, part_type)
if parts: if parts:
targets = list(parts) #copy the list so we dont modify the list passed in targets = list(parts) #copy the list so we dont modify the list passed in
else: else:
targets = bom_to_parts(bom_dir, part_type) targets = list(all_parts)
for file in os.listdir(target_dir): for file in os.listdir(target_dir):
if file.endswith('.' + part_type): if file.endswith('.' + part_type):
if not file in targets: if not file in targets:
@ -150,4 +151,4 @@ def make_parts(target, part_type, parts = None):
for part in targets: for part in targets:
print("Could not find a module called", part[:-4] + module_suffix, "to make", part) print("Could not find a module called", part[:-4] + module_suffix, "to make", part)
usage(part_type) usage(part_type)
times.print_times() times.print_times(all_parts)

41
scripts/times.py
View File

@ -52,23 +52,34 @@ def add_time(name, start):
del times[name.lower()] del times[name.lower()]
times[name] = round(time.time() - start, 3) times[name] = round(time.time() - start, 3)
def print_times(): def print_times(files = None):
write_times()
sorted_times = sorted(times.items(), key=lambda kv: kv[1]) sorted_times = sorted(times.items(), key=lambda kv: kv[1])
total = 0 total = 0
old_total = 0
for entry in sorted_times: for entry in sorted_times:
colour = Fore.WHITE
key = entry[0] key = entry[0]
new = entry[1] if files and not key in files:
delta = 0 del times[key]
if key in last_times: else:
old = last_times[key] new = entry[1]
delta = new - old delta = 0
if delta > 0.3: colour = Fore.WHITE
colour = Fore.RED if key in last_times:
if delta < -0.3: old = last_times[key]
colour = Fore.GREEN old_total += old
print(colour + "%5.1f %5.1f %s" % (new, delta, key)) delta = new - old
total += new if delta > 0.3:
colour = Fore.RED
if delta < -0.3:
colour = Fore.GREEN
print(colour + "%6.1f %5.1f %s" % (new, delta, key))
total += new
write_times()
if sorted_times: if sorted_times:
print(Fore.WHITE + "%5.1f" % total) colour = Fore.WHITE
delta = total - old_total
if delta > 1:
colour = Fore.RED
if delta < -1:
colour = Fore.GREEN
print(colour + "%6.1f %5.1f TOTAL%s" % (total, delta, Fore.WHITE))

31
scripts/views.py
View File

@ -159,6 +159,7 @@ def views(target, do_assemblies = None):
# Find all the scad files # Find all the scad files
# #
main_blurb = None main_blurb = None
pngs = []
for dir in source_dirs(bom_dir): for dir in source_dirs(bom_dir):
if os.path.isdir(dir): if os.path.isdir(dir):
for filename in os.listdir(dir): for filename in os.listdir(dir):
@ -185,15 +186,21 @@ def views(target, do_assemblies = None):
if not "blurb" in ass: if not "blurb" in ass:
ass["blurb"] = blurb.scrape_module_blurb(lines[:line_no]) ass["blurb"] = blurb.scrape_module_blurb(lines[:line_no])
break break
if not do_assemblies or real_name in do_assemblies:
#
# Run openscad on the created file
#
dname = deps_name(deps_dir, filename)
for explode in [0, 1]:
# #
# Run openscad on the created file # Generate png name
# #
dname = deps_name(deps_dir, filename) png_name = target_dir + '/' + real_name + '.png'
for explode in [0, 1]: if not explode:
png_name = target_dir + '/' + real_name + '.png' png_name = png_name.replace('_assembly', '_assembled')
if not explode: pngs.append(png_name)
png_name = png_name.replace('_assembly', '_assembled')
if not do_assemblies or real_name in do_assemblies:
changed = check_deps(png_name, dname) changed = check_deps(png_name, dname)
changed = times.check_have_time(changed, png_name) changed = times.check_have_time(changed, png_name)
changed = options.have_changed(changed, png_name) changed = options.have_changed(changed, png_name)
@ -403,16 +410,16 @@ def views(target, do_assemblies = None):
# #
# Convert to HTML # Convert to HTML
# #
html_name = 'readme.html' html_name = top_dir + 'readme.html'
t = time.time() t = time.time()
with open(top_dir + html_name, "wt") as html_file: with open(html_name, "wt") as html_file:
do_cmd(("python -m markdown -x tables -x sane_lists " + doc_name).split(), html_file) do_cmd(("python -m markdown -x tables -x sane_lists " + doc_name).split(), html_file)
times.add_time(top_dir + html_name, t) times.add_time(html_name, t)
times.print_times() times.print_times(pngs + [html_name])
# #
# Make the printme.html by replacing empty spans that invisbly mark the page breaks by page break divs. # Make the printme.html by replacing empty spans that invisbly mark the page breaks by page break divs.
# #
with open(top_dir + 'readme.html', 'rt') as src: with open(html_name, 'rt') as src:
lines = src.readlines() lines = src.readlines()
i = 0 i = 0