First version that works in a real project

Author: proofrock

.dockerignore

@@ -0,0 +1 @@
+target

CHANGES_FROM_WS4SQLITE.md

@@ -3,10 +3,12 @@
 - URL to contact for POST is now `http://<host>:<port>/<db_name&gt/exec` (note the `/exec/`)
 - Read-only mode is performed via the `query_only` PRAGMA
 - Even if the database is read only, it's possible to perform init macros
+- YAML file, when explicitly given, is separated with a "::" from the db file/name (to solve ambiguities in windows)
 - Stored Statements are now prefixed with `^`, not `#`, because it can be used in macros that are defined in the YAML file, where `#` would be a comment
 - ScheduledTasks are replaced with the new macro and backup subsystems
     - Avoid use of scheduler logic, as it is very language-dependent and may be different from cron, with which the user is probably familiar
 - The '%s' in the backup template is optional
 - The backup files' pattern is specified as a backup directory, being intended that all the files in it are subject to deletion
 - HTTP authentication is now named HTTP_BASIC (possible future JWT implementation)
-- disableWALMode is now a more generic journalMode, for when WAL2 will be released
+- disableWALMode is now a more generic journalMode, for when WAL2 will be released
+- it is possible to specify the index file when serving a directory

Dockerfile

@@ -0,0 +1,30 @@
+# FROM rust:latest as build
+# 
+# WORKDIR /app
+# COPY . .
+# 
+# RUN cargo build
+# RUN pwd
+# RUN ls -al target/debug
+# --release
+
+FROM alpine:latest as build
+
+RUN apk add --no-cache rust cargo sqlite-libs sqlite-dev
+
+COPY . /build
+WORKDIR /build
+RUN ["cargo", "build", "--release"]
+
+# Now copy it into our base image.
+FROM alpine:latest
+
+COPY --from=build /build/target/release/sqliterg /
+
+# TODO why libgcc?
+RUN apk add --no-cache sqlite-libs libgcc
+
+EXPOSE 12321
+VOLUME /data
+
+CMD ["/sqliterg"]

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright (c) 2023-, Germano Rizzo <oss /AT/ germanorizzo /DOT/ it>
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -27,3 +27,6 @@ update:
 
 lint:
 	cargo clippy 2> clippy_results.txt
+
+docker:
+	docker buildx build . --no-cache -t germanorizzo/sqliterg:latest --push

TODO.md

@@ -1,3 +1,4 @@
+- Manage VACUUM
 - Complete startup messages (for macros at init, ecc.)
 - Comments
 - Documentation
@@ -19,3 +20,4 @@
 # Test
 
 - CORS
+- ~

src/commandline.rs

@@ -29,9 +29,9 @@ pub struct AppConfig {
         help = "The host to bind"
     )]
     pub bind_host: String,
-    #[arg(long, value_name = "DB_PATH", help = "Repeatable; paths of file-based databases", num_args = 0..)]
+    #[arg(long, value_name = "DB_PATH", help = "Repeatable; paths of file-based databases [format: \"dbFilePath[::configFilePath]\"]", num_args = 0..)]
     pub db: Vec<String>,
-    #[arg(long, value_name = "MEM_DB", help = "Repeatable; config for memory-based databases (format: ID[:configFilePath])", num_args = 0..)]
+    #[arg(long, value_name = "MEM_DB", help = "Repeatable; config for memory-based databases [format: \"ID[::configFilePath]\"]", num_args = 0..)]
     pub mem_db: Vec<String>,
     #[arg(
         short,
@@ -47,6 +47,13 @@ pub struct AppConfig {
         help = "A directory to serve with builtin HTTP server"
     )]
     pub serve_dir: Option<String>,
