Merge pull request #302 from redbadger/viktor/cat-facts-on-new-kv

[Blocked] Migrate cat_facts to new crux_kv.
redbadger · Jan 22, 2025 · fa3b105 · fa3b105
2 parents 81dddbb + 93ae5d1
commit fa3b105
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 48 deletions.
diff --git a/examples/cat_facts/Cargo.lock b/examples/cat_facts/Cargo.lock
diff --git a/examples/cat_facts/Cargo.toml b/examples/cat_facts/Cargo.toml
@@ -12,16 +12,16 @@ rust-version = "1.66"
 
 [workspace.dependencies]
 anyhow = "1.0.95"
-# crux_core = { path = "../../crux_core" }
-# crux_http = { path = "../../crux_http" }
-# crux_kv = { path = "../../crux_kv" }
-# crux_platform = { path = "../../crux_platform" }
-# crux_time = { path = "../../crux_time", features = ["chrono"] }
-crux_core = "0.11.0"
-crux_http = "0.11.0"
-crux_kv = "0.6.0"
-crux_platform = "0.3.0"
-crux_time = { version = "0.8.0", features = ["chrono"] }
+crux_core = { path = "../../crux_core" }
+crux_http = { path = "../../crux_http" }
+crux_kv = { path = "../../crux_kv" }
+crux_platform = { path = "../../crux_platform" }
+crux_time = { path = "../../crux_time", features = ["chrono"] }
+# crux_core = "0.11.0"
+# crux_http = "0.11.0"
+# crux_kv = "0.6.0"
+# crux_platform = "0.3.0"
+# crux_time = { version = "0.8.0", features = ["chrono"] }
 serde = "1.0.217"
 
 [workspace.metadata.bin]

diff --git a/examples/cat_facts/shared/src/app.rs b/examples/cat_facts/shared/src/app.rs
@@ -9,7 +9,7 @@ use crux_core::{
     Capability, Command,
 };
 use crux_http::Http;
-use crux_kv::{error::KeyValueError, KeyValue};
+use crux_kv::{command::KeyValue as key_value, error::KeyValueError, KeyValue};
 use crux_platform::Platform;
 use crux_time::{Time, TimeResponse};
 
@@ -168,9 +168,11 @@ impl App for CatFacts {
                 model.cat_image = Some(response.take_body().unwrap());
 
                 let bytes = serde_json::to_vec(&model).unwrap();
-                caps.key_value.set(KEY.to_string(), bytes, |_| Event::None);
 
-                return render::render();
+                return Command::all([
+                    key_value::set(KEY, bytes).then_send(|_| Event::None),
+                    render::render(),
+                ]);
             }
             Event::SetFact(Err(_)) | Event::SetImage(Err(_)) => {
                 // TODO: Display an error
@@ -180,14 +182,14 @@ impl App for CatFacts {
                 model.time = Some(time.to_rfc3339_opts(chrono::SecondsFormat::Secs, true));
 
                 let bytes = serde_json::to_vec(&model).unwrap();
-                caps.key_value.set(KEY.to_string(), bytes, |_| Event::None);
 
-                return render::render();
+                return Command::all([
+                    key_value::set(KEY, bytes).then_send(|_| Event::None),
+                    render::render(),
+                ]);
             }
             Event::CurrentTime(_) => panic!("Unexpected time response"),
-            Event::Restore => {
-                caps.key_value.get(KEY.to_string(), Event::SetState);
-            }
+            Event::Restore => return key_value::get(KEY).then_send(Event::SetState),
             Event::SetState(Ok(Some(value))) => {
                 if let Ok(m) = serde_json::from_slice::<Model>(&value) {
                     *model = m;