RUST: Run the diesel run migration command on a non existing db and generate...

RUST: Run the diesel run migration command on a non existing db and generate the schema.rs file if needed

NOTE: A build.rs file should not write files in the source folder, but
      it's easier to do it that way for now. We migh want to do
      something with cmake otherwise...

README.md

@@ -60,7 +60,13 @@ If you are developping for lektor, you will need the
 [clang-format](https://releases.llvm.org/download.html) command line utility,
 for a beautifull and uniform C++ code style.
 [Here](https://clang.llvm.org/docs/ClangFormatStyleOptions.html) is the list of
-all the options to put in the `.clang-format` file.
+all the options to put in the `.clang-format` file. You will also need diesel
+for all the database stuff, use the following command to install diesel cli with
+the correct sqlite support on your system:
+
+```sh
+cargo install diesel_cli --no-default-features --features sqlite
+```
 
 ### Building instructions
 

src/rust/liblektor-rs/Cargo.toml

@@ -8,4 +8,4 @@ crate-type = [ "staticlib" ]
 
 [dependencies]
 libc   = "0.2.0"
-diesel = { version = "2", features = [ "sqlite" ] }
+diesel = { version = "2", default-features = false, features = [ "sqlite" ] }
\ No newline at end of file

src/rust/liblektor-rs/build.rs

+use std::{
+    env,
+    path::Path,
+    process::{Command, Stdio},
+};
+
+macro_rules! cmd {
+    ($exec: literal => $args: tt) => {{
+        let output = Command::new($exec)
+            .args($args)
+            .stdout(Stdio::piped())
+            .spawn()
+            .expect(format!("failed to run {}", $exec).as_str())
+            .wait_with_output()
+            .expect(format!("failed to wait for {}", $exec).as_str());
+        assert!(output.status.success());
+    }};
+}
+
+fn rerun_directory<T: AsRef<Path> + ?Sized>(dir: &T) {
+    println!("cargo:rerun-if-changed={}", dir.as_ref().to_string_lossy());
+    for entry in std::fs::read_dir(dir).unwrap() {
+        let path = entry.expect("Couldn't access file in src directory").path();
+        if path.is_dir() {
+            rerun_directory(&path);
+        }
+    }
+}
+
+fn main() {
+    // Because the target folder was fixed, we know where the source folder is!
+    let out_dir = env::var_os("OUT_DIR").unwrap();
+    let out_dir = Path::new(&out_dir);
+    let db_path = out_dir
+        .join("kara.db")
+        .canonicalize()
+        .expect("failed to canonicalize the sample kara database path");
+    let source_dir = out_dir
+        .join("../../../../../liblektor-rs")
+        .canonicalize()
+        .expect("failed to canonicalize the source path");
+    let migration_dir = source_dir
+        .join("migrations")
+        .canonicalize()
+        .expect("failed to canonicalize the migration dir");
+
+    let _ = std::fs::remove_file(&db_path);
+    env::set_var("DATABASE_URL", db_path);
+    env::set_current_dir(source_dir).expect("failed to cwd to source folder!");
+    cmd!( "diesel" => [ "migration", "run" ] );
+
+    rerun_directory(&migration_dir);
+    println!("cargo:rerun-if-changed=build.rs");
+}

src/rust/liblektor-rs/diesel.toml

@@ -2,7 +2,7 @@
 # see https://diesel.rs/guides/configuring-diesel-cli
 
 [print_schema]
-file = "src/schema.rs"
+file = "src/database/schema.rs"
 
 [migrations_directory]
 dir = "migrations"

src/rust/liblektor-rs/migrations/2022-09-30-204512_create_posts/down.sql → src/rust/liblektor-rs/migrations/2022-09-30-204512_initial/down.sql

@@ -5,5 +5,4 @@ DROP TABLE kara_makers;
 DROP TABLE kara_tag;
 DROP TABLE tag;
 DROP TABLE kara_tags;
-DROP TABLE queue_1;
 DROP TABLE history;

src/rust/liblektor-rs/migrations/2022-09-30-204512_create_posts/up.sql → src/rust/liblektor-rs/migrations/2022-09-30-204512_initial/up.sql

 CREATE TABLE repo
-  ( name TEXT    NOT NULL
-  , id   INTEGER NOT NULL
+  ( id   INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT
+  , name TEXT    NOT NULL UNIQUE
   );
 
 CREATE TABLE repo_kara
@@ -29,7 +29,7 @@ CREATE TABLE kara_makers
 
 CREATE TABLE tag
   ( id   INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT
-  , name TEXT    NOT NULL
+  , name TEXT    NOT NULL UNIQUE
   );
 
 CREATE TABLE kara_tags
@@ -39,13 +39,7 @@ CREATE TABLE kara_tags
   , PRIMARY KEY (kara_id, tag_id, value)
   );
 
-CREATE TABLE queue_1
-  ( id       INTEGER NOT NULL REFERENCES kara(id) ON DELETE CASCADE
-  , position INTEGER NOT NULL CHECK(position > 0)
-  );
-
 CREATE TABLE history
   ( id      INTEGER NOT NULL REFERENCES kara(id) ON DELETE CASCADE
   , epoch   INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT
-  , PRIMARY KEY (id, epoch)
   );

src/rust/liblektor-rs/src/database/mod.rs

+pub(self) use diesel::prelude::*;
+
+pub mod models;
+pub mod schema;

src/rust/liblektor-rs/src/database/models.rs

+use crate::database::{schema::*, *};
+
+#[derive(Insertable)]
+#[diesel(table_name = kara)]
+pub struct NewKara<'a> {
+    pub song_title: &'a str,
+    pub song_type: &'a str,
+    pub song_origin: &'a str,
+    pub source_name: &'a str,
+    pub language: &'a str,
+}

src/rust/liblektor-rs/src/schema.rs → src/rust/liblektor-rs/src/database/schema.rs

 // @generated automatically by Diesel CLI.
 
+diesel::table! {
+    history (epoch) {
+        id -> Integer,
+        epoch -> Integer,
+    }
+}
+
 diesel::table! {
     kara (id) {
         id -> Integer,
+        is_dl -> Bool,
         song_title -> Text,
         song_type -> Text,
         song_origin -> Text,
         source_name -> Text,
         language -> Text,
+        kara_hash -> Text,
     }
 }
 
@@ -26,6 +35,21 @@ diesel::table! {
     }
 }
 
