Initial model + some various changes

.gitignore

@@ -6,3 +6,4 @@ backend/data/recipes.sqlite-journal
 style.css.map
 backend/static/style.css
 backend/file.db
+*.sqlite

Cargo.toml

@@ -6,6 +6,8 @@ members = [
 ]
 
 [profile.release]
+strip = true
 codegen-units = 1
 lto = true
-# opt-level = 'z'  # Optimize for size.
+# Tell `rustc` to optimize for small code size.
+# opt-level = "s"

README.md

@@ -1,9 +1,30 @@
-== Autoreload
+# Use cases
 
-https://actix.rs/docs/autoreload/
+## Create a recipe
+(A group is automatically created)
 
+## Create a groupe
 
-== Documentation
+## Move a group
+
+## Delete a group
+
+## Create a step
+
+## Move a step
+
+## Delete a step
+
+# Technical
+
+## Useful URLs
 
 * Rust patterns : https://github.com/rust-unofficial/patterns/tree/master/patterns
 * Rusqlite (SQLite) : https://docs.rs/rusqlite/0.20.0/rusqlite/
+
+## How to develop
+
+Autoreload: https://actix.rs/docs/autoreload/
+
+
+

TODO.md

@@ -1,5 +1,6 @@
 * (WIP) Enable Logging to file.
-* Define the recipes model (UML).
+* Describe the use cases.
+* Define the recipes model (SYSML).
 * Implement the model as relational with SQLite.
     * Create and update functions.
 * Define the UI (mockups).

backend/Cargo.toml

