Merge pull request pedohorse#93 from pedohorse/bugfix_pluginloader-PY…

…THONPATH_config-sqlite-relpath

Bugfix pluginloader pythonpath config sqlite relpath

src/lifeblood/paths.py

@@ -17,7 +17,7 @@ def config_path(config_name: str, subname: Optional[str] = None) -> Path:
 def config_unexpanded_path(config_name: str, subname: Optional[str] = None) -> Path:
     if config_env_var_name in os.environ:
         return Path(os.environ[config_env_var_name])/subname/config_name
-    base = Path('~')
+    base = Path.home()
     if subname is None:
         subname = 'common'
     if '.' in subname:

src/lifeblood/pluginloader.py

@@ -164,11 +164,11 @@ def _install_package(self, package_path: Path, plugin_category: str):
                                            and (len(x) < 3 or x[2] == sysver.micro)]
             pyvers = sorted(pyvers, key=lambda x: len(x), reverse=True)
             for pyver in pyvers:
-                extra_python = python_base_path / '.'.join(str(x) for x in pyver)
-                sys.path.append(str(extra_python))
+                extra_python_str = str(python_base_path / '.'.join(str(x) for x in pyver))
+                sys.path.append(extra_python_str)
 
                 # TODO: this is questionable, this will affect all child processes, we don't want that, this should only be accessible to that one plugin
-                os.environ['PYTHONPATH'] = os.pathsep.join((str(extra_python), os.environ['PYTHONPATH'])) if 'PYTHONPATH' in os.environ else extra_python
+                os.environ['PYTHONPATH'] = os.pathsep.join((extra_python_str, os.environ['PYTHONPATH'])) if 'PYTHONPATH' in os.environ else extra_python_str
 
         # install nodes
         nodes_path = package_path / 'nodes'

src/lifeblood/scheduler_config_provider_file.py

@@ -77,7 +77,9 @@ def __init__(
         self.__node_plugin_paths: Tuple[Path, ...] = tuple(node_plugin_paths)
 
     def main_database_location(self) -> str:
-        return self.__config.get_option_noasync('core.database.path', str(paths.default_main_database_location()))
+        return os.path.expanduser(
+            self.__config.get_option_noasync('core.database.path', str(paths.default_main_database_location()))
+        )
 
     def node_configuration(self, node_type_id: str) -> Mapping:
         if node_type_id not in self.__node_config_cache:
@@ -240,7 +242,7 @@ def __init__(
         self.__ui_address = ui_address
 
     def main_database_location(self) -> str:
-        return self.__main_db_location_override or super().main_database_location()
+        return os.path.expanduser(self.__main_db_location_override) if self.__main_db_location_override is not None else super().main_database_location()
 
     def main_database_connection_timeout(self) -> float:
         return self.__main_db_connection_timeout or super().main_database_connection_timeout()