Skip to content

Commit 8b1374a

Browse files
committed
Moved 'posix_path()' to 'murfey.util.__init__'
1 parent 71eba84 commit 8b1374a

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

src/murfey/client/multigrid_control.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@
1212
import requests
1313

1414
import murfey.client.websocket
15-
from murfey.client import posix_path
1615
from murfey.client.analyser import Analyser
1716
from murfey.client.contexts.spa import SPAContext, SPAModularContext
1817
from murfey.client.contexts.tomo import TomographyContext
1918
from murfey.client.instance_environment import MurfeyInstanceEnvironment
2019
from murfey.client.rsync import RSyncer, RSyncerUpdate, TransferResult
2120
from murfey.client.tui.screens import determine_default_destination
2221
from murfey.client.watchdir import DirWatcher
23-
from murfey.util import capture_post
22+
from murfey.util import capture_post, posix_path
2423

2524
log = logging.getLogger("murfey.client.mutligrid_control")
2625

src/murfey/client/tui/app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from textual.reactive import reactive
1515
from textual.widgets import Button, Input
1616

17-
from murfey.client import posix_path
1817
from murfey.client.analyser import Analyser
1918
from murfey.client.contexts.spa import SPAContext, SPAModularContext
2019
from murfey.client.contexts.tomo import TomographyContext
@@ -36,6 +35,7 @@
3635
from murfey.util import (
3736
capture_post,
3837
get_machine_config,
38+
posix_path,
3939
read_config,
4040
set_default_acquisition_output,
4141
)

src/murfey/client/tui/screens.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
)
4747
from werkzeug.utils import secure_filename
4848

49-
from murfey.client import posix_path
5049
from murfey.client.analyser import Analyser, spa_form_dependencies
5150
from murfey.client.contexts.spa import SPAContext, SPAModularContext
5251
from murfey.client.contexts.tomo import TomographyContext
@@ -57,7 +56,7 @@
5756
)
5857
from murfey.client.rsync import RSyncer
5958
from murfey.client.tui.forms import FormDependency
60-
from murfey.util import capture_post, get_machine_config, read_config
59+
from murfey.util import capture_post, get_machine_config, posix_path, read_config
6160
from murfey.util.models import PreprocessingParametersTomo, ProcessingParametersSPA
6261

6362
log = logging.getLogger("murfey.tui.screens")

src/murfey/util/__init__.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,20 @@
2424
logger = logging.getLogger("murfey.util")
2525

2626

27+
def posix_path(path: Path) -> str:
28+
"""
29+
Converts a Windows-style path into a Posix one. Used primarily when running
30+
subproceses in bash terminals, which can only accept Posix paths.
31+
"""
32+
path_parts = list(path.parts)
33+
# Check if it's a Windows-style path
34+
if path_parts[0].endswith((":/", ":\\")):
35+
path_parts[0] = "/" + path_parts[0].strip(":/\\").lower()
36+
posix_path = "/".join(path_parts)
37+
return posix_path
38+
return str(path)
39+
40+
2741
def read_config() -> configparser.ConfigParser:
2842
config = configparser.ConfigParser()
2943
try:

0 commit comments

Comments
 (0)