@@ -2,29 +2,26 @@
 name = "recipes"
 version = "1.0.0"
 authors = ["Grégory Burri <greg.burri@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-actix-web = "2"
-actix-rt = "1"
-actix-files = "0.2"
+actix-web = "4"
+actix-files = "0.6"
 serde = { version = "1.0", features = [ "derive" ] }
-listenfd = "0.3" # To watch file modifications and automatically launch a build process (only used in dev/debug).
-ron = "0.6" # Rust object notation, to load configuration files.
-itertools = "0.9"
 
-r2d2_sqlite = "0.16" # Connection pool with rusqlite (SQLite access).
+ron = "0.8" # Rust object notation, to load configuration files.
+itertools = "0.10"
+
+env_logger = "0.9"
+
+r2d2_sqlite = "0.21" # Connection pool with rusqlite (SQLite access).
 r2d2 = "0.8"
 
 futures = "0.3" # Needed by askam with the feature 'with-actix-web'.
 
 common = { path = "../common" }
 
-[dependencies.rusqlite]
-version = "0.23"
-features = ["bundled"]
+askama = { version = "0.11", features = ["with-actix-web", "mime", "mime_guess"] }
+askama_actix = "0.13"
 
-# Template system.
-[dependencies.askama]
-version = "0.9"
-features = ["with-actix-web"]
+rusqlite = { version = "0.28", features = ["bundled"] }

backend/build.rs

@@ -5,21 +5,37 @@ What is build here:
  - Compile the SASS file to CSS file.
 */
 
-use std::process::Command;
+use std::{ env, process::{ Command, Output }, path::Path };
+
+fn exists_in_path<P>(filename: P) -> bool
+    where P: AsRef<Path> {
+        for path in env::split_paths(&env::var_os("PATH").unwrap()) {
+            if path.join(&filename).is_file() { return true; }
+        }
+    false
+}
 
 fn main() {
     println!("cargo:rerun-if-changed=style.scss");
 
-    let output =
-        Command::new("sass")
-            .arg("./style.scss")
-            .arg("./static/style.css")
+    fn run_sass(command: &mut Command) -> Output {
+        command
+            .arg("style.scss")
+            .arg("static/style.css")
             .output()
-            .expect("Unable to compile SASS file, install SASS, see https://sass-lang.com/");
+            .expect("Unable to compile SASS file, install SASS, see https://sass-lang.com/")
+    }
+
+    let output =
+        if exists_in_path("sass.bat") {
+            run_sass(Command::new("cmd").args(&["/C", "sass.bat"]))
+        } else {
+            run_sass(&mut Command::new("sass"))
+        };
 
     if !output.status.success() {
-        //panic!("Unable to compile SASS file, install SASS, see https://sass-lang.com/")
+        // SASS will put the error in the file.
         let error = std::fs::read_to_string("./static/style.css").expect("unable to read style.css");
-        panic!(error);
+        panic!("{}", error);
     }
 }

backend/launch_debug.ps1

@@ -1,2 +1,2 @@
 # To launch RUP and watching source. See https://actix.rs/docs/autoreload/.
-systemfd --no-pid -s http::8082 -- cargo watch -x run
+cargo watch -x run

backend/sql/version_1.sql

@@ -0,0 +1,64 @@
+-- Version 1 is the initial structure.
+CREATE TABLE Version (
+    id INTEGER PRIMARY KEY,
+    version INTEGER NOT NULL UNIQUE,
+    datetime DATETIME
+);
+
+CREATE TABLE User (
+    id INTEGER PRIMARY KEY,
+    email TEXT NOT NULL,
+    password TEXT NOT NULL, -- Hashed and salted.
+    name TEXT NOT NULL
+);
+
+CREATE TABLE Recipe (
+    id INTEGER PRIMARY KEY,
+    user_id INTEGER NOT NULL,
+    title TEXT NOT NULL,
+    estimate_time INTEGER,
+    description DATETIME,
+
+    FOREIGN KEY(user_id) REFERENCES User(id)
+);
+
+CREATE TABLE Quantity (
+    id INTEGER PRIMARY KEY,
+    value REAL,
+    unit TEXT
+);
+
+CREATE TABLE Ingredient (
+    id INTEGER PRIMARY KEY,
+    name TEXT NOT NULL,
+    quantity_id INTEGER,
+    input_step_id INTEGER NOT NULL,
+
+    FOREIGN KEY(quantity_id) REFERENCES Quantity(id),
+    FOREIGN KEY(input_step_id) REFERENCES Step(id)
+);
+
+CREATE TABLE [Group] (
+    id INTEGER PRIMARY KEY,
+    name TEXT
+);
+
+CREATE TABLE Step (
+    id INTEGER PRIMARY KEY,
+    action TEXT NOT NULL,
+    group_id INTEGER NOT NULL,
+
+    FOREIGN KEY(group_id) REFERENCES [Group](id)
+);
+
+CREATE TABLE IntermediateSubstance (
+    id INTEGER PRIMARY KEY,
+    name TEXT NOT NULL,
+    quantity_id INTEGER,
+    output_step_id INTEGER NOT NULL,
+    input_step_id INTEGER NOT NULL,
+
+    FOREIGN KEY(quantity_id) REFERENCES Quantity(id),
+    FOREIGN KEY(output_step_id) REFERENCES Step(id),
+    FOREIGN KEY(input_step_id) REFERENCES Step(id)
+);

backend/src/consts.rs

@@ -1,3 +1,4 @@
-pub static FILE_CONF: &str = "conf.ron";
-pub static DB_DIRECTORY: &str = "data";
-pub static DB_FILENAME: &str = "recipes.sqlite";
+pub const FILE_CONF: &str = "conf.ron";
+pub const DB_DIRECTORY: &str = "data";
+pub const DB_FILENAME: &str = "data/recipes.sqlite";
+pub const SQL_FILENAME: &str = "sql/version_{VERSION}.sql";

backend/src/db.rs

@@ -1,27 +1,24 @@
-use std::path::Path;
-use std::fs;
-
-//use rusqlite::types::ToSql;
-//use rusqlite::{Connection, Result, NO_PARAMS};
-
-//extern crate r2d2;
-//extern crate r2d2_sqlite;
-//extern crate rusqlite;
-
-use r2d2_sqlite::SqliteConnectionManager;
-use r2d2::Pool;
-
-#[derive(Debug)]
-pub enum DbError {
-    SqliteError(rusqlite::Error),
-    R2d2Error(r2d2::Error),
-    UnsupportedVersion(i32),
-}
+use crate::consts::SQL_FILENAME;
 
 use super::consts;
 
+use std::{fs::{self, File}, path::Path, io::Read};
+
+//use rusqlite::types::ToSql;
+//use rusqlite::{Connection, Result, NO_PARAMS};
+use r2d2::Pool;
+use r2d2_sqlite::SqliteConnectionManager;
+
 const CURRENT_DB_VERSION: u32 = 1;
 
+#[derive(Debug)]
+pub enum DBError {
+    SqliteError(rusqlite::Error),
+    R2d2Error(r2d2::Error),
+    UnsupportedVersion(u32),
+    Other(String),
+}
+
 pub struct Connection {
     //con: rusqlite::Connection
     pool: Pool<SqliteConnectionManager>
@@ -32,20 +29,20 @@ pub struct Recipe {
     pub id: i32,
 }
 
-impl std::convert::From<rusqlite::Error> for DbError  {
+impl std::convert::From<rusqlite::Error> for DBError  {
     fn from(error: rusqlite::Error) -> Self {
-        DbError::SqliteError(error)
+        DBError::SqliteError(error)
     }
 }
 
-impl std::convert::From<r2d2::Error> for DbError  {
+impl std::convert::From<r2d2::Error> for DBError  {
     fn from(error: r2d2::Error) -> Self {
-        DbError::R2d2Error(error)
+        DBError::R2d2Error(error)
     }
 }
 
 impl Connection {
-    pub fn new() -> Result<Connection, DbError> {
+    pub fn new() -> Result<Connection, DBError> {
 
         let data_dir = Path::new(consts::DB_DIRECTORY);
 
@@ -53,7 +50,7 @@ impl Connection {
             fs::DirBuilder::new().create(data_dir).unwrap();
         }
 
-        let manager = SqliteConnectionManager::file("file.db");
+        let manager = SqliteConnectionManager::file(consts::DB_FILENAME);
         let pool = r2d2::Pool::new(manager).unwrap();
 
         let connection = Connection { pool };
@@ -65,7 +62,7 @@ impl Connection {
      * Called after the connection has been established for creating or updating the database.
      * The 'Version' table tracks the current state of the database.
      */
-    fn create_or_update(self: &Self) -> Result<(), DbError> {
+    fn create_or_update(self: &Self) -> Result<(), DBError> {
         // let connection = Connection::new();
         // let mut stmt = connection.sqlite_con.prepare("SELECT * FROM versions ORDER BY date").unwrap();
         // let mut stmt = connection.sqlite_con.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='versions'").unwrap();
@@ -74,13 +71,14 @@ impl Connection {
         let mut con = self.pool.get()?;
         let tx = con.transaction()?;
 
+        // Version 0 corresponds to an empty database.
         let mut version = {
             match tx.query_row(
                     "SELECT [name] FROM [sqlite_master] WHERE [type] = 'table' AND [name] = 'Version'",
-                        rusqlite::NO_PARAMS,
+                        [],
                         |row| row.get::<usize, String>(0)
                     ) {
-                Ok(_) => tx.query_row("SELECT [version] FROM [Version]", rusqlite::NO_PARAMS, |row| row.get(0)).unwrap_or_default(),
+                Ok(_) => tx.query_row("SELECT [version] FROM [Version]", [], |row| row.get(0)).unwrap_or_default(),
                 Err(_) => 0
             }
         };
@@ -94,45 +92,33 @@ impl Connection {
         Ok(())
     }
 
-    fn update_to_next_version(version: i32, tx: &rusqlite::Transaction) -> Result<bool, DbError> {
-        match version {
-            0 => {
-                println!("Update to version 1...");
+    fn update_to_next_version(current_version: u32, tx: &rusqlite::Transaction) -> Result<bool, DBError> {
+        let next_version = current_version + 1;
 
-                // Initial structure.
-                tx.execute_batch(
-                    "
-                    CREATE TABLE [Version] (
-                        [id] INTEGER PRIMARY KEY,
-                        [version] INTEGER NOT NULL UNIQUE,
-                        [datetime] INTEGER DATETIME
-                    );
-
-                    CREATE TABLE [Recipe] (
-                        [id] INTEGER PRIMARY KEY,
-                        [title] INTEGER NOT NULL,
-                        [description] INTEGER DATETIME
-                    );
-                    "
-                )?;
-
-                /*
-                tx.execute(
-                    "
-                    INSERT INTO Version
-                    ",
-                    rusqlite::NO_PARAMS
-                );*/
-
-                Ok(true)
+        if next_version <= CURRENT_DB_VERSION {
+            println!("Update to version {}...", next_version);
         }
 
-            // Current version.
-            1 =>
-                Ok(false),
+        fn ok(updated: bool) -> Result<bool, DBError> {
+            if updated {
+                println!("Version updated");
+            }
+            Ok(updated)
+        }
+
+        match next_version {
+            1 => {
+                tx.execute_batch(&load_sql_file(next_version)?)?;
+
+                ok(true)
+            }
+
+            // Version 1 doesn't exist yet.
+            2 =>
+                ok(false),
 
             v =>
-                Err(DbError::UnsupportedVersion(v)),
+                Err(DBError::UnsupportedVersion(v)),
         }
     }
 
@@ -140,3 +126,11 @@ impl Connection {
 
     }
 }
+
+fn load_sql_file(version: u32) -> Result<String, DBError> {
+    let sql_file = SQL_FILENAME.replace("{VERSION}", &version.to_string());
+    let mut file = File::open(&sql_file).map_err(|err| DBError::Other(format!("Cannot open SQL file ({}): {}", &sql_file, err.to_string())))?;
+    let mut sql = String::new();
+    file.read_to_string(&mut sql).map_err(|err| DBError::Other(format!("Cannot read SQL file ({}) : {}", &sql_file, err.to_string())))?;
+    Ok(sql)
+}

backend/src/main.rs

@@ -4,14 +4,14 @@ use std::{fs::File, env::args};
 use actix_files as fs;
 use actix_web::{get, web, Responder, middleware, App, HttpServer, HttpResponse, HttpRequest, web::Query};
 
-use askama::Template;
-use listenfd::ListenFd;
+use askama_actix::Template;
 use ron::de::from_reader;
 use serde::Deserialize;
 
 use itertools::Itertools;
 
 mod consts;
+mod model;
 mod db;
 
 #[derive(Template)]
@@ -53,10 +53,13 @@ fn get_exe_name() -> String {
     first_arg[first_arg.rfind(sep).unwrap()+1..].to_string()
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     if process_args() { return Ok(()) }
 
+    std::env::set_var("RUST_LOG", "actix_web=debug");
+    env_logger::init();
+
     println!("Starting Recipes as web server...");
 
     let config: Config = {
@@ -73,11 +76,11 @@ async fn main() -> std::io::Result<()> {
 
     std::env::set_var("RUST_LOG", "actix_web=info");
 
-    let mut listenfd = ListenFd::from_env();
     let mut server =
         HttpServer::new(
             || {
                 App::new()
+                    .wrap(middleware::Logger::default())
                     .wrap(middleware::Compress::default())
                     .service(home_page)
                     .service(view_page)
@@ -85,12 +88,7 @@ async fn main() -> std::io::Result<()> {
             }
         );
 
-    server =
-        if let Some(l) = listenfd.take_tcp_listener(0).unwrap() {
-            server.listen(l).unwrap()
-        } else {
-            server.bind(&format!("0.0.0.0:{}", config.port)).unwrap()
-        };
+    server = server.bind(&format!("0.0.0.0:{}", config.port)).unwrap();
 
     server.run().await
 }

backend/src/model.rs

@@ -1,10 +1,14 @@
 struct Recipe {
-   ingredients: Vec<Ingredient>,
+    title: String,
+    estimate_time: Option<i32>, // [min].
+    difficulty: Option<Difficulty>,
+
+    //ingredients: Vec<Ingredient>, // For four people.
     process: Vec<Group>,
 }
 
 struct Ingredient {
-    quantity: Quantity,
+    quantity: Option<Quantity>,
     name: String,
 }
 
@@ -12,8 +16,9 @@ struct Quantity {
     value: f32,
     unit: String,
 }
+
 struct Group {
-    name: String,
+    name: Option<String>,
     steps: Vec<Step>,
 }
 
@@ -30,5 +35,12 @@ struct IntermediateSubstance {
 
 enum StepInput {
     Ingredient(Ingredient),
-    IntermediateSubstance,
+    IntermediateSubstance(IntermediateSubstance),
+}
+
+enum Difficulty {
+    Unknown,
+    Easy,
+    Medium,
+    Hard,
 }

backend/templates/base.html

@@ -8,10 +8,10 @@
     </head>
 
     <body>
-        <div class="header-container"><h1><a href="/">RECIPES</a></h1></div>
+        <div class="header-container"><h1><a href="/">~ RECIPES ~</a></h1></div>
         <div class="main-container">
             {% block main_container %}{% endblock %}
         </div>
-        <div class="footer-container">gburri - 2020</div>
+        <div class="footer-container">gburri - 2022</div>
     </body>
 </html>

backend/templates/home.html

@@ -1,5 +1,7 @@
 {% extends "base_with_list.html" %}
 
 {% block content %}
-HOME
+
+*** HOME - PUT SOMETHING HERE ***
+
 {% endblock %}

common/Cargo.toml

@@ -2,7 +2,7 @@
 name = "common"
 version = "0.1.0"
 authors = ["Grégory Burri <greg.burri@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

deploy.ps1

@@ -38,8 +38,9 @@ Copy-SSH -source "./target/arm-unknown-linux-gnueabihf/release/recipes" -destina
 Invoke-SSH "rm -rf recipes/static"
 Copy-SSH -source "./backend/static/" -destination "~/recipes/"
 
+Copy-SSH -source "./backend/sql/" -destination "~/recipes/"
+
 Invoke-SSH "chmod u+x recipes/recipes"
-Invoke-SSH "strip recipes/recipes"
 Invoke-SSH "sudo systemctl start recipes"
 
 Write-Output "Deployment finished"