+diesel::table! {
+    repo (id) {
+        id -> Integer,
+        name -> Text,
+    }
+}
+
+diesel::table! {
+    repo_kara (repo_id, repo_kara_id, local_kara_id) {
+        repo_id -> Integer,
+        repo_kara_id -> Integer,
+        local_kara_id -> Integer,
+    }
+}
+
 diesel::table! {
     tag (id) {
         id -> Integer,
@@ -33,13 +57,19 @@ diesel::table! {
     }
 }
 
+diesel::joinable!(history -> kara (id));
 diesel::joinable!(kara_makers -> kara (id));
 diesel::joinable!(kara_tags -> kara (kara_id));
 diesel::joinable!(kara_tags -> tag (tag_id));
+diesel::joinable!(repo_kara -> kara (local_kara_id));
+diesel::joinable!(repo_kara -> repo (repo_id));
 
 diesel::allow_tables_to_appear_in_same_query!(
+    history,
     kara,
     kara_makers,
     kara_tags,
+    repo,
+    repo_kara,
     tag,
 );

src/rust/liblektor-rs/src/lib.rs

-#![allow(dead_code)]
+#![allow(dead_code, unused_imports)]
 
 mod compat;
 mod database;
-mod mkv;
 mod module;
 
 pub(crate) use compat::*;

src/rust/liblektor-rs/src/mkv.rs

-use crate::*;
-
-#[repr(C)]
-pub(crate) struct LktKaraMetadata {
-    song_name: [c_char; LEKTOR_TAG_MAX],
-    source_name: [c_char; LEKTOR_TAG_MAX],
-    category: [c_char; LEKTOR_TAG_MAX],
-    language: [c_char; LEKTOR_TAG_MAX],
-    author_name: [c_char; LEKTOR_TAG_MAX],
-    song_type: [c_char; LEKTOR_TAG_MAX],
-    song_number: c_int,
-}