Add sqlite db

.gitignore

@@ -1,3 +1,4 @@
 **/target
 **/Cargo.lock
 **/.env
+husni-portfolio.db**

README.md

@@ -3,9 +3,10 @@ My Portfolio webiste
 
 ## Tools I use in this repo
 * [Rust Programming Language](https://www.rust-lang.org/)
-* [Actix](https://actix.rs/)
+* [Axum](https://github.com/tokio-rs/axum/tree/main)
 * [Askama](https://github.com/djc/askama)
 * [Markdown-rs](https://github.com/wooorm/markdown-rs)
+* [Octocrab](https://github.com/XAMPPRocky/octocrab)
 * [Taskfile](https://taskfile.dev/)
 * [TailwindCSS](https://tailwindcss.com/)
 

Taskfile.yml

@@ -1,4 +1,6 @@
 version: '3'
+dotenv:
+  - '.env'
 
 tasks:
   test:
@@ -8,9 +10,22 @@ tasks:
   run:
     summary: Run application with hot-reload
     cmds:
-      # Add tailwindcss build for hot reloading
-      - tailwindcss -i ./statics/input.css -o ./statics/styles.css
-      - cargo watch -s 'export $(cat .env | xargs) && cargo run -- -release'
+      - cargo watch -s 'tailwindcss -i ./statics/input.css -o ./statics/styles.css && export $(cat .env | xargs) && cargo run -- -release'
+
+  sqlx-create:
+    summary: Create db with sqlx
+    cmds:
+      - sqlx db create --database-url $DATABASE_URL
+  sqlx-migrate-run:
+    summary: Migrate db with sqlx
+    cmds:
+      - sqlx migrate run --source internal/migrations --database-url $DATABASE_URL
+  sqlx-migrate-add:
+    summary: Creata new migration db with sqlx. Please pass migration description too
+    vars:
+      DESCRIPTION: '{{index .MATCH 0}}'
+    cmds:
+      - sqlx migrate add --source internal/migrations --database_url $DATABASE_URL {{.DESCRIPTION}}
 
   docker-build:
     summary: Build Docker Image

cmd/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "cmd"
-version = "0.1.3"
+version = "0.2.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-internal = { path = "../internal", version = "0.1.3"}
+internal = { path = "../internal", version = "0.2.0"}
 tokio = { version = "1.0", features = ["full"] }

cmd/src/main.rs

@@ -1,8 +1,6 @@
-use internal::{self, config::Config, handler::handler};
+use internal::app::app;
 
 #[tokio::main]
 async fn main() -> std::io::Result<()> {
-    let config = Config::from_envar();
-    handler(config).await;
-    Ok(())
+    Ok(app().await)
 }

env.example

@@ -2,11 +2,8 @@ SVC_ENDPOINT="127.0.0.1"
 SVC_PORT="8080"
 LOG_LEVEL="info"
 ENVIRONMENT="dev"
-POSTGRES_USER="admin"
-POSTGRES_PASSWORD="admin-password"
-POSTGRES_DB="testing"
-POSTGRES_HOST="127.0.0.1"
-POSTGRES_PORT="5432"
+DATA_SOURCE=sqlite
+DATABASE_URL="sqlite:husni-portfolio.db"
 GITHUB_OWNER=husni-zuhdi
 GITHUB_REPO=husni-blog-resources
 GITHUB_BRANCH=main

internal/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "internal"
-version = "0.1.3"
+version = "0.2.0"
 edition = "2021"
 build = "build.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-axum = "0.7.5"
+axum = { version = "0.7.5", features = ["macros"] }
 tokio = { version = "1.0", features = ["full"] }
 # tracing = "0.1" # Might not need this
 # tracing-subscriber = { version = "0.3", features = ["env-filter"] } # Might not need this
@@ -23,6 +23,10 @@ test-log = "0.2.16"
 octocrab = "0.39.0"
 http-body-util = "0.1.2"
 regex = "1.10.6"
+sqlx = { version = "=0.8.1", features = ["sqlite", "runtime-tokio"] }
+async-trait = "0.1.81"
+dyn-clone = "1.0.17"
+# rusqlite = "=0.32.1"
 
 [build-dependencies]
 anyhow = "1.0.86"

internal/migrations/20240901103916_initial_migration.sql

@@ -0,0 +1,8 @@
+-- Add migration script here
+CREATE TABLE IF NOT EXISTS blogs (
+    id          TEXT    PRIMARY KEY NOT NULL,
+    name        TEXT                NOT NULL,
+    source      TEXT                NOT NULL,
+    filename    TEXT                NOT NULL,
+    body        TEXT                NOT NULL
+);

internal/src/api/filesystem.rs

@@ -0,0 +1,113 @@
+use crate::model::blog::{
+    Blog, BlogBody, BlogFilename, BlogId, BlogMetadata, BlogName, BlogSource,
+};
+use crate::repo::api::ApiRepo;
+use crate::utils::capitalize;
+use async_trait::async_trait;
+use log::{debug, info};
+use markdown::{to_html_with_options, CompileOptions, Constructs, Options, ParseOptions};
+use std::fs;
+use std::path::PathBuf;
+
+#[derive(Clone)]
+pub struct FilesystemApiUseCase {
+    pub blogs_dir: String,
+}
+
+#[async_trait]
+impl ApiRepo for FilesystemApiUseCase {
+    async fn list_metadata(&self) -> Vec<BlogMetadata> {
+        let read_dir = fs::read_dir(self.blogs_dir.clone()).expect("Failed to read dir");
+        let blogs_metadata: Vec<BlogMetadata> = read_dir
+            // Collect Blog Filename
+            .filter_map(|blog_path| {
+                let blog_path_buf = blog_path.expect("Failed to get blog DirEntry").path();
+                Self::process_blog_path(&self, blog_path_buf)
+            })
+            // Collect Blog Metadata
+            .map(|blog_filename| Self::process_blog_metadata(&self, blog_filename))
+            .collect();
+        blogs_metadata
+    }
+    async fn fetch(&self, metadata: BlogMetadata) -> Blog {
+        let body = Self::process_markdown(metadata.filename.0.clone())
+            .expect("Failed to convert markdown to html");
+        debug!("Blog Body with Id {}: {}", &metadata.id.0, &body);
+
+        Blog {
+            id: metadata.id,
+            name: metadata.name,
+            source: BlogSource::Filesystem,
+            filename: metadata.filename,
+            body: BlogBody(body),
+        }
+    }
+}
+
+impl FilesystemApiUseCase {
+    pub async fn new(blogs_dir: String) -> FilesystemApiUseCase {
+        FilesystemApiUseCase { blogs_dir }
+    }
+    /// Process Blog Path from a PathBuf
+    /// Returned an Option String
+    fn process_blog_path(&self, blog_path_buf: PathBuf) -> Option<String> {
+        if blog_path_buf.is_file() {
+            blog_path_buf
+                .file_name()
+                .expect("Failed to get filename")
+                .to_str()
+                .map(|str| str.to_owned())
+        } else {
+            None
+        }
+    }
+    /// Process Blog Metadata from Blog Filename
+    /// Returned BlogMetadata
+    fn process_blog_metadata(&self, blog_filename: String) -> BlogMetadata {
+        let (id, name_init) = blog_filename
+            .split_once("-")
+            .expect("Failed to split filename into id and name");
+        let name_lower = name_init
+            .replace("_", " ")
+            .split_once(".")
+            .expect("Failed to remove file extension.")
+            .0
+            .to_string();
+        let name = capitalize(&name_lower);
+        let filename = format!("{}{}", self.blogs_dir, &blog_filename);
+        info!("Blog Metadata with Id {} has been processed.", &id);
+        debug!("Blog Name with Id {}: {}", &id, &name);
+        debug!("Blog Filename with Id {}: {}", &id, &filename);
+
+        BlogMetadata {
+            id: BlogId(id.to_string()),
+            name: BlogName(name),
+            filename: BlogFilename(filename),
+        }
+    }
+    /// Process Markdown
+    /// take String of filename and convert markdown file into html with option
+    /// return String of converted markdown in html or String of error
+    fn process_markdown(filename: String) -> Result<String, String> {
+        let body_md =
+            fs::read_to_string(filename.clone()).expect("Failed to read markdown blog file");
+        debug!("Markdown Body for filename {}: {}", &filename, body_md);
+
+        let html = to_html_with_options(
+            &body_md,
+            &Options {
+                parse: ParseOptions {
+                    constructs: Constructs {
+                        // In case you want to activeat frontmatter in the future
+                        // frontmatter: true,
+                        ..Constructs::gfm()
+                    },
+                    ..ParseOptions::gfm()
+                },
+                compile: CompileOptions::gfm(),
+            },
+        )
+        .expect("Failed to convert html with options");
+        Ok(html)
+    }
+}