Resolves #176 & #194. Use the first-found, not last-found include dir, and look in default app-install OpenSCAD libraries directories as well as per-user libraries dirs

Author: etjones

solid/objects.py

@@ -830,14 +830,24 @@ def _openscad_library_paths() -> List[Path]:
             paths.append(Path(s))
 
     default_paths = {
-        'Linux':   Path.home() / '.local/share/OpenSCAD/libraries',
-        'Darwin':  Path.home() / 'Documents/OpenSCAD/libraries',
-        'Windows': Path('My Documents\OpenSCAD\libraries')
+        'Linux':   [
+            Path.home() / '.local/share/OpenSCAD/libraries',
+            Path('/usr/share/openscad/libraries')
+        ],
+        'Darwin':  [
+            Path.home() / 'Documents/OpenSCAD/libraries',
+            Path('/Applications/OpenSCAD.app/Contents/Resources/libraries')
+        ],
+        'Windows': [
+            Path('My Documents\OpenSCAD\libraries'),
+            Path('c:\Program Files\OpenSCAD\libraries')
+        ],
     }
 
-    paths.append(default_paths[platform.system()])
+    paths += default_paths.get(platform.system(), [])
     return paths
 
+
 def _find_library(library_name: PathStr) -> Path:
     result = Path(library_name)
 
@@ -848,14 +858,17 @@ def _find_library(library_name: PathStr) -> Path:
             # print(f'Checking {f} -> {f.exists()}')
             if f.exists():
                 result = f
+                break
 
     return result
- 
+
 # use() & include() mimic OpenSCAD's use/include mechanics.
 # -- use() makes methods in scad_file_path.scad available to be called.
 # --include() makes those methods available AND executes all code in
 #   scad_file_path.scad, which may have side effects.
 #   Unless you have a specific need, call use().
+
+
 def use(scad_file_path: PathStr, use_not_include: bool = True, dest_namespace_dict: Dict = None):
     """
     Opens scad_file_path, parses it for all usable calls,

solid/test/test_solidpython.py

@@ -233,14 +233,38 @@ def test_import_scad(self):
         self.assertTrue(hasattr(examples, 'scad_to_include'))
         self.assertTrue(hasattr(examples.scad_to_include, 'steps'))
 
-        # TODO: we should test that:
+        # Test that:
         # A) scad files in the designated OpenSCAD library directories
         #       (path-dependent, see: solid.objects._openscad_library_paths())
-        #       are imported correctly. Not sure how to do this without writing
-        #       temp files to those directories. Seems like overkill for the moment
+        #       are imported correctly.
+        # B) scad files in the designated app-install library directories
+        from solid import objects
+        lib_dirs = objects._openscad_library_paths()
+        for i, ld in enumerate(lib_dirs):
+            if ld.as_posix() == '.':
+                continue
+            if not ld.exists():
+                continue
+            temp_dirname = f'test_{i}'
+            d = ld / temp_dirname
+            d.mkdir(exist_ok=True)
+            p = d / 'scad_to_include.scad'
+            p.write_text(include_file.read_text())
+            temp_file_str = f'{temp_dirname}/scad_to_include.scad'
+
+            mod = import_scad(temp_file_str)
+            a = mod.steps(3)
+            actual = scad_render(a)
+            expected = f"use <{p.absolute()}>\n\n\nsteps(howmany = 3);"
+            self.assertEqual(actual, expected,
+                             f'Unexpected file contents at {p} for dir: {ld}')
+
+            # remove generated file and directories
+            p.unlink()
+            d.rmdir()
 
     def test_multiple_import_scad(self):
-        # For Issue #172. Originally, multiple `import_scad()` calls would 
+        # For Issue #172. Originally, multiple `import_scad()` calls would
         # re-import the entire module, rather than cache a module after one use
         include_file = self.expand_scad_path("examples/scad_to_include.scad")
         mod1 = import_scad(include_file)