Compare commits
32 Commits
planning
...
e29d664f0e
| Author | SHA1 | Date | |
|---|---|---|---|
| e29d664f0e | |||
| c522c23dfe | |||
| 7121137145 | |||
| e2e0cc587e | |||
| 1e91d98581 | |||
| 8801596de7 | |||
| 02bdbf0f2c | |||
| 45029b87d2 | |||
| ccb178ae5a | |||
| 2f3993bb9e | |||
| 29b2f076bf | |||
| f220c6c960 | |||
| bcc0564f2a | |||
| b14e566593 | |||
| d3259c82b3 | |||
| 28afe8ece0 | |||
| a7cc92f903 | |||
| 46532eee9e | |||
| ee3271f772 | |||
| 616f8095e2 | |||
| 66514eb192 | |||
| 1d091bd419 | |||
| d4454e7f16 | |||
| 253045c742 | |||
| 5e92e30f51 | |||
| 874a9f86f8 | |||
| 4576ffb03b | |||
| 202d7c5976 | |||
| fb4d24ef44 | |||
| 940927d376 | |||
| 14f604283c | |||
| f7ba3ed3a6 |
24
.gitignore
vendored
24
.gitignore
vendored
@@ -12,3 +12,27 @@
|
||||
**/target
|
||||
**/*.rs.bk
|
||||
**/Cargo.lock
|
||||
|
||||
# Node.js
|
||||
**/node_modules
|
||||
**/package-lock.json
|
||||
**/.DS_Store
|
||||
**/dist
|
||||
|
||||
# local env files
|
||||
.env.local
|
||||
.env.*.local
|
||||
|
||||
# Log files
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
|
||||
# Editor directories and files
|
||||
.idea
|
||||
.vscode
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw*
|
||||
|
||||
14
Cargo.toml
14
Cargo.toml
@@ -1,9 +1,7 @@
|
||||
[package]
|
||||
name = "CookAssistant"
|
||||
version = "0.1.0"
|
||||
authors = ["artus <artus@landoftheunicorn.hd.free.fr>"]
|
||||
edition = "2018"
|
||||
[workspace]
|
||||
|
||||
[dependencies]
|
||||
cookbook = { path = "cookbook/" }
|
||||
planner = { path = "planner/" }
|
||||
members = [
|
||||
"cookbook",
|
||||
"planner",
|
||||
"web",
|
||||
]
|
||||
|
||||
1
cookbook/.env
Normal file
1
cookbook/.env
Normal file
@@ -0,0 +1 @@
|
||||
DATABASE_URL=db.sqlite3
|
||||
@@ -5,3 +5,6 @@ authors = ["artus <artus@landoftheunicorn.hd.free.fr>"]
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
libsqlite3-sys = { version = "*", features = ["bundled"] }
|
||||
diesel = { version = "1.4.1", features = ["sqlite"] }
|
||||
dotenv = "0.9.0"
|
||||
|
||||
BIN
cookbook/db.sqlite3
Normal file
BIN
cookbook/db.sqlite3
Normal file
Binary file not shown.
5
cookbook/diesel.toml
Normal file
5
cookbook/diesel.toml
Normal file
@@ -0,0 +1,5 @@
|
||||
# For documentation on how to configure this file,
|
||||
# see diesel.rs/guides/configuring-diesel-cli
|
||||
|
||||
[print_schema]
|
||||
file = "src/schema.rs"
|
||||
0
cookbook/migrations/.gitkeep
Normal file
0
cookbook/migrations/.gitkeep
Normal file
@@ -0,0 +1,2 @@
|
||||
-- This file should undo anything in `up.sql`
|
||||
DROP TABLE recipes
|
||||
@@ -0,0 +1,8 @@
|
||||
-- Your SQL goes here
|
||||
CREATE TABLE recipes (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
title VARCHAR NOT NULL,
|
||||
category SMALLINT NOT NULL,
|
||||
ingredients TEXT NOT NULL,
|
||||
preparation TEXT NOT NULL
|
||||
)
|
||||
@@ -0,0 +1,2 @@
|
||||
-- This file should undo anything in `up.sql`
|
||||
DROP TABLE ingredients
|
||||
@@ -0,0 +1,5 @@
|
||||
-- Your SQL goes here
|
||||
CREATE TABLE ingredients (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
alias VARCHAR NOT NULL
|
||||
)
|
||||
18
cookbook/src/bin/show_recipes.rs
Normal file
18
cookbook/src/bin/show_recipes.rs
Normal file
@@ -0,0 +1,18 @@
|
||||
extern crate cookbook;
|
||||
extern crate diesel;
|
||||
|
||||
use cookbook::{
|
||||
establish_connection,
|
||||
recipes::{self, Recipe},
|
||||
};
|
||||
|
||||
fn main() {
|
||||
let conn = establish_connection();
|
||||
let result = recipes::load_all(&conn);
|
||||
println!("Here are {} recipes [{}]:", result.len(), result.len() * std::mem::size_of::<Recipe>());
|
||||
for rec in result {
|
||||
println!("*************\n{}\n({:?})", rec.title, rec.category);
|
||||
println!("-------------\n");
|
||||
println!("{}", rec.ingredients.into_manager(&conn).display_lines());
|
||||
}
|
||||
}
|
||||
101
cookbook/src/bin/write_recipe.rs
Normal file
101
cookbook/src/bin/write_recipe.rs
Normal file
@@ -0,0 +1,101 @@
|
||||
extern crate cookbook;
|
||||
extern crate diesel;
|
||||
|
||||
use std::io::{stdin};
|
||||
use diesel::SqliteConnection;
|
||||
use cookbook::*;
|
||||
use cookbook::recipes::{NewRecipe, RecipeCategory};
|
||||
use cookbook::ingredients::{IngredientList};
|
||||
|
||||
struct CreateRecipe<'a> {
|
||||
connection: &'a SqliteConnection,
|
||||
title: &'a str,
|
||||
category: Option<RecipeCategory>,
|
||||
ingredients: IngredientList,
|
||||
}
|
||||
|
||||
impl<'a> CreateRecipe<'a> {
|
||||
fn new(conn: &'a SqliteConnection) -> Self {
|
||||
CreateRecipe{
|
||||
connection: conn,
|
||||
title: "New recipe",
|
||||
category: None,
|
||||
ingredients: IngredientList::new(),
|
||||
}
|
||||
}
|
||||
|
||||
fn set_title(&mut self, title: &'a str) {
|
||||
self.title = title;
|
||||
}
|
||||
|
||||
fn set_category(&mut self, id: i16) {
|
||||
self.category = RecipeCategory::from_id(id);
|
||||
}
|
||||
|
||||
fn add_ingredient(&mut self, name: String) {
|
||||
use crate::ingredients::*;
|
||||
let name = name.trim();
|
||||
// Check it exists or create
|
||||
match get_id_or_create(self.connection, &name) {
|
||||
Ok(id) => {
|
||||
println!("Got id {}", id);
|
||||
self.ingredients.push(id);
|
||||
},
|
||||
Err(_) => println!("Error adding ingredient")
|
||||
}
|
||||
}
|
||||
|
||||
/// Builds a NewRecipe instance from current data and insert it.
|
||||
fn insert(self) {
|
||||
let new_recipe = NewRecipe {
|
||||
title: self.title,
|
||||
category: self.category.unwrap_or(RecipeCategory::Breakfast),
|
||||
ingredients: self.ingredients,
|
||||
preparation: ""
|
||||
};
|
||||
match new_recipe.insert(self.connection) {
|
||||
Ok(new) => println!("Added {}", new.title),
|
||||
Err(e) => println!("Error: {}", e),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fn main() {
|
||||
let conn = establish_connection();
|
||||
let mut builder = CreateRecipe::new(&conn);
|
||||
|
||||
println!("Title : ");
|
||||
let mut title = String::new();
|
||||
stdin().read_line(&mut title).unwrap();
|
||||
let title = &title[..(title.len() - 1)];
|
||||
builder.set_title(title);
|
||||
|
||||
println!("Category : ");
|
||||
for cat in &RecipeCategory::all() {
|
||||
println!("{} - {}", cat.id(), cat.name());
|
||||
}
|
||||
let mut category_id = String::new();
|
||||
stdin().read_line(&mut category_id).unwrap();
|
||||
let category_id = category_id.trim().parse::<i16>().unwrap_or(0);
|
||||
builder.set_category(category_id);
|
||||
|
||||
println!("Ingredients (empty line to finish): ");
|
||||
loop {
|
||||
let mut ingdts = String::new();
|
||||
stdin().read_line(&mut ingdts).unwrap();
|
||||
if &ingdts == "\r\n" {
|
||||
break;
|
||||
}
|
||||
builder.add_ingredient(ingdts);
|
||||
}
|
||||
|
||||
builder.insert();
|
||||
}
|
||||
|
||||
|
||||
#[cfg(not(windows))]
|
||||
const EOF: &'static str = "CTRL+D";
|
||||
|
||||
#[cfg(windows)]
|
||||
const EOF: &'static str = "CTRL+Z";
|
||||
@@ -1,16 +1,119 @@
|
||||
mod meal;
|
||||
mod storage;
|
||||
#[macro_use]
|
||||
extern crate diesel;
|
||||
extern crate dotenv;
|
||||
|
||||
mod schema;
|
||||
mod models;
|
||||
|
||||
mod importer;
|
||||
|
||||
pub use self::meal::Meal;
|
||||
use diesel::prelude::*;
|
||||
use dotenv::dotenv;
|
||||
use std::env;
|
||||
|
||||
pub fn fetch_meals() -> Vec<Meal> {
|
||||
vec![
|
||||
Meal::new("Raclette".to_string(), 800),
|
||||
Meal::new("Soupe".to_string(), 400),
|
||||
]
|
||||
pub fn establish_connection() -> SqliteConnection {
|
||||
dotenv().ok();
|
||||
|
||||
let db_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set !");
|
||||
SqliteConnection::establish(&db_url)
|
||||
.expect(&format!("Error connecting to {}", db_url))
|
||||
}
|
||||
|
||||
pub mod recipes {
|
||||
pub use crate::models::{Recipe, NewRecipe, fields::RecipeCategory};
|
||||
use super::{SqliteConnection, schema};
|
||||
use super::diesel::prelude::*;
|
||||
|
||||
/// Loads all recipes from database
|
||||
pub fn load_all(conn: &SqliteConnection) -> Vec<Recipe> {
|
||||
use self::schema::recipes::dsl::*;
|
||||
recipes.load::<Recipe>(conn)
|
||||
.expect("Error loading recipe's list")
|
||||
}
|
||||
|
||||
pub fn delete(conn: &SqliteConnection, recipe_id: i32) -> bool {
|
||||
use self::schema::recipes::dsl::*;
|
||||
|
||||
diesel::delete(recipes.filter(id.eq(recipe_id)))
|
||||
.execute(conn)
|
||||
.is_ok()
|
||||
}
|
||||
}
|
||||
|
||||
pub mod ingredients {
|
||||
pub use crate::models::{
|
||||
Ingredient,
|
||||
NewIngredient,
|
||||
fields::{IngredientId, IngredientList},
|
||||
};
|
||||
use super::{SqliteConnection, schema};
|
||||
use super::diesel::prelude::*;
|
||||
|
||||
pub struct IngredientListManager<'a>(&'a SqliteConnection, IngredientList);
|
||||
|
||||
impl<'a> IngredientListManager<'a> {
|
||||
pub fn display_lines(&self) -> String {
|
||||
use self::get;
|
||||
let mut repr = String::new();
|
||||
for id in self.1.iter() {
|
||||
let ingdt = get(self.0, id).expect("Database integrity error");
|
||||
repr.push_str(&format!("{}\n", ingdt.alias));
|
||||
}
|
||||
repr
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> IngredientList {
|
||||
pub fn into_manager(self, conn: &'a SqliteConnection) -> IngredientListManager<'a> {
|
||||
IngredientListManager(conn, self)
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns the id of the ingredient identifiable by `name: &str`
|
||||
/// If the ingredient does not yet exists, it is inserted in database.
|
||||
pub fn get_id_or_create(conn: &SqliteConnection, name: &str) -> Result<i32,String> {
|
||||
if let Some(ingdt) = find(conn, name) {
|
||||
return Ok(ingdt.id);
|
||||
} else {
|
||||
return create(conn, name);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get(conn: &SqliteConnection, ingdt_id: &IngredientId) -> Result<Ingredient,String> {
|
||||
use self::schema::ingredients::dsl::*;
|
||||
|
||||
ingredients.filter(id.eq(ingdt_id))
|
||||
.first::<Ingredient>(conn)
|
||||
.map_err(|e| format!("Could not retrieve : {}", e))
|
||||
}
|
||||
|
||||
fn find(conn: &SqliteConnection, name: &str) -> Option<Ingredient> {
|
||||
use self::schema::ingredients::dsl::*;
|
||||
|
||||
match ingredients.filter(alias.like(name))
|
||||
.first(conn)
|
||||
{
|
||||
Ok(ingdt) => Some(ingdt),
|
||||
Err(_) => None,
|
||||
}
|
||||
}
|
||||
|
||||
fn create(conn: &SqliteConnection, name: &str) -> Result<i32,String> {
|
||||
use self::schema::ingredients::dsl::*;
|
||||
|
||||
let _ = diesel::insert_into(ingredients)
|
||||
.values(&NewIngredient { alias: name })
|
||||
.execute(conn)
|
||||
.map_err(|e| format!("Error inserting ingredient ! {:?}", e))?;
|
||||
let inserted = ingredients
|
||||
.order(id.desc())
|
||||
.first::<Ingredient>(conn)
|
||||
.map_err(|e| format!("No ingredient at all ! {:?}", e))?;
|
||||
Ok(inserted.id)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
#[test]
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
|
||||
/// An individual ingredient
|
||||
pub struct Ingredient {
|
||||
name: String,
|
||||
}
|
||||
|
||||
impl Ingredient {
|
||||
|
||||
pub(super) fn new(name: String) -> Ingredient {
|
||||
Ingredient { name }
|
||||
}
|
||||
}
|
||||
|
||||
/// An ordered set of dishes
|
||||
#[derive(Debug,Clone)]
|
||||
pub struct Meal {
|
||||
name: String,
|
||||
nutritional_value: i32,
|
||||
}
|
||||
|
||||
impl Meal {
|
||||
pub(super) fn new(name: String, nutritional_value: i32) -> Meal {
|
||||
Meal { name, nutritional_value }
|
||||
}
|
||||
|
||||
pub fn nutritional_value(&self) -> i32 {
|
||||
self.nutritional_value
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
176
cookbook/src/models.rs
Normal file
176
cookbook/src/models.rs
Normal file
@@ -0,0 +1,176 @@
|
||||
use super::schema::recipes;
|
||||
use super::schema::ingredients;
|
||||
use super::diesel::prelude::*;
|
||||
|
||||
pub mod fields {
|
||||
use diesel::{
|
||||
backend::Backend,
|
||||
sql_types::*,
|
||||
deserialize::{self, FromSql},
|
||||
serialize::{self, Output, ToSql},
|
||||
};
|
||||
use std::io::Write;
|
||||
|
||||
/// All recipes have a single associated category
|
||||
/// representing the main use of the resulting preparation.
|
||||
///
|
||||
/// It is stored as Integer
|
||||
#[derive(Debug, Copy, Clone, Eq, PartialEq, FromSqlRow, AsExpression)]
|
||||
#[sql_type = "SmallInt"]
|
||||
pub enum RecipeCategory {
|
||||
Breakfast = 0,
|
||||
Starter = 1,
|
||||
MainCourse = 2,
|
||||
Dessert = 3
|
||||
}
|
||||
|
||||
impl RecipeCategory {
|
||||
pub fn id(&self) -> i16 {
|
||||
*self as i16
|
||||
}
|
||||
|
||||
pub fn name(&self) -> &str {
|
||||
match *self {
|
||||
RecipeCategory::Breakfast => "Petit-déjeuner",
|
||||
RecipeCategory::Starter => "Entrée",
|
||||
RecipeCategory::MainCourse => "Plat principal",
|
||||
RecipeCategory::Dessert => "Dessert"
|
||||
}
|
||||
}
|
||||
|
||||
pub fn all() -> [Self; 4] {
|
||||
[RecipeCategory::Breakfast,
|
||||
RecipeCategory::Starter,
|
||||
RecipeCategory::MainCourse,
|
||||
RecipeCategory::Dessert]
|
||||
}
|
||||
|
||||
pub fn from_id(id: i16) -> Option<RecipeCategory> {
|
||||
match id {
|
||||
0 => Some(RecipeCategory::Breakfast),
|
||||
1 => Some(RecipeCategory::Starter),
|
||||
2 => Some(RecipeCategory::MainCourse),
|
||||
3 => Some(RecipeCategory::Dessert),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<DB: Backend> FromSql<SmallInt, DB> for RecipeCategory
|
||||
where i16: FromSql<SmallInt, DB>
|
||||
{
|
||||
fn from_sql(bytes: Option<&DB::RawValue>) -> deserialize::Result<Self> {
|
||||
let v = i16::from_sql(bytes)?;
|
||||
if let Some(result) = RecipeCategory::from_id(v){ Ok(result) }
|
||||
else { Err("Invalid RecipeCategory id".into()) }
|
||||
}
|
||||
}
|
||||
|
||||
impl<DB: Backend> ToSql<SmallInt, DB> for RecipeCategory
|
||||
where i16: ToSql<SmallInt, DB>
|
||||
{
|
||||
fn to_sql<W: Write>(&self, out: &mut Output<W, DB>) -> serialize::Result {
|
||||
i16::to_sql(&(*self as i16), out)
|
||||
}
|
||||
}
|
||||
|
||||
pub type IngredientId = i32;
|
||||
|
||||
#[derive(Debug, Clone, FromSqlRow, AsExpression)]
|
||||
#[sql_type = "Text"]
|
||||
pub struct IngredientList(Vec<IngredientId>);
|
||||
|
||||
/// Just a basic method for now
|
||||
impl IngredientList {
|
||||
pub fn new() -> Self {
|
||||
IngredientList(Vec::new())
|
||||
}
|
||||
|
||||
pub fn as_string(&self) -> String {
|
||||
self.0.iter()
|
||||
.map(|i| format!("{}", i))
|
||||
.collect::<Vec<String>>()
|
||||
.join(" ")
|
||||
}
|
||||
}
|
||||
|
||||
impl std::ops::Deref for IngredientList {
|
||||
type Target = Vec<IngredientId>;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.0
|
||||
}
|
||||
}
|
||||
|
||||
impl std::ops::DerefMut for IngredientList {
|
||||
|
||||
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||
&mut self.0
|
||||
}
|
||||
}
|
||||
|
||||
impl<DB: Backend> FromSql<Text, DB> for IngredientList
|
||||
where String: FromSql<Text, DB>
|
||||
{
|
||||
fn from_sql(bytes: Option<&DB::RawValue>) -> deserialize::Result<Self> {
|
||||
let data = String::from_sql(bytes)?;
|
||||
Ok(
|
||||
IngredientList(
|
||||
data.split(" ")
|
||||
.map(|i| i.parse::<IngredientId>().unwrap())
|
||||
.collect()
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
impl<DB: Backend> ToSql<Text, DB> for IngredientList
|
||||
where String: ToSql<Text, DB>
|
||||
{
|
||||
fn to_sql<W: Write>(&self, out: &mut Output<W, DB>) -> serialize::Result {
|
||||
String::to_sql(&self.as_string(), out)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// Data for a recipe stored in DB
|
||||
#[derive(Debug, Clone, Queryable)]
|
||||
pub struct Recipe {
|
||||
pub id: i32,
|
||||
pub title: String,
|
||||
pub category: fields::RecipeCategory,
|
||||
pub ingredients: fields::IngredientList,
|
||||
pub preparation: String,
|
||||
}
|
||||
|
||||
#[derive(Insertable, Debug)]
|
||||
#[table_name="recipes"]
|
||||
pub struct NewRecipe<'a> {
|
||||
pub title: &'a str,
|
||||
pub category: fields::RecipeCategory,
|
||||
pub ingredients: fields::IngredientList,
|
||||
pub preparation: &'a str,
|
||||
}
|
||||
|
||||
impl<'a> NewRecipe<'a> {
|
||||
pub fn insert(self, conn: &SqliteConnection) -> Result<Self, String> {
|
||||
diesel::insert_into(recipes::table)
|
||||
.values(&self)
|
||||
.execute(conn)
|
||||
.expect("Error inserting recipe");
|
||||
Ok(self)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Queryable)]
|
||||
pub struct Ingredient {
|
||||
pub id: i32,
|
||||
pub alias: String,
|
||||
}
|
||||
|
||||
#[derive(Insertable)]
|
||||
#[table_name="ingredients"]
|
||||
pub struct NewIngredient<'a> {
|
||||
pub alias: &'a str,
|
||||
}
|
||||
21
cookbook/src/schema.rs
Normal file
21
cookbook/src/schema.rs
Normal file
@@ -0,0 +1,21 @@
|
||||
table! {
|
||||
ingredients (id) {
|
||||
id -> Integer,
|
||||
alias -> Text,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
recipes (id) {
|
||||
id -> Integer,
|
||||
title -> Text,
|
||||
category -> SmallInt,
|
||||
ingredients -> Text,
|
||||
preparation -> Text,
|
||||
}
|
||||
}
|
||||
|
||||
allow_tables_to_appear_in_same_query!(
|
||||
ingredients,
|
||||
recipes,
|
||||
);
|
||||
@@ -1,20 +0,0 @@
|
||||
//! Storage backend for persistent data
|
||||
//!
|
||||
use std::collections::HashMap;
|
||||
|
||||
/// An entry in the storage
|
||||
struct Entry<T>(T);
|
||||
|
||||
/// A storage container
|
||||
pub struct Storage<T> {
|
||||
content: HashMap<String, Entry<T>>,
|
||||
}
|
||||
|
||||
impl<T> Storage<T> {
|
||||
pub(super) fn insert(&mut self, item: T) -> Result<(), ()> {
|
||||
|
||||
Err(())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
1
planner/.env
Normal file
1
planner/.env
Normal file
@@ -0,0 +1 @@
|
||||
DATABASE_URL=../cookbook/db.sqlite3
|
||||
@@ -1,44 +1,46 @@
|
||||
//! The weekly menu planner
|
||||
//!
|
||||
extern crate planner;
|
||||
extern crate cookbook;
|
||||
|
||||
use cookbook::{Meal, fetch_meals};
|
||||
use planner::solver::{Variables, Domain, solve_all};
|
||||
use std::time;
|
||||
use std::fmt::Debug;
|
||||
use std::fmt::Display;
|
||||
use std::hash::Hash;
|
||||
use cookbook::*;
|
||||
use planner::{
|
||||
*, Value,
|
||||
solver::{
|
||||
Variables,
|
||||
Domain,
|
||||
Problem
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
fn generate_weekly_menu() -> String {
|
||||
let assignments: Variables<Meal> = [
|
||||
("LundiMidi".to_string(), None), ("LundiSoir".to_string(), None),
|
||||
("MardiMidi".to_string(), None), ("MardiSoir".to_string(), None),
|
||||
("MercrediMidi".to_string(), None), ("MercrediSoir".to_string(), None),
|
||||
].iter().cloned().collect();
|
||||
let meals: Domain<Meal> = Domain::new(fetch_meals());
|
||||
let validator = |vars: &Variables<Meal>| {
|
||||
let mut result = true;
|
||||
for day in ["Lundi", "Mardi", "Mercredi"].into_iter() {
|
||||
let all_day = vars.keys().filter(|k| k.starts_with(day));
|
||||
let mut nutri_value = 0;
|
||||
for key in all_day {
|
||||
nutri_value += vars.get(key)
|
||||
.expect("no value here !")
|
||||
.expect("no meal there !")
|
||||
.nutritional_value()
|
||||
}
|
||||
println!("{} -> {}", day, nutri_value);
|
||||
if nutri_value != 1200 { result = false; };
|
||||
}
|
||||
println!("Validator returns {}", result);
|
||||
result
|
||||
};
|
||||
|
||||
let solutions = solve_all(assignments, &meals, validator);
|
||||
format!("{:#?}", solutions)
|
||||
fn pretty_output<K: Eq + Hash + Debug>(res: &Variables<Value, K>) -> String {
|
||||
let mut repr = String::new();
|
||||
for (var,value) in res {
|
||||
let value = match value {
|
||||
Some(rec) => &rec.title,
|
||||
None => "---",
|
||||
};
|
||||
repr.push_str(&format!("{:?} => {}\n", var, value));
|
||||
}
|
||||
repr
|
||||
}
|
||||
|
||||
fn main() {
|
||||
println!("{}", generate_weekly_menu());
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
|
||||
let start_time = time::Instant::now();
|
||||
let conn = establish_connection();
|
||||
let possible_values = recipes::load_all(&conn);
|
||||
let domain = Domain::new(possible_values);
|
||||
let mut problem = Problem::build();
|
||||
for (var, dom, ini) in template::Template::generate_variables(&domain) {
|
||||
problem = problem.add_variable(var, dom, ini);
|
||||
}
|
||||
let mut problem = problem.finish();
|
||||
let results = problem.solve_all();
|
||||
println!("Took {:?}", start_time.elapsed());
|
||||
println!("{}", pretty_output(results.first().unwrap()));
|
||||
}
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
extern crate cookbook;
|
||||
use cookbook::recipes::Recipe;
|
||||
|
||||
pub mod solver;
|
||||
pub mod template;
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
#[test]
|
||||
fn it_works() {
|
||||
assert_eq!(2 + 2, 4);
|
||||
}
|
||||
}
|
||||
|
||||
pub use solver::{Domain, DomainValues};
|
||||
/// We mainly use Recipe as the domain value type
|
||||
pub type Value = Recipe;
|
||||
|
||||
@@ -2,18 +2,20 @@
|
||||
//!
|
||||
//! Provides `Variables`, `Domain` structs and `solve_all` function.
|
||||
use std::fmt;
|
||||
use std::hash::Hash;
|
||||
use std::clone::Clone;
|
||||
use std::collections::HashMap;
|
||||
|
||||
/// An assignments map of variables
|
||||
pub type Variables<'a, V> = HashMap<String, Option<&'a V>>;
|
||||
pub type Variables<'a, V, K> = HashMap<K, Option<&'a V>>;
|
||||
|
||||
enum Assignment<'a, V> {
|
||||
Update(String, &'a V),
|
||||
Clear(String)
|
||||
enum Assignment<'a, V, K> {
|
||||
Update(K, &'a V),
|
||||
Clear(K)
|
||||
}
|
||||
|
||||
|
||||
pub type DomainValues<'a, V> = Vec<&'a V>;
|
||||
/// The domain of values that can be assigned to variables
|
||||
#[derive(Clone)]
|
||||
pub struct Domain<V> {
|
||||
@@ -24,6 +26,31 @@ impl<V> Domain<V> {
|
||||
pub fn new(values: Vec<V>) -> Domain<V> {
|
||||
Domain { values }
|
||||
}
|
||||
|
||||
/// Returns all values of a Domain instance
|
||||
pub fn all(&self) -> DomainValues<V> {
|
||||
self.values.iter().collect()
|
||||
}
|
||||
/// Returns a Filter filter applied to inner values
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
/// # extern crate planner;
|
||||
/// # use planner::solver::Domain;
|
||||
/// let domain = Domain::new(vec![1,2,3]);
|
||||
/// fn even(i: &i32) -> bool {
|
||||
/// i % 2 == 0
|
||||
/// };
|
||||
/// assert_eq!(domain.filter(even), vec![&2]);
|
||||
/// assert_eq!(domain.filter(|i: &i32| i % 2 == 1), vec![&1,&3]);
|
||||
/// ```
|
||||
pub fn filter(&self, filter_func: fn(&V) -> bool) -> DomainValues<V> {
|
||||
self.values
|
||||
.iter()
|
||||
.filter(|v: &&V| filter_func(*v))
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
||||
impl<V: fmt::Debug> fmt::Debug for Domain<V> {
|
||||
@@ -33,64 +60,152 @@ impl<V: fmt::Debug> fmt::Debug for Domain<V> {
|
||||
}
|
||||
|
||||
|
||||
/// Returns all possible Updates for next assignements, prepended with
|
||||
/// a Clear to ensure the variable is unset before when leaving the branch.
|
||||
fn assign_next<'a,'b, V>(assign: &'b Variables<'a, V>, domain: &'a Domain<V>)
|
||||
-> Option<Vec<Assignment<'a, V>>>
|
||||
where V: fmt::Debug
|
||||
{
|
||||
// Panics on empty domain
|
||||
// If domain values are filtered, then the branch is a dead end
|
||||
if domain.values.is_empty() { panic!("No values in domain : {:?}", domain); };
|
||||
pub type Constraint<'a,V, K> = fn(&Variables<'a,V, K>) -> bool;
|
||||
|
||||
// TODO: should be able to inject a choosing strategy
|
||||
if let Some((key,_)) = assign.iter().find(|(_, val)| val.is_none()) {
|
||||
let mut updates = vec![Assignment::Clear(key.clone())];
|
||||
// TODO: should be able to filter domain values (inference, pertinence)
|
||||
for value in domain.values.iter() {
|
||||
updates.push(Assignment::Update(key.clone(), value));
|
||||
pub struct Problem<'a, V, K> {
|
||||
/// The initial assignements map
|
||||
variables: Variables<'a, V, K>,
|
||||
/// Each variable has its associated domain
|
||||
domains: HashMap<K, DomainValues<'a,V>>,
|
||||
/// Set of constraints to validate
|
||||
constraints: Vec<Constraint<'a,V,K>>,
|
||||
}
|
||||
|
||||
impl<'a,V, K: Eq + Hash + Clone> Problem<'a, V, K> {
|
||||
|
||||
pub fn build() -> ProblemBuilder<'a,V, K> {
|
||||
ProblemBuilder::new()
|
||||
}
|
||||
|
||||
pub fn from_template() -> Problem<'a, V, K> {
|
||||
let mut builder = Self::build();
|
||||
|
||||
builder.finish()
|
||||
}
|
||||
|
||||
/// Returns all possible Updates for next assignements, prepended with
|
||||
/// a Clear to ensure the variable is unset before when leaving the branch.
|
||||
fn _push_updates(&self) -> Option<Vec<Assignment<'a,V, K>>> {
|
||||
// TODO: should be able to inject a choosing strategy
|
||||
if let Some((key,_)) = self.variables.iter().find(|(_, val)| val.is_none()) {
|
||||
let domain_values = self.domains.get(key).expect("No domain for variable !");
|
||||
// Push a clear assignment first, just before going up the stack.
|
||||
let mut updates = vec![Assignment::Clear(key.clone())];
|
||||
|
||||
if domain_values.is_empty() { panic!("No value in domain !"); }
|
||||
// TODO: should be able to filter domain values (inference, pertinence)
|
||||
for value in domain_values.into_iter() {
|
||||
updates.push(Assignment::Update(key.clone(), *value));
|
||||
}
|
||||
Some(updates)
|
||||
} else { // End of assignements
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
/// Checks that the current assignments doesn't violate any constraint
|
||||
fn _is_valid(&self) -> bool {
|
||||
for validator in self.constraints.iter() {
|
||||
if validator(&self.variables) == false { return false; }
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/// Returns all complete solutions, after visiting all possible outcomes using a stack (DFS).
|
||||
pub fn solve_all(&mut self) -> Vec<Variables<'a,V,K>>
|
||||
where V: Clone + fmt::Debug,
|
||||
K: Clone + fmt::Debug,
|
||||
{
|
||||
let mut solutions: Vec<Variables<V, K>> = vec![];
|
||||
let mut stack: Vec<Assignment<'a, V, K>> = vec![];
|
||||
stack.append(&mut self._push_updates().unwrap());
|
||||
loop {
|
||||
let node = stack.pop();
|
||||
if node.is_none() { break; };
|
||||
match node.unwrap() {
|
||||
Assignment::Update(key, val) => {
|
||||
// Assign the variable and open new branches, if any.
|
||||
*self.variables.get_mut(&key).unwrap() = Some(val);
|
||||
// TODO: handle case of empty domain.values
|
||||
if let Some(mut nodes) = self._push_updates() {
|
||||
stack.append(&mut nodes);
|
||||
} else {
|
||||
// Assignements are completed
|
||||
if self._is_valid() {
|
||||
solutions.push(self.variables.clone());
|
||||
};
|
||||
};
|
||||
},
|
||||
Assignment::Clear(key) => {
|
||||
// We are closing this branch, unset the variable
|
||||
*self.variables.get_mut(&key).unwrap() = None;
|
||||
},
|
||||
};
|
||||
};
|
||||
solutions
|
||||
}
|
||||
|
||||
pub fn solve_one(&mut self) -> Option<Variables<'a,V,K>>
|
||||
where V: Clone + fmt::Debug,
|
||||
K: Clone + fmt::Debug,
|
||||
{
|
||||
let mut stack: Vec<Assignment<'a, V, K>> = vec![];
|
||||
stack.append(&mut self._push_updates().unwrap());
|
||||
loop {
|
||||
let node = stack.pop();
|
||||
if node.is_none() {
|
||||
return None;
|
||||
};
|
||||
match node.unwrap() {
|
||||
Assignment::Update(key, val) => {
|
||||
// Assign the variable and open new branches, if any.
|
||||
*self.variables.get_mut(&key).unwrap() = Some(val);
|
||||
// TODO: handle case of empty domain.values
|
||||
if let Some(mut nodes) = self._push_updates() {
|
||||
stack.append(&mut nodes);
|
||||
} else {
|
||||
// Assignements are completed
|
||||
if self._is_valid() {
|
||||
return Some(self.variables.clone());
|
||||
};
|
||||
};
|
||||
},
|
||||
Assignment::Clear(key) => {
|
||||
// We are closing this branch, unset the variable
|
||||
*self.variables.get_mut(&key).unwrap() = None;
|
||||
},
|
||||
};
|
||||
}
|
||||
Some(updates)
|
||||
} else { // End of assignements
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
/// Visit all possible solutions, using a stack.
|
||||
pub fn solve_all<'a, V>(
|
||||
mut assign: Variables<'a, V>,
|
||||
domain: &'a Domain<V>,
|
||||
is_valid: fn(&Variables<'a,V>) -> bool
|
||||
) -> Vec<Variables<'a, V>>
|
||||
where V: Clone + fmt::Debug
|
||||
{
|
||||
let mut solutions: Vec<Variables<V>> = vec![];
|
||||
let mut stack: Vec<Assignment<'a, V>> = vec![];
|
||||
stack.append(&mut assign_next(&assign,domain).unwrap());
|
||||
loop {
|
||||
let node = stack.pop();
|
||||
if node.is_none() { break; };
|
||||
match node.unwrap() {
|
||||
Assignment::Update(key, val) => {
|
||||
// Assign the variable and open new branches, if any.
|
||||
*assign.get_mut(&key).unwrap() = Some(val);
|
||||
// TODO: handle case of empty domain.values
|
||||
if let Some(mut nodes) = assign_next(&assign, domain) {
|
||||
stack.append(&mut nodes);
|
||||
} else {
|
||||
// Assignements are completed
|
||||
if is_valid(&assign) {
|
||||
solutions.push(assign.clone());
|
||||
};
|
||||
};
|
||||
},
|
||||
Assignment::Clear(key) => {
|
||||
// We are closing this branch, unset the variable
|
||||
*assign.get_mut(&key).unwrap() = None;
|
||||
},
|
||||
};
|
||||
};
|
||||
solutions
|
||||
pub struct ProblemBuilder<'a, V, K>(Problem<'a, V, K>);
|
||||
|
||||
impl<'a, V, K: Eq + Hash + Clone> ProblemBuilder<'a, V, K> {
|
||||
fn new() -> ProblemBuilder<'a, V, K> {
|
||||
ProblemBuilder(
|
||||
Problem{
|
||||
variables: Variables::new(),
|
||||
domains: HashMap::new(),
|
||||
constraints: Vec::new(),
|
||||
})
|
||||
}
|
||||
|
||||
pub fn add_variable(mut self, name: K, domain: Vec<&'a V>, value: Option<&'a V>) -> Self
|
||||
{
|
||||
self.0.variables.insert(name.clone(), value);
|
||||
self.0.domains.insert(name, domain);
|
||||
self
|
||||
}
|
||||
|
||||
pub fn add_constraint(mut self, cons: Constraint<'a,V, K>) -> Self {
|
||||
self.0.constraints.push(cons);
|
||||
self
|
||||
}
|
||||
|
||||
pub fn finish(self) -> Problem<'a, V, K> {
|
||||
self.0
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -99,41 +214,40 @@ mod tests {
|
||||
#[test]
|
||||
fn test_solver_find_pairs() {
|
||||
use super::*;
|
||||
// Find all pairs of two differents
|
||||
let assign: Variables<i32> = [
|
||||
("Left".to_string(), None),
|
||||
("Right".to_string(), None),
|
||||
].iter().cloned().collect();
|
||||
let domain = Domain::new(vec![1,2,3]);
|
||||
let constraint = |assign: &Variables<i32>| {
|
||||
assign.get("Left").unwrap() == assign.get("Right").unwrap()
|
||||
};
|
||||
let solutions: Vec<Variables<i32>> = vec![
|
||||
let mut problem: Problem<_, _> = Problem::build()
|
||||
.add_variable(String::from("Left"), domain.all(), None)
|
||||
.add_variable(String::from("Right"), domain.all(), None)
|
||||
.add_constraint(|assign: &Variables<i32, _>| {
|
||||
assign.get("Left").unwrap() == assign.get("Right").unwrap()
|
||||
})
|
||||
.finish();
|
||||
|
||||
let solutions: Vec<Variables<i32, _>> = vec![
|
||||
[("Left".to_string(), Some(&3)), ("Right".to_string(), Some(&3)),].iter().cloned().collect(),
|
||||
[("Left".to_string(), Some(&2)), ("Right".to_string(), Some(&2)),].iter().cloned().collect(),
|
||||
[("Left".to_string(), Some(&1)), ("Right".to_string(), Some(&1)),].iter().cloned().collect(),
|
||||
];
|
||||
|
||||
assert_eq!(solve_all(assign, &domain, constraint), solutions);
|
||||
assert_eq!(problem.solve_all(), solutions);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_solver_find_pairs_with_initial() {
|
||||
use super::*;
|
||||
// Find all pairs of two differents
|
||||
let assign: Variables<i32> = [
|
||||
("Left".to_string(), None),
|
||||
("Right".to_string(), Some(&2)),
|
||||
].iter().cloned().collect();
|
||||
let domain = Domain::new(vec![1,2,3]);
|
||||
let constraint = |assign: &Variables<i32>| {
|
||||
assign.get("Left").unwrap() == assign.get("Right").unwrap()
|
||||
};
|
||||
let solutions: Vec<Variables<i32>> = vec![
|
||||
let mut problem: Problem<_, _> = Problem::build()
|
||||
.add_variable("Left".to_string(), domain.all(), None)
|
||||
.add_variable("Right".to_string(), domain.all(), Some(&2))
|
||||
.add_constraint( |assign: &Variables<i32, _>| {
|
||||
assign.get("Left").unwrap() == assign.get("Right").unwrap()
|
||||
})
|
||||
.finish();
|
||||
|
||||
let solutions: Vec<Variables<i32, _>> = vec![
|
||||
[("Left".to_string(), Some(&2)), ("Right".to_string(), Some(&2)),].iter().cloned().collect(),
|
||||
];
|
||||
|
||||
assert_eq!(solve_all(assign, &domain, constraint), solutions);
|
||||
assert_eq!(problem.solve_all(), solutions);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
79
planner/src/template.rs
Normal file
79
planner/src/template.rs
Normal file
@@ -0,0 +1,79 @@
|
||||
use super::{Domain, DomainValues, Value};
|
||||
|
||||
const DAYS: &[&str] = &[
|
||||
"Lundi", "Mardi", "Mercredi",
|
||||
"Jeudi", "Vendredi", "Samedi",
|
||||
"Dimanche"];
|
||||
|
||||
/// An enum to discriminate every meals
|
||||
#[derive(Debug, PartialEq, Eq, Clone, Hash)]
|
||||
pub enum Meal {
|
||||
Breakfast,
|
||||
Lunch,
|
||||
Dinner
|
||||
}
|
||||
|
||||
type Key<'a> = (&'a str, &'a Meal);
|
||||
|
||||
/// Options set on a meal
|
||||
#[derive(Debug, Default)]
|
||||
struct MealOpts<V> {
|
||||
is_used: bool,
|
||||
initial: Option<V>,
|
||||
}
|
||||
|
||||
/// Lets do a fixed template for now
|
||||
/// * Breakfast only on weekends.
|
||||
/// * Lunch has a starter and main course.
|
||||
/// * Plus dessert on weekend ?
|
||||
/// * Dinner is just a starter (hot in winter, cold in summer)
|
||||
pub struct Template;
|
||||
|
||||
impl<'a> Template {
|
||||
|
||||
/// Returns all possible meals
|
||||
fn keys() -> Vec<Key<'a>> {
|
||||
let mut keys = Vec::new();
|
||||
for day in DAYS {
|
||||
for meal in &[Meal::Breakfast, Meal::Lunch, Meal::Dinner] {
|
||||
keys.push((*day, meal))
|
||||
}
|
||||
}
|
||||
keys
|
||||
}
|
||||
|
||||
/// Builds a vector of variables, to be used with
|
||||
/// [ProblemBuilder](struct.ProblemBuilder.html).
|
||||
pub fn generate_variables(domain: &Domain<Value>)
|
||||
-> Vec<(Key, DomainValues<Value>, Option<&Value>)>
|
||||
{
|
||||
use cookbook::recipes::RecipeCategory;
|
||||
Self::keys()
|
||||
.into_iter()
|
||||
.filter(|key| {
|
||||
match *key {
|
||||
("Samedi", _) | ("Dimanche", _) => true,
|
||||
(_, Meal::Breakfast) => false,
|
||||
(_,_) => true,
|
||||
}
|
||||
})
|
||||
.map(|key| {
|
||||
//TODO: is key used ? MealOpts.is_used
|
||||
let category_filter: fn(&Value) -> bool = match key {
|
||||
(_, Meal::Breakfast) => |r: &Value| {
|
||||
r.category == RecipeCategory::Breakfast // Breakfast
|
||||
},
|
||||
(_, Meal::Lunch) => |r: &Value| {
|
||||
r.category == RecipeCategory::MainCourse // MainCourse
|
||||
},
|
||||
(_, Meal::Dinner) => |r: &Value| {
|
||||
r.category == RecipeCategory::Starter // Starter
|
||||
}
|
||||
};
|
||||
// TODO: has initial ?
|
||||
let initial = None;
|
||||
(key, domain.filter(category_filter), initial)
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
fn main() {
|
||||
println!("Hello, world!");
|
||||
}
|
||||
19
web/Cargo.toml
Normal file
19
web/Cargo.toml
Normal file
@@ -0,0 +1,19 @@
|
||||
[package]
|
||||
name = "web"
|
||||
version = "0.1.0"
|
||||
authors = ["artus40 <artus@landoftheunicorn.ovh>"]
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
rocket = "0.4.0"
|
||||
rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", branch = "master" }
|
||||
cookbook = { path = "../cookbook/" }
|
||||
planner = { path = "../planner/" }
|
||||
serde = "1.0"
|
||||
serde_derive = "1.0"
|
||||
|
||||
|
||||
[dependencies.rocket_contrib]
|
||||
version = "0.4.0"
|
||||
default-features = false
|
||||
features = ["json", "diesel_sqlite_pool"]
|
||||
2
web/Rocket.toml
Normal file
2
web/Rocket.toml
Normal file
@@ -0,0 +1,2 @@
|
||||
[global.databases]
|
||||
cookbook_db = { url = "../cookbook/db.sqlite3" }
|
||||
144
web/src/main.rs
Normal file
144
web/src/main.rs
Normal file
@@ -0,0 +1,144 @@
|
||||
#![feature(proc_macro_hygiene, decl_macro)]
|
||||
|
||||
#[macro_use] extern crate rocket;
|
||||
#[macro_use] extern crate rocket_contrib;
|
||||
#[macro_use] extern crate serde_derive;
|
||||
extern crate rocket_cors;
|
||||
extern crate cookbook;
|
||||
extern crate planner;
|
||||
|
||||
use std::path::{Path, PathBuf};
|
||||
use rocket::{
|
||||
response::{NamedFile, status::NotFound},
|
||||
http::Method,
|
||||
};
|
||||
use rocket_cors::{AllowedHeaders, AllowedOrigins, Error};
|
||||
|
||||
#[get("/")]
|
||||
fn index() -> Result<NamedFile, NotFound<String>> {
|
||||
files(PathBuf::from("index.html"))
|
||||
}
|
||||
|
||||
#[get("/<file..>", rank=6)]
|
||||
fn files(file: PathBuf) -> Result<NamedFile, NotFound<String>> {
|
||||
let path = Path::new("vue/dist/").join(file);
|
||||
NamedFile::open(&path)
|
||||
.map_err(|_| NotFound(format!("Bad path: {:?}", path)))
|
||||
}
|
||||
|
||||
mod api {
|
||||
use cookbook::*;
|
||||
use rocket_contrib::{
|
||||
json::Json,
|
||||
databases::diesel,
|
||||
};
|
||||
|
||||
#[database("cookbook_db")]
|
||||
pub struct CookbookDbConn(diesel::SqliteConnection);
|
||||
|
||||
/// A serializable wrapper for [`cookbook::recipes::Recipe`]
|
||||
#[derive(Serialize)]
|
||||
pub struct RecipeObject {
|
||||
id: i32,
|
||||
title: String,
|
||||
category: i16,
|
||||
ingredients: String,
|
||||
preparation: String,
|
||||
}
|
||||
|
||||
impl RecipeObject {
|
||||
fn from(conn: &diesel::SqliteConnection, rec: recipes::Recipe) -> Self {
|
||||
Self {
|
||||
id: rec.id,
|
||||
title: rec.title,
|
||||
category: rec.category as i16,
|
||||
ingredients: rec.ingredients
|
||||
.into_manager(conn)
|
||||
.display_lines(),
|
||||
preparation: rec.preparation,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Retrieves data from database and returns all recipes,
|
||||
/// transformed into a js friendly [`RecipeObject`].
|
||||
#[get("/list")]
|
||||
pub fn recipes_list(conn: CookbookDbConn) -> Json<Vec<RecipeObject>> {
|
||||
Json( recipes::load_all(&conn)
|
||||
.into_iter()
|
||||
.map(|r| RecipeObject::from(&conn, r))
|
||||
.collect() )
|
||||
}
|
||||
|
||||
/// Delete a recipe given it's `id`
|
||||
#[get("/delete/<id>")]
|
||||
pub fn delete_recipe(conn: CookbookDbConn, id: i32) -> Json<bool> {
|
||||
Json( recipes::delete(&conn, id) )
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
pub struct TemplateItems {
|
||||
key: (String, String),
|
||||
value: Option<RecipeObject>,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
pub struct TemplateObject {
|
||||
items: Vec<TemplateItems>
|
||||
}
|
||||
|
||||
#[get("/solver/one")]
|
||||
pub fn one_solution(conn: CookbookDbConn) -> Json<TemplateObject> {
|
||||
use planner::{
|
||||
template,
|
||||
solver::{Domain, Problem}
|
||||
};
|
||||
|
||||
let possible_values = recipes::load_all(&conn);
|
||||
let domain = Domain::new(possible_values);
|
||||
let mut problem = Problem::build();
|
||||
for (var, dom, ini) in template::Template::generate_variables(&domain) {
|
||||
problem = problem.add_variable(var, dom, ini);
|
||||
}
|
||||
let mut problem = problem
|
||||
.add_constraint(|_| true)
|
||||
.finish();
|
||||
if let Some(one_result) = problem.solve_one() {
|
||||
Json(TemplateObject {
|
||||
items: one_result
|
||||
.into_iter()
|
||||
.map(|(k,v)| {
|
||||
TemplateItems {
|
||||
key: (format!("{}", k.0), format!("{:?}", k.1)),
|
||||
value: v.map(|r| RecipeObject::from(&conn, r.clone())),
|
||||
}})
|
||||
.collect(),
|
||||
})
|
||||
} else {
|
||||
panic!("No solution at all !");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn main() -> Result<(), Error> {
|
||||
let (allowed_origins, failed_origins) = AllowedOrigins::some(&["http://localhost:8080"]);
|
||||
assert!(failed_origins.is_empty());
|
||||
|
||||
// You can also deserialize this
|
||||
let cors = rocket_cors::CorsOptions {
|
||||
allowed_origins: allowed_origins,
|
||||
allowed_methods: vec![Method::Get].into_iter().map(From::from).collect(),
|
||||
allowed_headers: AllowedHeaders::some(&["Authorization", "Accept"]),
|
||||
allow_credentials: true,
|
||||
..Default::default()
|
||||
}
|
||||
.to_cors()?;
|
||||
|
||||
rocket::ignite()
|
||||
.attach(api::CookbookDbConn::fairing())
|
||||
.mount("/", routes![index, files])
|
||||
.mount("/api", routes![api::recipes_list, api::delete_recipe, api::one_solution])
|
||||
.attach(cors)
|
||||
.launch();
|
||||
Ok(())
|
||||
}
|
||||
29
web/vue/README.md
Normal file
29
web/vue/README.md
Normal file
@@ -0,0 +1,29 @@
|
||||
# vue
|
||||
|
||||
## Project setup
|
||||
```
|
||||
npm install
|
||||
```
|
||||
|
||||
### Compiles and hot-reloads for development
|
||||
```
|
||||
npm run serve
|
||||
```
|
||||
|
||||
### Compiles and minifies for production
|
||||
```
|
||||
npm run build
|
||||
```
|
||||
|
||||
### Run your tests
|
||||
```
|
||||
npm run test
|
||||
```
|
||||
|
||||
### Lints and fixes files
|
||||
```
|
||||
npm run lint
|
||||
```
|
||||
|
||||
### Customize configuration
|
||||
See [Configuration Reference](https://cli.vuejs.org/config/).
|
||||
5
web/vue/babel.config.js
Normal file
5
web/vue/babel.config.js
Normal file
@@ -0,0 +1,5 @@
|
||||
module.exports = {
|
||||
presets: [
|
||||
'@vue/app'
|
||||
]
|
||||
}
|
||||
48
web/vue/package.json
Normal file
48
web/vue/package.json
Normal file
@@ -0,0 +1,48 @@
|
||||
{
|
||||
"name": "vue",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"serve": "vue-cli-service serve",
|
||||
"build": "vue-cli-service build",
|
||||
"lint": "vue-cli-service lint"
|
||||
},
|
||||
"dependencies": {
|
||||
"@mdi/font": "^3.4.93",
|
||||
"bulma": "^0.7.2",
|
||||
"vue": "^2.5.22"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/cli-plugin-babel": "^3.4.0",
|
||||
"@vue/cli-plugin-eslint": "^3.4.0",
|
||||
"@vue/cli-service": "^3.4.0",
|
||||
"babel-eslint": "^10.0.1",
|
||||
"eslint": "^5.8.0",
|
||||
"eslint-plugin-vue": "^5.0.0",
|
||||
"vue-template-compiler": "^2.5.21"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"root": true,
|
||||
"env": {
|
||||
"node": true
|
||||
},
|
||||
"extends": [
|
||||
"plugin:vue/essential",
|
||||
"eslint:recommended"
|
||||
],
|
||||
"rules": {},
|
||||
"parserOptions": {
|
||||
"parser": "babel-eslint"
|
||||
}
|
||||
},
|
||||
"postcss": {
|
||||
"plugins": {
|
||||
"autoprefixer": {}
|
||||
}
|
||||
},
|
||||
"browserslist": [
|
||||
"> 1%",
|
||||
"last 2 versions",
|
||||
"not ie <= 8"
|
||||
]
|
||||
}
|
||||
BIN
web/vue/public/favicon.ico
Normal file
BIN
web/vue/public/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
17
web/vue/public/index.html
Normal file
17
web/vue/public/index.html
Normal file
@@ -0,0 +1,17 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
||||
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
|
||||
<title>vue</title>
|
||||
</head>
|
||||
<body>
|
||||
<noscript>
|
||||
<strong>We're sorry but vue doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
|
||||
</noscript>
|
||||
<div id="app"></div>
|
||||
<!-- built files will be auto injected -->
|
||||
</body>
|
||||
</html>
|
||||
108
web/vue/src/App.vue
Normal file
108
web/vue/src/App.vue
Normal file
@@ -0,0 +1,108 @@
|
||||
<template>
|
||||
<div id="app">
|
||||
<Heading msg="Cook-Assistant"/>
|
||||
<section class="section" id="recipes-view">
|
||||
<div v-if="status.loading" class="notification is-info">Loading...</div>
|
||||
<div v-if="status.error" class="notification is-danger">Error: {{ status.error_msg }}</div>
|
||||
<div class="container">
|
||||
<keep-alive>
|
||||
<RecipeDetails v-if="active_view > -1"
|
||||
v-bind:item="items[active_view]"
|
||||
v-on:close="closeActiveView"
|
||||
v-on:add="addToPlanning" />
|
||||
<RecipeList v-else
|
||||
v-bind:items="items"
|
||||
v-on:open-details="setActiveView" />
|
||||
</keep-alive>
|
||||
</div>
|
||||
</section>
|
||||
<section class="section has-background-grey-lighter" id="planner-view">
|
||||
<h2 class="subtitle">Planning</h2>
|
||||
<Planner ref="weekPlanning" />
|
||||
</section>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import 'bulma/css/bulma.css'
|
||||
import '@mdi/font/css/materialdesignicons.min.css'
|
||||
import Heading from './components/Heading.vue'
|
||||
import RecipeDetails from './components/RecipeDetails.vue'
|
||||
import RecipeList from './components/RecipeList.vue'
|
||||
import Planner from './components/Planner.vue'
|
||||
|
||||
export default {
|
||||
name: 'app',
|
||||
components: {
|
||||
Heading,
|
||||
RecipeDetails,
|
||||
RecipeList,
|
||||
Planner,
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
status: {
|
||||
loading: true,
|
||||
error: false,
|
||||
error_msg: "",
|
||||
},
|
||||
items: [],
|
||||
// Index of the item
|
||||
// activated for details view
|
||||
active_view: -1,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
setActiveView: function(idx) {
|
||||
this.active_view = idx;
|
||||
},
|
||||
closeActiveView: function() {
|
||||
this.active_view = -1;
|
||||
},
|
||||
addToPlanning: function(mealKey, id) {
|
||||
let mealData = this.items.find((recipe) => recipe.id == id);
|
||||
this.$refs.weekPlanning.setMeal(mealKey, mealData);
|
||||
},
|
||||
deleteRecipe: function(id) {
|
||||
fetch("http://localhost:8000/api/delete/" + id)
|
||||
.then((res) => res.json())
|
||||
.then((data) => {
|
||||
if (data === true) {
|
||||
this.items.splice(this.active_view, 1);
|
||||
this.closeActiveView();
|
||||
console.log("Deleted :" + data);
|
||||
} else {
|
||||
console.log("Error deleting");
|
||||
}})
|
||||
.catch((err) => console.error(err));
|
||||
},
|
||||
fetchRecipesList: function() {
|
||||
fetch("http://localhost:8000/api/list")
|
||||
.then((res) => res.json())
|
||||
.then((data) => {
|
||||
console.log(data);
|
||||
this.items = data;
|
||||
this.status.loading = false;
|
||||
})
|
||||
.catch(function(err) {
|
||||
this.status.loading = false;
|
||||
this.status.error = true;
|
||||
this.statue.error_msg = err;
|
||||
console.error(err);
|
||||
});
|
||||
},
|
||||
initWeekPlanning: function() {
|
||||
this.$refs.weekPlanning.fetchSolution();
|
||||
}
|
||||
},
|
||||
mounted () {
|
||||
this.fetchRecipesList();
|
||||
|
||||
console.log("MOUNTED !");
|
||||
}
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
</style>
|
||||
BIN
web/vue/src/assets/logo.png
Normal file
BIN
web/vue/src/assets/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.7 KiB |
27
web/vue/src/components/Heading.vue
Normal file
27
web/vue/src/components/Heading.vue
Normal file
@@ -0,0 +1,27 @@
|
||||
<template>
|
||||
<nav class="navbar is-dark" role="navigation" aria-label="main navigation">
|
||||
<div class="navbar-brand">
|
||||
<a class="navbar-item" href="#">
|
||||
{{ msg }}
|
||||
</a>
|
||||
<a role="button" class="navbar-burger burger" aria-label="menu" aria-expanded="false" data-target="navbarBasicExample">
|
||||
<span aria-hidden="true"></span>
|
||||
<span aria-hidden="true"></span>
|
||||
<span aria-hidden="true"></span>
|
||||
</a>
|
||||
</div>
|
||||
</nav>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'HelloWorld',
|
||||
props: {
|
||||
msg: String
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<!-- Add "scoped" attribute to limit CSS to this component only -->
|
||||
<style scoped>
|
||||
</style>
|
||||
131
web/vue/src/components/Planner.vue
Normal file
131
web/vue/src/components/Planner.vue
Normal file
@@ -0,0 +1,131 @@
|
||||
<template>
|
||||
<div class="box">
|
||||
<button @click="fetchSolution"
|
||||
class="button is-primary is-fullwidth"
|
||||
v-bind:class="{'is-loading': is_loading }">
|
||||
FetchSolution</button>
|
||||
<div v-if="template">
|
||||
<div class="columns is-mobile is-vcentered is-multiline">
|
||||
<div v-for="[day, meals] in itemsGroupedByDay"
|
||||
class="column is-one-quarter-desktop is-half-mobile">
|
||||
<p class="subtitle"><strong> {{ day }}</strong></p>
|
||||
<div v-for="meal in meals">
|
||||
<p v-if="meal.value" class="tags has-addons">
|
||||
<span class="tag is-info">{{ meal.key[1] }}</span>
|
||||
<span class="tag is-light">{{ meal.value.title }}</span>
|
||||
<a @click="unsetMeal(meal.key)"
|
||||
class="tag is-delete"></a>
|
||||
</p>
|
||||
<div v-else class="tag is-warning">Empty</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
const DAYS = ["Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche"];
|
||||
const compareWeekDay = function(entryA, entryB) {
|
||||
return DAYS.indexOf(entryA[0]) - DAYS.indexOf(entryB[0]);
|
||||
}
|
||||
|
||||
const MEALS = ["Breakfast", "Lunch", "Dinner"];
|
||||
const compareMealType = function(mealA, mealB) {
|
||||
return MEALS.indexOf(mealA.key[1]) - MEALS.indexOf(mealB.key[1]);
|
||||
}
|
||||
|
||||
function TemplateSlot(key, value) {
|
||||
this.key = key;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
function Template() {
|
||||
this.items = [];
|
||||
var day;
|
||||
for (day in DAYS) {
|
||||
var meal;
|
||||
for (meal in MEALS) {
|
||||
this.items.push(
|
||||
new TemplateSlot(
|
||||
[DAYS[day], MEALS[meal]], //slotKey
|
||||
null) //value
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Given that Template.items are kept in order, we can
|
||||
/// use a very simple solution (yields slices of 3, with name)
|
||||
Template.prototype.groupedByDays = function() {
|
||||
var i;
|
||||
var grouped = [];
|
||||
for (i = 0; i < this.items.length / 3; i++) {
|
||||
let start = i * 3;
|
||||
let end = (i + 1) * 3;
|
||||
let day = this.items[start].key[0];
|
||||
let slice = this.items.slice(start, end);
|
||||
console.log(day, slice);
|
||||
grouped.push([day, slice]);
|
||||
}
|
||||
return grouped;
|
||||
}
|
||||
|
||||
Template.prototype.findIndexByKey = function(slotKey) {
|
||||
console.log("Search index of key: " + slotKey);
|
||||
var day_idx = DAYS.indexOf(slotKey[0]);
|
||||
var meal_idx = MEALS.indexOf(slotKey[1]);
|
||||
if (day_idx == -1 || meal_idx == -1) {
|
||||
console.error("Index not found");
|
||||
};
|
||||
return day_idx * 3 + meal_idx;
|
||||
}
|
||||
|
||||
Template.prototype.updateJson = function(data) {
|
||||
var i;
|
||||
for (i in data.items) {
|
||||
let item = data.items[i];
|
||||
let idx = this.findIndexByKey(item.key);
|
||||
this.items[idx].value = item.value;
|
||||
}
|
||||
}
|
||||
|
||||
export default {
|
||||
name: 'Planner',
|
||||
data () {
|
||||
var template = new Template();
|
||||
return {
|
||||
template,
|
||||
is_loading: false,
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
fetchSolution: function() {
|
||||
this.is_loading = true;
|
||||
fetch("http://localhost:8000/api/solver/one")
|
||||
.then((res) => {
|
||||
this.is_loading = false;
|
||||
return res.json();}
|
||||
)
|
||||
.then((data) => this.template.updateJson(data))
|
||||
.catch((err) => console.log(err));
|
||||
},
|
||||
unsetMeal: function(mealKey) {
|
||||
let idx = this.template.findIndexByKey(mealKey);
|
||||
// console.log("Unset " + idx);
|
||||
this.template.items[idx].value = null;
|
||||
},
|
||||
setMeal: function(mealKey, mealData) {
|
||||
let idx = this.template.findIndexByKey(mealKey);
|
||||
// console.log("Set " + idx);
|
||||
this.template.items[idx].value = mealData;
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
itemsGroupedByDay: function() {
|
||||
return this.template.groupedByDays();
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
61
web/vue/src/components/RecipeDetails.vue
Normal file
61
web/vue/src/components/RecipeDetails.vue
Normal file
@@ -0,0 +1,61 @@
|
||||
<template>
|
||||
<div class="columns">
|
||||
<div class="column is-narrow">
|
||||
<a @click="$emit('close')"
|
||||
class="has-text-dark">
|
||||
<span class="icon is-large">
|
||||
<i class="mdi mdi-48px mdi-view-list"></i>
|
||||
</span>
|
||||
</a>
|
||||
<br class="is-hidden-mobile"/>
|
||||
<SlotSelect v-on:add="addToPlanning" />
|
||||
</div>
|
||||
<div class="column">
|
||||
<h4 class="title">{{ item.title }}</h4>
|
||||
<h6 class="subtitle">{{ categories[item.category].name }}</h6>
|
||||
<p><strong>Ingredients</strong></p>
|
||||
<ul>
|
||||
<li v-for="ing in item.ingredients.split('\n')">{{ ing }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="column is-narrow">
|
||||
<a @click="$emit('delete', item.id)">
|
||||
<span class="icon is-large has-text-danger">
|
||||
<i class="mdi mdi-48px mdi-delete-forever"></i>
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import _, {categories} from './RecipeList.vue'
|
||||
import SlotSelect from './planner/SlotSelect.vue'
|
||||
|
||||
|
||||
export default {
|
||||
name: 'RecipeDetails',
|
||||
components: {
|
||||
SlotSelect,
|
||||
},
|
||||
props: {
|
||||
item: {
|
||||
type: Object,
|
||||
required: true,
|
||||
default () {
|
||||
return {id: 0, title: "", category: 0, ingredients: ""};
|
||||
},
|
||||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
categories: categories,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
addToPlanning: function(slotKey) {
|
||||
this.$emit('add', slotKey, this.item.id);
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
79
web/vue/src/components/RecipeList.vue
Normal file
79
web/vue/src/components/RecipeList.vue
Normal file
@@ -0,0 +1,79 @@
|
||||
<template>
|
||||
<div class="container">
|
||||
<div v-if="active_category == -1" class="columns is-multiline is-mobile">
|
||||
<div v-for="c in categories" :key="c.id" class="column is-one-quarter-desktop is-half-tablet">
|
||||
<button @click="setActiveCategory(c.id)"
|
||||
class="button is-large is-info is-fullwidth button-block">
|
||||
<span class="icon is-large">
|
||||
<i class="mdi mdi-24px" v-bind:class="c.icon"></i>
|
||||
</span>
|
||||
<br />
|
||||
<p>{{ c.name }}</p></button>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="columns">
|
||||
<div class="column is-narrow">
|
||||
<a @click="setActiveCategory(-1)" class="has-text-dark">
|
||||
<span class="icon is-large" >
|
||||
<i class="mdi mdi-48px mdi-view-grid"></i>
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
<div class="column">
|
||||
<h2 class="title">{{ categories[active_category].name }}</h2>
|
||||
<ul class="content">
|
||||
<li v-for="item in displayed" :key="item.id" class="has-text-left">
|
||||
<a href=""
|
||||
@click.prevent="$emit(
|
||||
'open-details',
|
||||
items.findIndex((i) => i.id ==item.id))">
|
||||
{{ item.title }}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export const categories = [
|
||||
{id: 0, name: "Petit-déjeuner", icon: "mdi-food-croissant"},
|
||||
{id: 1, name: "Entrée", icon: "mdi-bowl"},
|
||||
{id: 2, name: "Plat principal", icon: "mdi-food"},
|
||||
{id: 3, name: "Dessert", icon: "mdi-cupcake"}
|
||||
];
|
||||
|
||||
|
||||
export default {
|
||||
name: 'RecipeList',
|
||||
props: ["items"],
|
||||
data () {
|
||||
return {
|
||||
active_category: -1,
|
||||
categories,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
setActiveCategory: function(id) {
|
||||
this.active_category = id;
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
displayed: function() {
|
||||
return this.items.filter(
|
||||
rec => rec.category == this.active_category
|
||||
);
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.button-block {
|
||||
min-height: 150px;
|
||||
}
|
||||
|
||||
.li {
|
||||
list-style: circle;
|
||||
}
|
||||
</style>
|
||||
53
web/vue/src/components/planner/SlotSelect.vue
Normal file
53
web/vue/src/components/planner/SlotSelect.vue
Normal file
@@ -0,0 +1,53 @@
|
||||
<template>
|
||||
<div class="box">
|
||||
<div class="columns">
|
||||
<div class="column">
|
||||
<div class="field">
|
||||
<div class="control is-expanded">
|
||||
<div class="select is-small is-fullwidth">
|
||||
<select v-model="selected_day">
|
||||
<option value="Lundi">Lundi</option>
|
||||
<option value="Mardi">Mardi</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="field">
|
||||
<p class="control">
|
||||
<div class="select is-small">
|
||||
<select v-model="selected_meal">
|
||||
<option value="Breakfast">Breakfast</option>
|
||||
<option value="Lunch">Lunch</option>
|
||||
</select>
|
||||
</div>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="column">
|
||||
<a @click="$emit('add', getSelectedKey)"
|
||||
class="has-text-success">
|
||||
<span class="icon is-large">
|
||||
<i class="mdi mdi-36px mdi-table-plus"></i>
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'SlotSelect',
|
||||
data () {
|
||||
return {
|
||||
selected_day: "Lundi",
|
||||
selected_meal: "Breakfast",
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
getSelectedKey: function() {
|
||||
return [this.selected_day, this.selected_meal];
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
8
web/vue/src/main.js
Normal file
8
web/vue/src/main.js
Normal file
@@ -0,0 +1,8 @@
|
||||
import Vue from 'vue'
|
||||
import App from './App.vue'
|
||||
|
||||
Vue.config.productionTip = false
|
||||
|
||||
new Vue({
|
||||
render: h => h(App),
|
||||
}).$mount('#app')
|
||||
Reference in New Issue
Block a user