Merge pull request #70 from Berrysoft/dev/view-model

Add a view model to runtime.
Uni-Gal · Dec 23, 2022 · 04db6a1 · 04db6a1
2 parents a5a6e11 + 129a923
commit 04db6a1
Show file tree

Hide file tree

Showing 22 changed files with 495 additions and 342 deletions.
diff --git a/bins/Cargo.lock b/bins/Cargo.lock
diff --git a/bins/Cargo.toml b/bins/Cargo.toml
@@ -14,6 +14,7 @@ opt-level = "z"
 
 [workspace.dependencies]
 ayaka-runtime = { path = "../utils/ayaka-runtime" }
+ayaka-model = { path = "../utils/ayaka-model" }
 tokio = { version = "1" }
 clap = { version = "4.0" }
 flexi_logger = { version = "0.24", default-features = false, features = ["colors"] }
diff --git a/bins/ayaka-check/src/main.rs b/bins/ayaka-check/src/main.rs
@@ -57,7 +57,7 @@ async fn main() -> Result<()> {
         }
     }
     let mut ctx = context.await?;
-    ctx.init_new();
+    ctx.set_start_context();
     let loc = opts.locale.unwrap_or_else(Locale::current);
     while let Some(raw_ctx) = ctx.next_run() {
         let action = ctx.get_action(&loc, &raw_ctx)?;

diff --git a/bins/ayaka-gui/src-tauri/Cargo.toml b/bins/ayaka-gui/src-tauri/Cargo.toml
@@ -7,13 +7,12 @@ edition = "2021"
 tauri-build = { version = "1.0", features = [] }
 
 [dependencies]
-ayaka-runtime = { workspace = true }
+ayaka-model = { workspace = true }
 flexi_logger = { workspace = true }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 tauri = { version = "1.2", features = ["cli", "window-all"] }
 tauri-plugin-window-state = "0.1"
-trylog = "0.3"
 tryiterator = { git = "https://github.com/Pernosco/tryiterator.git" }
 axum = { version = "0.6", default-features = false, features = ["http1", "tokio"] }
 tower-http = { version = "0.3", features = ["cors"] }

diff --git a/bins/ayaka-gui/src-tauri/src/asset_resolver.rs b/bins/ayaka-gui/src-tauri/src/asset_resolver.rs
@@ -6,7 +6,7 @@ use axum::{
     routing::get,
     Router, Server,
 };
-use ayaka_runtime::{log, vfs::*};
+use ayaka_model::{log, vfs::*};
 use std::{
     io::{Read, Result},
     net::TcpListener,