johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-26 19:57:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve error handling for loading the library

Browse source
This commit is contained in:
Elias Projahn 2025-03-23 09:59:28 +01:00
parent f977cac3fd
commit d12e6a02a4
2 changed files with 64 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/library.rs
View file

@ -13,7 +13,7 @@ use adw::{
prelude::*,
subclass::prelude::*,
};
use anyhow::{anyhow, Result};
use anyhow::{anyhow, Context, Result};
use chrono::prelude::*;
use diesel::{dsl::exists, prelude::*, sql_types, QueryDsl, SqliteConnection};
use once_cell::sync::Lazy;
@ -55,21 +55,6 @@ mod imp {
SIGNALS.as_ref()
}
fn constructed(&self) {
self.parent_constructed();
let db_path = PathBuf::from(&self.folder.get().unwrap()).join("musicus.db");
let connection = db::connect(db_path.to_str().unwrap()).unwrap();
if self
.connection
.set(Arc::new(Mutex::new(connection)))
.is_err()
{
panic!("connection should not be set");
}
}
}
}
@ -78,10 +63,13 @@ glib::wrapper! {
}
impl Library {
pub fn new(path: impl AsRef<Path>) -> Self {
glib::Object::builder()
pub fn new(path: impl AsRef<Path>) -> Result<Self> {
let obj: Self = glib::Object::builder()
.property("folder", path.as_ref().to_str().unwrap())
.build()
.build();
obj.init()?;
Ok(obj)
}
/// Import from a library archive.
@ -1736,6 +1724,24 @@ impl Library {
obj.emit_by_name::<()>("changed", &[]);
});
}
fn init(&self) -> Result<()> {
let db_path = PathBuf::from(&self.folder()).join("musicus.db");
let connection = db::connect(
db_path
.to_str()
.ok_or_else(|| anyhow!("Failed to convert libary path to string"))?,
)
.context("Failed to connect to music library database")?;
self.imp()
.connection
.set(Arc::new(Mutex::new(connection)))
.map_err(|_| anyhow!("Library already initialized"))?;
Ok(())
}
}
#[derive(Clone, Default, Debug)]