added support for ~ expansion

python/slsdet/detector.py

@@ -95,6 +95,7 @@ class Detector(CppDetectorApi):
 
     @config.setter
     def config(self, fname):
+        fname = ut.make_string_path(fname)
         self.loadConfig(fname)
 
     @property
@@ -119,6 +120,7 @@ class Detector(CppDetectorApi):
 
     @parameters.setter
     def parameters(self, fname):
+        fname = ut.make_string_path(fname)
         self.loadParameters(fname)
 
     @property
@@ -359,6 +361,7 @@ class Detector(CppDetectorApi):
 
     @fpath.setter
     def fpath(self, path):
+        path = ut.make_string_path(path)
         self.setFilePath(path)
 
     @property
@@ -589,6 +592,7 @@ class Detector(CppDetectorApi):
 
     @trimbits.setter
     def trimbits(self, fname):
+        fname = ut.make_string_path(fname)
         self.loadTrimbits(fname)
 
     @property
@@ -1040,6 +1044,7 @@ class Detector(CppDetectorApi):
 
     @pattern.setter
     def pattern(self, fname):
+        fname = ut.make_string_path(fname)
         self.setPattern(fname)
 
     @property

python/slsdet/utils.py

@@ -8,6 +8,8 @@ from collections import namedtuple
 import _slsdet #C++ lib
 import functools
 import datetime as dt
+import pathlib
+import os
 
 Geometry = namedtuple('Geometry', ['x', 'y'])
 
@@ -77,6 +79,7 @@ def element(func):
         return element_if_equal(func(self, *args, **kwargs))
     return wrapper
 
+
 def eiger_register_to_time(register):
     """
     Decode register value and return time in s. Values are stored in
@@ -93,3 +96,15 @@ def make_timedelta(t):
            return t
     else:
         return dt.timedelta(seconds=t)
+
+def make_string_path(path):
+    """
+    Accepts either a pathlib.Path or a string, expands ~ to user and convert
+    Path to str
+    """
+    if isinstance(path, pathlib.Path):
+        return path.expanduser().as_posix()
+    elif isinstance(path, str):
+        return os.path.expanduser(path)
+    else:
+        raise ValueError("Cannot convert argument to posix path")

python/tests/test_utils.py

@@ -7,6 +7,7 @@ Testing functions from utils.py
 import pytest
 from slsdet.utils import *
 import datetime as dt
+import pathlib
 
 def test_iterable():
     assert is_iterable(5) == False
@@ -93,4 +94,23 @@ def test_make_timedelta_from_timedelta():
     t = dt.timedelta(minutes=1)
     r = make_timedelta(t)
     assert 60 == r.total_seconds()
-    assert r == dt.timedelta(minutes=1)
+    assert r == dt.timedelta(minutes=1)
+
+
+def test_make_string_path_from_Path():
+    pathstr = "/some/temp/path"
+    p = pathlib.Path(pathstr)
+    r = make_string_path(p)
+    assert isinstance(r, str)
+    assert r == p.as_posix()
+    assert r == pathstr
+
+def test_make_string_path_expand_user():
+    pathstr = "~/tmp/virtual.config"
+    home = pathlib.Path.home()
+    expanded_str = pathstr.replace('~', home.as_posix())
+    p = pathlib.Path(pathstr)
+    rp = make_string_path(p)
+    rs = make_string_path(pathstr)
+    assert rp == expanded_str
+    assert rs == expanded_str