feat(engine): update path handling to use platform-independent speara…

…tor (#551) * feat(engine): update path handling to use platform-independent separators * fix * bump up
reearth · Oct 4, 2024 · 7aff8cd · 7aff8cd
1 parent 66f1c54
commit 7aff8cd
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 31 deletions.
diff --git a/engine/Cargo.lock b/engine/Cargo.lock
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
@@ -18,7 +18,7 @@ homepage = "https://github.com/reearth/reearth-flow"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/reearth/reearth-flow"
 rust-version = "1.81" # Remember to update clippy.toml as well
-version = "0.0.1"
+version = "0.0.2"
 
 [profile.dev]
 opt-level = 0

diff --git a/engine/plateau-gis-quality-checker/package.json b/engine/plateau-gis-quality-checker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plateau-gis-quality-checker",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "repository": "https://github.com/reearth/reearth-flow.git",
   "license": "APACHE-2.0",
   "type": "module",

diff --git a/engine/plateau-gis-quality-checker/src-tauri/tauri.conf.json b/engine/plateau-gis-quality-checker/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "PLATEAU GIS Quality Checker",
-    "version": "0.0.1"
+    "version": "0.0.2"
   },
   "tauri": {
     "allowlist": {

diff --git a/engine/runtime/action-plateau-processor/src/udx_folder_extractor.rs b/engine/runtime/action-plateau-processor/src/udx_folder_extractor.rs
@@ -1,4 +1,9 @@
-use std::{collections::HashMap, path::PathBuf, str::FromStr, sync::Arc};
+use std::{
+    collections::HashMap,
+    path::{PathBuf, MAIN_SEPARATOR, MAIN_SEPARATOR_STR},
+    str::FromStr,
+    sync::Arc,
+};
 
 use reearth_flow_common::uri::Uri;
 use reearth_flow_runtime::{
@@ -194,7 +199,7 @@ fn mapper(
             .map_err(|e| PlateauProcessorError::UdxFolderExtractor(format!("{:?}", e)))?
     };
     let folders = city_gml_path
-        .split('/')
+        .split(MAIN_SEPARATOR)
         .map(String::from)
         .collect::<Vec<String>>();
     let city_gml_path = Uri::from_str(city_gml_path.to_string().as_str())
@@ -214,16 +219,16 @@ fn mapper(
             root = fourth_last.to_string();
             pkg = second_last.to_string();
             dirs = second_last.to_string();
-            rtdir = PathBuf::from(folders[..folders.len() - 3].join("/"));
+            rtdir = PathBuf::from(folders[..folders.len() - 3].join(MAIN_SEPARATOR_STR));
         }
         [.., fifth_last, _fourth_last, third_last, second_last, _last]
             if PKG_FOLDERS.contains(&third_last.as_str()) =>
         {
             root = fifth_last.to_string();
             pkg = third_last.to_string();
             area = second_last.to_string();
-            dirs = format!("{}/{}", pkg, area);
-            rtdir = PathBuf::from(folders[..folders.len() - 4].join("/"));
+            dirs = format!("{}{}{}", pkg, MAIN_SEPARATOR_STR, area);
+            rtdir = PathBuf::from(folders[..folders.len() - 4].join(MAIN_SEPARATOR_STR));
         }
         [.., sixth_last, _fifth_last, fourth_last, third_last, second_last, _last]
             if PKG_FOLDERS.contains(&fourth_last.as_str()) =>
@@ -232,8 +237,11 @@ fn mapper(
             pkg = fourth_last.to_string();
             admin = third_last.to_string();
             area = second_last.to_string();
-            dirs = format!("{}/{}/{}", pkg, admin, area);
-            rtdir = PathBuf::from(folders[..folders.len() - 5].join("/"));
+            dirs = format!(
+                "{}{}{}{}{}",
+                pkg, MAIN_SEPARATOR_STR, admin, MAIN_SEPARATOR_STR, area
+            );
+            rtdir = PathBuf::from(folders[..folders.len() - 5].join(MAIN_SEPARATOR_STR));
         }
         _ => (),
     };

diff --git a/engine/runtime/action-source/src/file/path_extractor.rs b/engine/runtime/action-source/src/file/path_extractor.rs
@@ -1,4 +1,9 @@
-use std::{collections::HashMap, path::Path, str::FromStr, sync::Arc};
+use std::{
+    collections::HashMap,
+    path::{Path, MAIN_SEPARATOR},
+    str::FromStr,
+    sync::Arc,
+};
 
 use async_zip::base::read::mem::ZipFileReader;
 use futures::AsyncReadExt;
@@ -120,7 +125,7 @@ pub async fn extract(
         {
             continue;
         }
-        let entry_is_dir = filename.ends_with('/');
+        let entry_is_dir = filename.ends_with(MAIN_SEPARATOR);
         if entry_is_dir {
             if storage
                 .exists(outpath.path().as_path())