+    #[arg(
+        long,
+        value_name = "FILE",
+        help = "If --serve-dir is configured, the file to treat as index.",
+        default_value = "index.html"
+    )]
+    pub index_file: String,
 }
 
 pub fn parse_cli() -> AppConfig {

src/commons.rs

@@ -139,8 +139,8 @@ pub fn resolve_tilde(p: &String) -> String {
     shellexpand::tilde(p).into_owned()
 }
 
-pub fn split_on_first_colon(input: &str) -> (String, String) {
-    let mut parts = input.splitn(2, ':');
+pub fn split_on_first_double_colon(input: &str) -> (String, String) {
+    let mut parts = input.splitn(2, "::");
     let first_part = parts.next().unwrap_or_default().to_string();
     let second_part = parts.next().unwrap_or_default().to_string();
 

src/main.rs

@@ -70,11 +70,13 @@ async fn main() -> std::io::Result<()> {
     let db_map = compose_db_map(&cli);
 
     if let Some(sd) = &cli.serve_dir {
-        println!("  - serving directory: {}", sd);
+        println!("- serving directory: {}", sd);
+        println!("  - with index file: {}", &cli.index_file);
     };
 
     let app_lambda = move || {
         let dir = cli.serve_dir.to_owned();
+        let index_file = cli.index_file.to_owned();
         let mut a = App::new();
         for (db_name, db_conf) in db_map.iter() {
             let scop: Scope = scope(format!("/{}", db_name.to_owned()).deref())
@@ -99,7 +101,7 @@ async fn main() -> std::io::Result<()> {
         }
 
         if let Some(dir) = dir {
-            a = a.service(Files::new("/", dir));
+            a = a.service(Files::new("/", dir).index_file(index_file));
         };
         a
     };

src/main_config.rs

@@ -21,7 +21,8 @@ use rusqlite::Connection;
 use crate::backup::{bootstrap_backup, periodic_backup};
 use crate::commandline::AppConfig;
 use crate::commons::{
-    abort, assert, file_exists, if_abort_rusqlite, is_dir, resolve_tilde, split_on_first_colon,
+    abort, assert, file_exists, if_abort_rusqlite, is_dir, resolve_tilde,
+    split_on_first_double_colon,
 };
 use crate::db_config::{parse_dbconf, DbConfig, Macro};
 use crate::macros::{bootstrap_db_macros, count_macros, periodic_macro, resolve_macros};
@@ -38,17 +39,22 @@ pub struct Db {
     pub macros: HashMap<String, Macro>,
 }
 
-fn to_base_name(path: &String) -> String {
-    let path = Path::new(&path);
-    path.file_stem().unwrap().to_str().unwrap().to_string()
-}
+fn split_path(path: &str) -> (String, String, String) {
+    // returns (db_path, yaml, db_name)
+    let (mut db_path, mut yaml) = split_on_first_double_colon(path);
+    db_path = resolve_tilde(&db_path);
+    let path = Path::new(&db_path);
+    if yaml.is_empty() {
+        let file_stem = path.file_stem().unwrap().to_str().unwrap();
+        let yaml_file_name = format!("{file_stem}.yaml");
+        let yaml_path = path.with_file_name(yaml_file_name);
+        yaml = yaml_path.to_str().unwrap().to_string();
+    }
+    let yaml = resolve_tilde(&yaml);
+
+    let db_name = path.file_stem().unwrap().to_str().unwrap().to_string();
 
-fn to_yaml_path(path: &String) -> String {
-    let path = Path::new(&path);
-    let file_stem = path.file_stem().unwrap().to_str().unwrap();
-    let yaml_file_name = format!("{file_stem}.yaml");
-    let yaml_path = path.with_file_name(yaml_file_name);
-    yaml_path.to_str().unwrap().to_string()
+    (db_path, yaml, db_name)
 }
 
 fn compose_single_db(
@@ -202,11 +208,9 @@ pub fn compose_db_map(cl: &AppConfig) -> HashMap<String, Db> {
     let mut db_map = HashMap::new();
     let mut mutexes = HashMap::new();
     for db_path in &cl.db {
-        let db_path = resolve_tilde(db_path);
-        let db_name = to_base_name(&db_path);
+        let (db_path, yaml, db_name) = split_path(db_path);
         check_db_name(&db_name, &db_map);
 
-        let yaml = to_yaml_path(&db_path);
         let is_new_db = !file_exists(&db_path);
 
         let (db_cfg, conn) =
@@ -216,7 +220,7 @@ pub fn compose_db_map(cl: &AppConfig) -> HashMap<String, Db> {
         mutexes.insert(db_name.to_owned(), Mutex::new(conn));
     }
     for db in &cl.mem_db {
-        let (db_name, yaml) = split_on_first_colon(db);
+        let (db_name, yaml) = split_on_first_double_colon(db);
         check_db_name(&db_name, &db_map);
 
         let yaml = resolve_tilde(&yaml);