mirror/spacedrive
1
0
Fork 0
mirror of https://github.com/spacedriveapp/spacedrive.git synced 2026-05-04 13:26:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

ordering for create library is wrong (#970)

Browse Source
This commit is contained in:
Oscar Beaumont
2023-06-19 11:01:56 +02:00
committed by GitHub
parent dc84dd384d
commit d70c24db49
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/src/library/manager.rs
View File

@@ -167,6 +167,7 @@ impl LibraryManager {
config_path,
node_context.clone(),
&subscribers,
None,
)
.await?,
);
@@ -234,24 +235,19 @@ impl LibraryManager {
config_path,
self.node_context.clone(),
&self.subscribers,
Some(node::Create {
pub_id: config.node_id.as_bytes().to_vec(),
name: node_cfg.name.clone(),
platform: Platform::current() as i32,
date_created: Local::now().into(),
_params: vec![
node::identity::set(Some(config.identity.clone())),
node::node_peer_id::set(Some(node_cfg.keypair.peer_id().to_string())),
],
}),
)
.await?;
// Create node
node::Create {
pub_id: config.node_id.as_bytes().to_vec(),
name: node_cfg.name.clone(),
platform: Platform::current() as i32,
date_created: Local::now().into(),
_params: vec![
node::identity::set(Some(config.identity.clone())),
node::node_peer_id::set(Some(node_cfg.keypair.peer_id().to_string())),
],
}
.to_query(&library.db)
.exec()
.await?;
debug!("Loaded library '{id:?}'");
// Run seeders
@@ -389,6 +385,7 @@ impl LibraryManager {
config_path: PathBuf,
node_context: NodeContext,
subscribers: &RwLock<Vec<Box<dyn SubscriberFn>>>,
create: Option<node::Create>,
) -> Result<Library, LibraryManagerError> {
let db_path = db_path.as_ref();
let db_url = format!(
@@ -399,6 +396,10 @@ impl LibraryManager {
);
let db = Arc::new(db::load_and_migrate(&db_url).await?);
if let Some(create) = create {
create.to_query(&db).exec().await?;
}
let node_config = node_context.config.get().await;
let config = LibraryConfig::load_and_migrate(
&config_path,