Doc + formatting
This commit is contained in:
parent
9ed5a04e22
commit
995f77d1ef
9 changed files with 39 additions and 30 deletions
|
|
@ -2,7 +2,7 @@ use std::{fmt, fs::File};
|
|||
|
||||
use ron::{
|
||||
de::from_reader,
|
||||
ser::{to_writer_pretty, PrettyConfig},
|
||||
ser::{PrettyConfig, to_writer_pretty},
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
|
|
@ -49,7 +49,7 @@ pub fn load() -> Config {
|
|||
)
|
||||
}),
|
||||
Err(_) => {
|
||||
let file = File::create(consts::FILE_CONF).unwrap_or_else(|error| {
|
||||
let mut file = File::create(consts::FILE_CONF).unwrap_or_else(|error| {
|
||||
panic!(
|
||||
"Failed to create default configuration file {}: {}",
|
||||
consts::FILE_CONF,
|
||||
|
|
@ -59,13 +59,15 @@ pub fn load() -> Config {
|
|||
|
||||
let default_config = Config::default();
|
||||
|
||||
to_writer_pretty(file, &default_config, PrettyConfig::new()).unwrap_or_else(|error| {
|
||||
panic!(
|
||||
"Failed to write default configuration file {}: {}",
|
||||
consts::FILE_CONF,
|
||||
error
|
||||
)
|
||||
});
|
||||
to_writer_pretty(&mut file, &default_config, PrettyConfig::new()).unwrap_or_else(
|
||||
|error| {
|
||||
panic!(
|
||||
"Failed to write default configuration file {}: {}",
|
||||
consts::FILE_CONF,
|
||||
error
|
||||
)
|
||||
},
|
||||
);
|
||||
|
||||
default_config
|
||||
}
|
||||
|
|
|
|||
|
|
@ -829,15 +829,13 @@ VALUES ($1, $2, $3, $4)
|
|||
{
|
||||
Err(Error::Database(error))
|
||||
if error.code() == Some(std::borrow::Cow::Borrowed("2067"))
|
||||
&& error.message() == "UNIQUE constraint failed: RecipeScheduled.user_id, RecipeScheduled.recipe_id, RecipeScheduled.date" =>
|
||||
&& error.message()
|
||||
== "UNIQUE constraint failed: RecipeScheduled.user_id, RecipeScheduled.recipe_id, RecipeScheduled.date" =>
|
||||
{
|
||||
Ok(AddScheduledRecipeResult::RecipeAlreadyScheduledAtThisDate)
|
||||
}
|
||||
Err(error) => {
|
||||
Err(DBError::from(error))
|
||||
}
|
||||
Err(error) => Err(DBError::from(error)),
|
||||
Ok(insert_result) => {
|
||||
|
||||
if add_ingredients_to_shopping_list {
|
||||
sqlx::query(
|
||||
r#"
|
||||
|
|
@ -847,13 +845,14 @@ INSERT INTO [ShoppingEntry] ([ingredient_id], [user_id], [recipe_scheduled_id],
|
|||
INNER JOIN [Group] ON [Group].[id] = [Step].[group_id]
|
||||
INNER JOIN [Recipe] ON [Recipe].[id] = [Group].[recipe_id]
|
||||
WHERE [Recipe].[id] = $1
|
||||
"#)
|
||||
.bind(recipe_id)
|
||||
.bind(user_id)
|
||||
.bind(insert_result.last_insert_rowid())
|
||||
.bind(servings)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
"#,
|
||||
)
|
||||
.bind(recipe_id)
|
||||
.bind(user_id)
|
||||
.bind(insert_result.last_insert_rowid())
|
||||
.bind(servings)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
}
|
||||
|
||||
tx.commit().await?;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
use axum::Error;
|
||||
use chrono::{Duration, prelude::*};
|
||||
use rand::distr::{Alphanumeric, SampleString};
|
||||
use sqlx::Sqlite;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue