Software-Mac/spacedrive
Software-Mac/spacedrive
1
0
Fork 0
mirror of https://github.com/spacedriveapp/spacedrive synced 2024-07-04 12:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix first time library creation

Browse source
This commit is contained in:
Jamie Pine 2022-03-31 22:37:18 -07:00
parent 9ffaa87618
commit 077bf760ee
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/src/db/mod.rs
View file

@ -9,22 +9,18 @@ pub enum DatabaseError {
MissingConnection,
#[error("Unable find current_library in the client config")]
MalformedConfig,
#[error("Unable to initialise the Prisma client")]
#[error("Unable to initialize the Prisma client")]
ClientError(#[from] prisma::NewClientError),
}
pub async fn create_connection() -> Result<PrismaClient, DatabaseError> {
let config = state::client::get();
let current_library = config
.libraries
.iter()
.find(|l| l.library_uuid == config.current_library_uuid)
.ok_or(DatabaseError::MalformedConfig)?;
let current_library = config.get_current_library();
let path = current_library.library_path.clone();
// TODO: Error handling when brendan adds it to prisma-client-rust
let client = prisma::new_client_with_url(&format!("file:{}", &path)).await?;
Ok(client)
}

2
core/src/state/client.rs
View file

@ -76,8 +76,6 @@ impl ClientState {
let file = fs::File::open(config_path)?;
let reader = BufReader::new(file);
let data = serde_json::from_reader(reader)?;
println!("data:::: {:?}", data);
// assign to self
*self = data;
Ok(())