Skip to content

Commit

Permalink
Mount personal mountpoint as drive letter (#266)
Browse files Browse the repository at this point in the history
* set personal_mountpoint_base_dir to None

* delete personal_mountpoint_base_dir into get_default_dirs
  • Loading branch information
Landeers authored Sep 12, 2023
1 parent 33adbe1 commit dfef2eb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions client/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions client/resana_secure/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@ def _structlog_renderer(_arg1: Any, _arg2: str, event_dict: MutableMapping[str,
logging.basicConfig(format=format, datefmt=datefmt, stream=sys.stdout, level=level)


def get_default_dirs() -> Tuple[Path, Path, Path, Path]:
def get_default_dirs() -> Tuple[Path, Path, Path]:
mountpoint_base_dir = Path.home() / "Resana Secure"
personal_mountpoint_base_dir = Path.home()

if os.name == "nt":
appdata = Path(os.environ["APPDATA"])
Expand All @@ -90,7 +89,7 @@ def get_default_dirs() -> Tuple[Path, Path, Path, Path]:
path = os.environ.get("XDG_CONFIG_HOME") or f"{home}/.config"
config_dir = Path(path) / "resana_secure"

return mountpoint_base_dir, personal_mountpoint_base_dir, data_base_dir, config_dir
return mountpoint_base_dir, data_base_dir, config_dir


def _parse_host(s: str) -> Tuple[str, int | None]:
Expand Down Expand Up @@ -157,7 +156,6 @@ def run_cli(

(
mountpoint_base_dir,
personal_mountpoint_base_dir,
default_data_base_dir,
default_config_dir,
) = get_default_dirs()
Expand All @@ -174,7 +172,8 @@ def run_cli(
mountpoint_enabled=True,
# On Windows, mount in directory instead of drive letters
mountpoint_in_directory=True,
personal_workspace_base_dir=personal_mountpoint_base_dir,
# Set to None to mount personal workspace in a drive letter (not in directory)
personal_workspace_base_dir=None,
personal_workspace_name_pattern="Mon_Drive_Sec",
ipc_win32_mutex_name="resana-secure",
preferred_org_creation_backend_addr=BackendAddr.from_url(
Expand Down

0 comments on commit dfef2eb

Please sign in to comment.