Fix LTN build on web, skipping home directory

a-b-street · May 9, 2023 · b386521 · b386521
1 parent 7e327eb
commit b386521
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/apps/ltn/Cargo.toml b/apps/ltn/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 crate-type = ["cdylib", "lib"]
 
 [features]
-default = ["map_gui/native", "widgetry/native-backend"]
+default = ["home", "map_gui/native", "widgetry/native-backend"]
 wasm = ["getrandom/js", "map_gui/wasm", "wasm-bindgen", "widgetry/wasm-backend"]
 
 [dependencies]
@@ -24,7 +24,7 @@ geo = { workspace = true }
 geojson = { workspace = true }
 geom = { path = "../../geom" }
 getrandom = { workspace = true, optional = true }
-home = "0.5.5"
+home = { version = "0.5.5", optional = true }
 lazy_static = "1.4.0"
 log = { workspace = true }
 maplit = "1.0.2"

diff --git a/apps/ltn/src/save/mod.rs b/apps/ltn/src/save/mod.rs
@@ -198,3 +198,13 @@ impl PreserveState {
         }
     }
 }
+
+#[cfg(not(target_arch = "wasm32"))]
+fn start_dir() -> Option<String> {
+    home::home_dir().map(|x| x.display().to_string())
+}
+
+#[cfg(target_arch = "wasm32")]
+fn start_dir() -> Option<String> {
+    None
+}
diff --git a/apps/ltn/src/save/proposals_ui.rs b/apps/ltn/src/save/proposals_ui.rs
@@ -114,7 +114,7 @@ impl Proposals {
                     Ok(contents) => FileSaver::with_default_messages(
                         ctx,
                         format!("ltn_{}.geojson", app.per_map.map.get_name().map),
-                        home::home_dir().map(|x| x.display().to_string()),
+                        super::start_dir(),
                         FileSaverContents::String(contents),
                     ),
                     Err(err) => PopupMsg::new_state(ctx, "Export failed", vec![err.to_string()]),
@@ -185,7 +185,7 @@ fn load_picker_ui(
             if name == "Load from file on your computer" {
                 Transition::Replace(FilePicker::new_state(
                     ctx,
-                    home::home_dir().map(|x| x.display().to_string()),
+                    super::start_dir(),
                     Box::new(move |ctx, app, maybe_file| {
                         match maybe_file {
                             Ok(Some((path, bytes))) => {

diff --git a/apps/ltn/src/save/save_dialog.rs b/apps/ltn/src/save/save_dialog.rs
@@ -146,7 +146,7 @@ impl State<App> for SaveDialog {
                         Ok(contents) => FileSaver::with_default_messages(
                             ctx,
                             format!("{}.json.gz", proposal.edits.edits_name),
-                            home::home_dir().map(|x| x.display().to_string()),
+                            super::start_dir(),
                             FileSaverContents::Bytes(contents),
                         ),
                         Err(err) => PopupMsg::new_state(ctx, "Save failed", vec![err.to_string()]),