zaphar/kitchen
1
0
Fork 0
mirror of https://github.com/zaphar/kitchen.git synced 2025-07-22 19:40:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

maid: cleanup warnings

Browse Source
This commit is contained in:
Jeremy Wall 2024-07-13 20:11:11 -04:00
parent 9126d434d5
commit aba1e114cf
2 changed files with 30 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/src/lib.rs
View File

@ -220,7 +220,7 @@ pub struct Step {
impl Step { impl Step {
pub fn new<S: Into<String>>(prep_time: Option<std::time::Duration>, instructions: S) -> Self { pub fn new<S: Into<String>>(prep_time: Option<std::time::Duration>, instructions: S) -> Self {
Self { Self {
prep_time: prep_time, prep_time,
instructions: instructions.into(), instructions: instructions.into(),
ingredients: Vec::new(), ingredients: Vec::new(),
} }

93
web/src/api.rs
View File

@ -17,9 +17,9 @@ use base64::{self, Engine};
use chrono::NaiveDate; use chrono::NaiveDate;
use gloo_net; use gloo_net;
// TODO(jwall): Remove this when we have gone a few migrations past. // TODO(jwall): Remove this when we have gone a few migrations past.
use serde_json::{from_str, to_string}; use serde_json::from_str;
use sycamore::prelude::*; use sycamore::prelude::*;
use tracing::{debug, error, field::debug, instrument}; use tracing::{debug, error, instrument};
use anyhow::Result; use anyhow::Result;
use client_api::*; use client_api::*;
@ -27,10 +27,9 @@ use recipes::{IngredientKey, RecipeEntry};
use serde_wasm_bindgen::{from_value, Serializer}; use serde_wasm_bindgen::{from_value, Serializer};
use wasm_bindgen::JsValue; use wasm_bindgen::JsValue;
// TODO(jwall): Remove this when we have gone a few migrations past. // TODO(jwall): Remove this when we have gone a few migrations past.
use web_sys::{window, Storage}; use web_sys::Storage;
fn to_js<T: serde::ser::Serialize>(value: T) -> Result<JsValue, serde_wasm_bindgen::Error> fn to_js<T: serde::ser::Serialize>(value: T) -> Result<JsValue, serde_wasm_bindgen::Error> {
{
let s = Serializer::new().serialize_maps_as_objects(true); let s = Serializer::new().serialize_maps_as_objects(true);
value.serialize(&s) value.serialize(&s)
} }
@ -96,7 +95,10 @@ where
{ {
match res { match res {
Ok(v) => Ok(v), Ok(v) => Ok(v),
Err(e) => Err(std::io::Error::new(std::io::ErrorKind::Other, format!("{:?}", e))), Err(e) => Err(std::io::Error::new(
std::io::ErrorKind::Other,
format!("{:?}", e),
)),
} }
} }
@ -206,12 +208,8 @@ impl LocalStore {
self.store self.store
.ro_transaction(&[js_lib::STATE_STORE_NAME], |trx| async move { .ro_transaction(&[js_lib::STATE_STORE_NAME], |trx| async move {
let key = to_js(USER_DATA_KEY).expect("Failed to serialize key"); let key = to_js(USER_DATA_KEY).expect("Failed to serialize key");
let object_store = trx let object_store = trx.object_store(js_lib::STATE_STORE_NAME)?;
.object_store(js_lib::STATE_STORE_NAME)?; let user_data: UserData = match object_store.get(&key).await? {
let user_data: UserData = match object_store
.get(&key)
.await?
{
Some(s) => convert_to_io_error(from_value(s))?, Some(s) => convert_to_io_error(from_value(s))?,
None => return Ok(None), None => return Ok(None),
}; };
@ -229,13 +227,9 @@ impl LocalStore {
let data = data.clone(); let data = data.clone();
self.store self.store
.rw_transaction(&[js_lib::STATE_STORE_NAME], |trx| async move { .rw_transaction(&[js_lib::STATE_STORE_NAME], |trx| async move {
let object_store = trx let object_store = trx.object_store(js_lib::STATE_STORE_NAME)?;
.object_store(js_lib::STATE_STORE_NAME)?;
object_store object_store
.put_kv( .put_kv(&key, &convert_to_io_error(to_js(&data))?)
&key,
&convert_to_io_error(to_js(&data))?,
)
.await?; .await?;
Ok(()) Ok(())
}) })
@ -244,11 +238,8 @@ impl LocalStore {
} else { } else {
self.store self.store
.rw_transaction(&[js_lib::STATE_STORE_NAME], |trx| async move { .rw_transaction(&[js_lib::STATE_STORE_NAME], |trx| async move {
let object_store = trx let object_store = trx.object_store(js_lib::STATE_STORE_NAME)?;
.object_store(js_lib::STATE_STORE_NAME)?; object_store.delete(&key).await?;
object_store
.delete(&key)
.await?;
Ok(()) Ok(())
}) })
.await .await
@ -261,11 +252,8 @@ impl LocalStore {
self.store self.store
.ro_transaction(&[js_lib::RECIPE_STORE_NAME], |trx| async move { .ro_transaction(&[js_lib::RECIPE_STORE_NAME], |trx| async move {
let mut keys = Vec::new(); let mut keys = Vec::new();
let object_store = trx let object_store = trx.object_store(js_lib::RECIPE_STORE_NAME)?;
.object_store(js_lib::RECIPE_STORE_NAME)?; let key_vec = object_store.get_all_keys(None).await?;
let key_vec = object_store
.get_all_keys(None)
.await?;
for k in key_vec { for k in key_vec {
if let Ok(v) = from_value(k) { if let Ok(v) = from_value(k) {
keys.push(v); keys.push(v);
@ -284,16 +272,11 @@ impl LocalStore {
self.store self.store
.ro_transaction(&[js_lib::RECIPE_STORE_NAME], |trx| async move { .ro_transaction(&[js_lib::RECIPE_STORE_NAME], |trx| async move {
let mut recipe_list = Vec::new(); let mut recipe_list = Vec::new();
let object_store = trx let object_store = trx.object_store(js_lib::RECIPE_STORE_NAME)?;
.object_store(js_lib::RECIPE_STORE_NAME)?; let mut c = object_store.cursor().open().await?;
let mut c = object_store
.cursor()
.open()
.await?;
while let Some(value) = c.value() { while let Some(value) = c.value() {
recipe_list.push(convert_to_io_error(from_value(value))?); recipe_list.push(convert_to_io_error(from_value(value))?);
c.advance(1) c.advance(1).await?;
.await?;
} }
if recipe_list.is_empty() { if recipe_list.is_empty() {
return Ok(None); return Ok(None);
@ -309,12 +292,8 @@ impl LocalStore {
let key = to_js(id).expect("Failed to serialize key"); let key = to_js(id).expect("Failed to serialize key");
self.store self.store
.ro_transaction(&[js_lib::RECIPE_STORE_NAME], |trx| async move { .ro_transaction(&[js_lib::RECIPE_STORE_NAME], |trx| async move {
let object_store = trx let object_store = trx.object_store(js_lib::RECIPE_STORE_NAME)?;
.object_store(js_lib::RECIPE_STORE_NAME)?; let entry: Option<RecipeEntry> = match object_store.get(&key).await? {
let entry: Option<RecipeEntry> = match object_store
.get(&key)
.await?
{
Some(v) => convert_to_io_error(from_value(v))?, Some(v) => convert_to_io_error(from_value(v))?,
None => None, None => None,
}; };
@ -332,11 +311,8 @@ impl LocalStore {
let key = to_js(&recipe_key).expect("Failed to serialize key"); let key = to_js(&recipe_key).expect("Failed to serialize key");
self.store self.store
.rw_transaction(&[js_lib::STATE_STORE_NAME], |trx| async move { .rw_transaction(&[js_lib::STATE_STORE_NAME], |trx| async move {
let object_store = trx let object_store = trx.object_store(js_lib::STATE_STORE_NAME)?;
.object_store(js_lib::STATE_STORE_NAME)?; object_store.delete(&key).await?;
object_store
.delete(&key)
.await?;
Ok(()) Ok(())
}) })
.await .await
@ -347,13 +323,9 @@ impl LocalStore {
let key = to_js(entry.recipe_id()).expect("Failed to serialize recipe key"); let key = to_js(entry.recipe_id()).expect("Failed to serialize recipe key");
self.store self.store
.rw_transaction(&[js_lib::RECIPE_STORE_NAME], |trx| async move { .rw_transaction(&[js_lib::RECIPE_STORE_NAME], |trx| async move {
let object_store = trx let object_store = trx.object_store(js_lib::RECIPE_STORE_NAME)?;
.object_store(js_lib::RECIPE_STORE_NAME)?;
object_store object_store
.put_kv( .put_kv(&key, &convert_to_io_error(to_js(&entry))?)
&key,
&convert_to_io_error(to_js(&entry))?,
)
.await?; .await?;
Ok(()) Ok(())
}) })
@ -369,13 +341,9 @@ impl LocalStore {
let key = to_js(entry.recipe_id()).expect("Failed to serialize recipe key"); let key = to_js(entry.recipe_id()).expect("Failed to serialize recipe key");
self.store self.store
.rw_transaction(&[js_lib::RECIPE_STORE_NAME], |trx| async move { .rw_transaction(&[js_lib::RECIPE_STORE_NAME], |trx| async move {
let object_store = trx let object_store = trx.object_store(js_lib::RECIPE_STORE_NAME)?;
.object_store(js_lib::RECIPE_STORE_NAME)?;
object_store object_store
.put_kv( .put_kv(&key, &convert_to_io_error(to_js(&entry))?)
&key,
&convert_to_io_error(to_js(&entry))?,
)
.await?; .await?;
Ok(()) Ok(())
}) })
@ -389,11 +357,8 @@ impl LocalStore {
let key = to_js(recipe_id).expect("Failed to serialize key"); let key = to_js(recipe_id).expect("Failed to serialize key");
self.store self.store
.rw_transaction(&[js_lib::RECIPE_STORE_NAME], |trx| async move { .rw_transaction(&[js_lib::RECIPE_STORE_NAME], |trx| async move {
let object_store = trx let object_store = trx.object_store(js_lib::RECIPE_STORE_NAME)?;
.object_store(js_lib::RECIPE_STORE_NAME)?; object_store.delete(&key).await?;
object_store
.delete(&key)
.await?;
Ok(()) Ok(())
}) })
.await .await