From 9f544eccb0c59e33f15cfbbeef2e7f779ef93c88 Mon Sep 17 00:00:00 2001 From: quexeky Date: Thu, 17 Oct 2024 17:17:19 +1100 Subject: [PATCH] Semantic naming changes --- desktop/src-tauri/src/db.rs | 6 +++--- desktop/src-tauri/src/lib.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop/src-tauri/src/db.rs b/desktop/src-tauri/src/db.rs index b5b49e49..e58e5d9a 100644 --- a/desktop/src-tauri/src/db.rs +++ b/desktop/src-tauri/src/db.rs @@ -39,7 +39,7 @@ pub type DatabaseInterface = pub static DATA_ROOT_DIR: LazyLock = LazyLock::new(|| BaseDirs::new().unwrap().data_dir().join("drop")); -pub fn setup() -> DatabaseInterface { +pub fn set_up_database() -> DatabaseInterface { let db_path = DATA_ROOT_DIR.join("drop.db"); let apps_base_dir = DATA_ROOT_DIR.join("apps"); @@ -62,8 +62,8 @@ pub fn setup() -> DatabaseInterface { db } -pub fn is_set_up() -> bool { - return !DB.borrow_data().unwrap().base_url.is_empty(); +pub fn database_is_set_up() -> bool { + !DB.borrow_data().unwrap().base_url.is_empty() } pub fn fetch_base_url() -> Url { diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs index c88e20b6..7c52f672 100644 --- a/desktop/src-tauri/src/lib.rs +++ b/desktop/src-tauri/src/lib.rs @@ -54,7 +54,7 @@ fn fetch_state(state: tauri::State<'_, Mutex>) -> Result AppState { env_logger::Builder::from_env(Env::default().default_filter_or("info")).init(); - let is_set_up = db::is_set_up(); + let is_set_up = db::database_is_set_up(); if !is_set_up { return AppState { status: AppStatus::NotConfigured, @@ -71,7 +71,7 @@ fn setup() -> AppState { } } -pub static DB: LazyLock = LazyLock::new(db::setup); +pub static DB: LazyLock = LazyLock::new(db::set_up_database); #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() {