[* SCH Print][Fixed] Names of the multi file SCH

- Also adjusted the tests

Author: set-soft

kibot/out_any_sch_print.py

@@ -147,12 +147,12 @@ def get_targets(self, out_dir):
         if self._pages:
             valid = {int(i) for i in self._pages.split(',')}
             valid.discard(1)
-            extra_used = [get_base(s.fname) for s in GS.sch.all_sheets if int0(s.sheet) in valid]
+            extra_used = [s.sheet_path_h.replace('/', '-') for s in GS.sch.all_sheets if int0(s.sheet) in valid]
         else:
-            extra_used = [get_base(s.fname) for s in GS.sch.all_sheets if int0(s.sheet) != 1]
+            extra_used = [s.sheet_path_h.replace('/', '-') for s in GS.sch.all_sheets if int0(s.sheet) != 1]
 
         for f in extra_used:
-            used.append(os.path.join(out_dir, GS.sch_basename+'-'+f+'.'+self._expand_ext))
+            used.append(os.path.join(out_dir, GS.sch_basename+f+'.'+self._expand_ext))
 
         return used
 

tests/test_plot/test_misc.py

@@ -33,6 +33,7 @@
 import shutil
 import logging
 import pytest
+import shlex
 import subprocess
 import json
 from . import context
@@ -722,14 +723,14 @@ def check_makefile(ctx, mkfile, prj, dbg, txt):
     assert yaml in deps
     logging.debug('- Target `drill` OK')
     # svg_sch_def
-    deps = targets['svg_sch_def'].split(' ')
-    assert len(deps) == 1, deps
+    deps = shlex.split(targets['svg_sch_def'])
+    assert len(deps) == 5, deps
     assert ctx.get_out_path(prj+'.svg') in deps
     check_test_v5_sch_deps(ctx, targets[targets['svg_sch_def']].split(' '))
     logging.debug('- Target `svg_sch_def` OK')
     # svg_sch_int
-    deps = targets['svg_sch_int'].split(' ')
-    assert len(deps) == 1, deps
+    deps = shlex.split(targets['svg_sch_int'])
+    assert len(deps) == 5, deps
     assert ctx.get_out_path(prj+'-schematic.svg') in deps
     check_test_v5_sch_deps(ctx, targets[targets['svg_sch_int']].split(' '))
     logging.debug('- Target `svg_sch_int` OK')