use pathlib instead of os

for some reason we need to cast these to str to make it work on some systems
EIT-ALIVE · Feb 29, 2024 · e51f1a7 · e51f1a7
1 parent af86ade
commit e51f1a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/eit_dash/callbacks/load_callbacks.py b/eit_dash/callbacks/load_callbacks.py
@@ -214,7 +214,7 @@ def get_parent_directory(stored_cwd, n_clicks, currentdir):
     triggered_id = ctx.triggered_id
     if triggered_id == ids.STORED_CWD:
         return stored_cwd
-    return Path(currentdir).parent.as_posix()
+    return str(Path(currentdir).parent)
 
 
 @callback(Output(ids.CWD_FILES, "children"), Input(ids.CWD, "children"))
@@ -227,16 +227,15 @@ def list_cwd_files(cwd):
         files = sorted(os.listdir(path), key=str.lower)
         for i, file in enumerate(files):
             filepath = Path(file)
-
-            full_path = os.path.join(cwd, filepath.as_posix())
+            full_path = Path(cwd) / filepath
 
             is_dir = Path(full_path).is_dir()
             link = html.A(
                 [
                     html.Span(
                         file,
                         id={"type": "listed_file", "index": i},
-                        title=full_path,
+                        title=str(full_path),
                         style={"fontWeight": "bold"} if is_dir else {},
                     ),
                 ],

diff --git a/eit_dash/pages/load.py b/eit_dash/pages/load.py
@@ -1,4 +1,4 @@
-import os
+from pathlib import Path
 
 import dash_bootstrap_components as dbc
 from dash import dcc, html, register_page
@@ -96,9 +96,11 @@
     [
         dbc.Row(
             [
-                dcc.Store(id=ids.STORED_CWD, data=os.getcwd()),
-                html.H5(html.B(html.A("⬆️ Parent directory", href="#", id=ids.PARENT_DIR))),
-                html.H3([html.Code(os.getcwd(), id=ids.CWD)]),
+                dcc.Store(id=ids.STORED_CWD, data=str(Path.cwd())),
+                html.H5(
+                    html.B(html.A("⬆️ Parent directory", href="#", id=ids.PARENT_DIR)),
+                ),
+                html.H3([html.Code(str(Path.cwd()), id=ids.CWD)]),
                 html.Br(),
                 html.Br(),
                 html.Div(id=ids.CWD_FILES, style=styles.FILE_BROWSER),