Skip to content

Commit

Permalink
Merge pull request #187 from Scille/windows-single-mountpoint-path
Browse files Browse the repository at this point in the history
Enable mountpoint in directory on Windows
  • Loading branch information
mmmarcos authored Jun 26, 2023
2 parents 4616029 + 9d3dea6 commit f15979e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
20 changes: 14 additions & 6 deletions client/resana_secure/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import logging
import structlog

from parsec.core.cli.run import parsec_quick_access_context
from parsec.core.config import BackendAddr

from .app import serve_app
Expand Down Expand Up @@ -161,10 +162,12 @@ def run_cli(
core_config=_CoreConfig(
config_dir=config_dir,
data_base_dir=data_base_dir,
# Only used on linux (Windows mounts with drive letters)
# Used on Linux always. On Windows, only if mountpoint_in_directory
mountpoint_base_dir=mountpoint_base_dir,
# Use a mock to disable mountpoint instead of relying on this option
mountpoint_enabled=True,
# On Windows, mount in directory instead of drive letters
mountpoint_in_directory=True,
ipc_win32_mutex_name="resana-secure",
preferred_org_creation_backend_addr=BackendAddr.from_url(
"parsec://localhost:6777?no_ssl=true"
Expand Down Expand Up @@ -212,8 +215,13 @@ async def trio_main() -> None:
# Inline import to avoid importing pyqt if gui is disabled
from .gui import run_gui

run_gui(
quart_app_context=quart_app_context,
resana_website_url=namespace.resana_website_url,
config=config,
)
with parsec_quick_access_context(
config.core_config,
appguid="{918CE5EB-F66D-45EB-9A0A-F013B480A5BC}",
appname="Resana Secure",
):
run_gui(
quart_app_context=quart_app_context,
resana_website_url=namespace.resana_website_url,
config=config,
)
2 changes: 1 addition & 1 deletion client/submodules/parsec-cloud
Submodule parsec-cloud updated 176 files

0 comments on commit f15979e

Please sign in to comment.