feat: add a function to init properly app library
This commit is contained in:
parent
8fdb74dbae
commit
caa3ce71ec
@ -16,6 +16,8 @@ tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread"] }
|
|||||||
tower-http = { version = "0.5.2", features = ["fs"] }
|
tower-http = { version = "0.5.2", features = ["fs"] }
|
||||||
tower-livereload = "0.9.3"
|
tower-livereload = "0.9.3"
|
||||||
|
|
||||||
|
utils = { path = "../utils" }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
cargo-watch = "8.5.1"
|
cargo-watch = "8.5.1"
|
||||||
systemfd = "0.4.0"
|
systemfd = "0.4.0"
|
||||||
|
@ -2,8 +2,13 @@ use std::path::PathBuf;
|
|||||||
|
|
||||||
use axum::http::{StatusCode, Uri};
|
use axum::http::{StatusCode, Uri};
|
||||||
use axum_htmx::AutoVaryLayer;
|
use axum_htmx::AutoVaryLayer;
|
||||||
|
use thiserror::Error;
|
||||||
use tower_http::services::ServeDir;
|
use tower_http::services::ServeDir;
|
||||||
|
|
||||||
|
use ::utils::config::{load_config, ConfigError};
|
||||||
|
|
||||||
|
pub mod db;
|
||||||
|
|
||||||
mod menu;
|
mod menu;
|
||||||
mod pages;
|
mod pages;
|
||||||
|
|
||||||
@ -11,6 +16,18 @@ async fn fallback(uri: Uri) -> (StatusCode, String) {
|
|||||||
(StatusCode::NOT_FOUND, format!("No route for {uri}"))
|
(StatusCode::NOT_FOUND, format!("No route for {uri}"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Error, Debug)]
|
||||||
|
pub enum InitError {
|
||||||
|
#[error(transparent)]
|
||||||
|
ConfigError(#[from] ConfigError),
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn init() -> Result<(), InitError> {
|
||||||
|
load_config(None)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
pub async fn get_router(assets_path: PathBuf) -> axum::Router<()> {
|
pub async fn get_router(assets_path: PathBuf) -> axum::Router<()> {
|
||||||
axum::Router::new()
|
axum::Router::new()
|
||||||
.nest_service("/assets", ServeDir::new(assets_path))
|
.nest_service("/assets", ServeDir::new(assets_path))
|
||||||
|
@ -10,7 +10,7 @@ use tokio::net::TcpListener;
|
|||||||
use tower_livereload::predicate::Predicate;
|
use tower_livereload::predicate::Predicate;
|
||||||
use tower_livereload::LiveReloadLayer;
|
use tower_livereload::LiveReloadLayer;
|
||||||
|
|
||||||
use ::app::get_router;
|
use ::app::{get_router, init, InitError};
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
#[derive(Error, Debug)]
|
||||||
pub enum AppError {
|
pub enum AppError {
|
||||||
@ -20,6 +20,8 @@ pub enum AppError {
|
|||||||
NotifyWatcher(#[from] notify::Error),
|
NotifyWatcher(#[from] notify::Error),
|
||||||
#[error("Missing environment variable {var}")]
|
#[error("Missing environment variable {var}")]
|
||||||
MissingEnvVar { var: &'static str },
|
MissingEnvVar { var: &'static str },
|
||||||
|
#[error("Error while initialising the app")]
|
||||||
|
Initialisation(#[from] InitError),
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Nous filtrons les requêtes de `htmx` pour ne pas inclure le script _JS_ qui gère le rechargement
|
/// Nous filtrons les requêtes de `htmx` pour ne pas inclure le script _JS_ qui gère le rechargement
|
||||||
@ -61,6 +63,8 @@ fn get_livereload_layer(
|
|||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> Result<(), AppError> {
|
async fn main() -> Result<(), AppError> {
|
||||||
|
init()?;
|
||||||
|
|
||||||
let manifest_dir = env::var("CARGO_MANIFEST_DIR").map_err(|_| AppError::MissingEnvVar {
|
let manifest_dir = env::var("CARGO_MANIFEST_DIR").map_err(|_| AppError::MissingEnvVar {
|
||||||
var: "CARGO_MANIFEST_DIR",
|
var: "CARGO_MANIFEST_DIR",
|
||||||
})?;
|
})?;
|
||||||
|
@ -10,6 +10,8 @@ use thiserror::Error;
|
|||||||
use tokio::sync::{Mutex, MutexGuard};
|
use tokio::sync::{Mutex, MutexGuard};
|
||||||
use tower::{Service, ServiceExt};
|
use tower::{Service, ServiceExt};
|
||||||
|
|
||||||
|
use ::app::init;
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
#[derive(Error, Debug)]
|
||||||
pub enum DesktopError {
|
pub enum DesktopError {
|
||||||
#[error("Axum error:\n{0}")]
|
#[error("Axum error:\n{0}")]
|
||||||
@ -46,6 +48,8 @@ async fn process_tauri_request(
|
|||||||
|
|
||||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
||||||
pub fn run() {
|
pub fn run() {
|
||||||
|
init().expect("Failed to initialize the application");
|
||||||
|
|
||||||
tauri::Builder::default()
|
tauri::Builder::default()
|
||||||
.setup(|app| {
|
.setup(|app| {
|
||||||
let assets_path: PathBuf = app
|
let assets_path: PathBuf = app
|
||||||
|
Loading…
Reference in New Issue
Block a user