0.5.6

.github/workflows/pr-e2e.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   e2e:
     name: Build Debug App + WDIO E2E
-    runs-on: macos-latest
+    runs-on: macos-26
     timeout-minutes: 45
 
     permissions:
@@ -72,6 +72,9 @@ jobs:
           path: |
             ~/Library/Logs/com.kcjer.dtm
             ~/Library/Application Support/com.kcjer.dtm
+
+            !**/*.7z
+            !**/bin/**
           if-no-files-found: ignore
 
       - name: Save Rust cache

package.json

@@ -2,7 +2,7 @@
   "name": "dtm",
   "author": "kcjerrell",
   "private": true,
-  "version": "0.5.5",
+  "version": "0.5.6",
   "type": "module",
   "scripts": {
     "dev": "TAURI_WEBDRIVER_PORT=4445 tauri dev --features webdriver",
@@ -38,7 +38,7 @@
     "@tauri-apps/plugin-updater": "^2.10.1",
     "@tauri-apps/plugin-window-state": "~2",
     "@tauri-store/valtio": "^3.3.0",
-    "@uiw/react-json-view": "^2.0.0-alpha.42",
+    "@uiw/react-json-view": "^2.0.0-alpha.43",
     "ahooks": "^3.9.7",
     "async-mutex": "^0.5.0",
     "derive-valtio": "^0.2.0",
@@ -104,4 +104,4 @@
     "vite-plugin-wasm": "^3.6.0",
     "vitest": "^4.1.5"
   }
-}
+}

src-tauri/Cargo.toml

@@ -3,7 +3,7 @@ members = ["migration", "entity", ".", "fpzip-sys", "macros"]
 
 [package]
 name = "dtm"
-version = "0.5.5"
+version = "0.5.6"
 description = "A little app for reading Draw Things Metadata"
 authors = ["kcjerrell"]
 edition = "2021"
@@ -37,7 +37,7 @@ tauri-plugin-opener = { git = "https://github.com/tauri-apps/plugins-workspace",
 tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-http = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
-tauri-plugin-valtio = "2"
+tauri-plugin-valtio = "3"
 tauri-plugin-process = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 

src-tauri/src/lib.rs

@@ -206,7 +206,7 @@ pub fn run() {
         .plugin(tauri_plugin_fs::init())
         .plugin(tauri_plugin_clipboard_manager::init())
         .plugin(tauri_plugin_opener::init())
-        .plugin(tauri_plugin_valtio::Builder::new().pretty(true).build())
+        .plugin(tauri_plugin_valtio::Builder::new().build())
         // .plugin(tauri_plugin_nspopover::init())
         .plugin(
             tauri_plugin_log::Builder::new()

src-tauri/src/projects_db/dt_project/tensor_data.rs

@@ -26,7 +26,7 @@ pub struct TensorData {
     pub lineage: i64,
     pub logical_time: i64,
     pub idx: i64,
-    pub tensor_name: String,
+    pub tensor_names: Vec<String>,
     pub mask: Option<String>,
     #[serde(serialize_with = "serialize_tensor_data")]
     data: Arc<[u8]>,
@@ -60,23 +60,28 @@ impl<'r> FromRow<'r, SqliteRow> for TensorData {
 
         match root_as_tensor_data(&data) {
             Ok(fb) => {
-                let tensor_name = if fb.color_palette_id() != 0 {
-                    format!("color_palette_{}", fb.color_palette_id())
-                } else if fb.custom_id() != 0 {
-                    format!("custom_{}", fb.custom_id())
-                } else if fb.pose_id() != 0 {
-                    format!("pose_{}", fb.pose_id())
-                } else if fb.scribble_id() != 0 {
-                    format!("scribble_{}", fb.scribble_id())
-                } else if fb.depth_map_id() != 0 {
-                    format!("depth_map_{}", fb.depth_map_id())
-                } else if fb.tensor_id() != 0 {
-                    format!("tensor_history_{}", fb.tensor_id())
-                } else if fb.mask_id() != 0 {
-                    format!("binary_mask_{}", fb.mask_id())
-                } else {
-                    "unknown".to_string()
-                };
+                let mut tensor_names: Vec<String> = Vec::new();
+                if fb.color_palette_id() != 0 {
+                    tensor_names.push(format!("color_palette_{}", fb.color_palette_id()));
+                }
+                if fb.custom_id() != 0 {
+                    tensor_names.push(format!("custom_{}", fb.custom_id()));
+                }
+                if fb.pose_id() != 0 {
+                    tensor_names.push(format!("pose_{}", fb.pose_id()));
+                }
+                if fb.scribble_id() != 0 {
+                    tensor_names.push(format!("scribble_{}", fb.scribble_id()));
+                }
+                if fb.depth_map_id() != 0 {
+                    tensor_names.push(format!("depth_map_{}", fb.depth_map_id()));
+                }
+                if fb.tensor_id() != 0 {
+                    tensor_names.push(format!("tensor_history_{}", fb.tensor_id()));
+                }
+                if fb.mask_id() != 0 {
+                    tensor_names.push(format!("binary_mask_{}", fb.mask_id()));
+                }
 
                 let mask = if fb.mask_id() != 0 {
                     Some(format!("binary_mask_{}", fb.mask_id()))
@@ -90,7 +95,7 @@ impl<'r> FromRow<'r, SqliteRow> for TensorData {
                     logical_time,
                     idx,
                     data,
-                    tensor_name,
+                    tensor_names,
                     mask,
                 })
             }

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "DTM",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "identifier": "com.kcjer.dtm",
   "build": {
     "beforeDevCommand": "vite",

src/App.tsx

@@ -40,6 +40,8 @@ function App() {
 
     return (
         <AppRoot
+            data-current-view={currentView}
+            data-mounted-views={Array.from(mountedViews.current).join(",")}
             onContextMenu={(e) => {
                 if (!(e.target as HTMLElement)?.closest("[data-defctx")) e.preventDefault()
             }}
@@ -75,7 +77,7 @@ function App() {
                         const View = getView(v)
                         const isActiveView = v === currentView
                         return (
-                            <ViewContainer key={v} isActiveView={isActiveView}>
+                            <ViewContainer key={v} viewId={v} isActiveView={isActiveView}>
                                 <View flex={"1 1 auto"} />
                             </ViewContainer>
                         )