3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

machine: improve default database handling 

Don't force a symlink to the default database if
the subfolder exits.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-10-22 16:44:51 -04:00
parent 80a7d461ed
commit 1ef34b8b60
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
moonraker/components/machine.py
View File

@ -1440,7 +1440,10 @@ class InstallValidator:
return empty return empty
def _link_data_subfolder( def _link_data_subfolder(
self, folder_name: str, source_dir: Union[str, pathlib.Path] self,
folder_name: str,
source_dir: Union[str, pathlib.Path],
exist_ok: bool = False
) -> None: ) -> None:
if isinstance(source_dir, str): if isinstance(source_dir, str):
source_dir = pathlib.Path(source_dir).expanduser().resolve() source_dir = pathlib.Path(source_dir).expanduser().resolve()
@ -1458,6 +1461,12 @@ class InstallValidator:
) )
if subfolder.is_symlink(): if subfolder.is_symlink():
if not subfolder.samefile(source_dir): if not subfolder.samefile(source_dir):
if exist_ok:
logging.info(
f"Folder {subfolder} already linked, aborting link "
f"to {source_dir}"
)
return
raise ValidationError( raise ValidationError(
f"Failed to link subfolder '{folder_name}' to " f"Failed to link subfolder '{folder_name}' to "
f"'{source_dir}'. '{folder_name}' already exists and is " f"'{source_dir}'. '{folder_name}' already exists and is "
@ -1472,6 +1481,11 @@ class InstallValidator:
subfolder.rmdir() subfolder.rmdir()
subfolder.symlink_to(source_dir) subfolder.symlink_to(source_dir)
return return
if exist_ok:
logging.info(
f"Path at {subfolder} exists, aborting link to {source_dir}"
)
return
raise ValidationError( raise ValidationError(
f"Failed to link subfolder '{folder_name}' to '{source_dir}'. " f"Failed to link subfolder '{folder_name}' to '{source_dir}'. "
f"Folder '{folder_name}' already exists. This conflict requires " f"Folder '{folder_name}' already exists. This conflict requires "
@ -1535,7 +1549,9 @@ class InstallValidator:
db_path = db_cfg.get("database_path", None) db_path = db_cfg.get("database_path", None)
default_db = pathlib.Path("~/.moonraker_database").expanduser() default_db = pathlib.Path("~/.moonraker_database").expanduser()
if db_path is None and default_db.exists(): if db_path is None and default_db.exists():
self._link_data_subfolder("database", default_db) self._link_data_subfolder(
"database", default_db, exist_ok=True
)
elif db_path is not None: elif db_path is not None:
self._link_data_subfolder("database", db_path) self._link_data_subfolder("database", db_path)
cfg_source.remove_option("database", "database_path") cfg_source.remove_option("database", "database_path")