templates
/
KiBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[KiRi][Fixed] Sub-dirs removal in the first run

This commit is contained in:
Salvador E. Tropea 2023-12-06 13:51:01 -03:00
parent eaccce2f1d
commit f0c62c6f20
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kibot/out_kiri.py
View File

@ -161,7 +161,7 @@ class KiRiOptions(VariantOptions):
sch = load_any_sch(name_sch, GS.sch_basename)
with open(os.path.join(self.cache_dir, hash[:7], '_KIRI_', 'sch_sheets'), 'wt') as f:
base_dir = os.path.dirname(name_sch)
for s in sch.all_sheets:
for s in sorted(sch.all_sheets, key=lambda x: x.sheet_path_h):
fname = s.fname
no_ext = os.path.splitext(os.path.basename(fname))[0]
rel_name = os.path.relpath(fname, base_dir)
@ -297,7 +297,8 @@ class KiRiOptions(VariantOptions):
if self.keep_generated and already_generated:
logger.debug(f'- Images for {hash} already generated')
continue
rmtree(dst_dir)
if already_generated:
rmtree(dst_dir)
git_tmp_wd = mkdtemp()
logger.debug('Checking out '+hash+' to '+git_tmp_wd)
self.run_git(['worktree', 'add', git_tmp_wd, hash])
@ -325,7 +326,8 @@ class KiRiOptions(VariantOptions):
if self.keep_generated and already_generated:
logger.debug(f'- Images for {HASH_LOCAL} already generated')
else:
rmtree(dst_dir)
if already_generated:
rmtree(dst_dir)
name_sch = self.do_cache(GS.sch_file, GS.sch_dir, HASH_LOCAL)
self.save_sch_sheet(HASH_LOCAL, name_sch)
self.do_cache(GS.pcb_file, GS.pcb_dir, HASH_LOCAL)