Refactor volume management to include library awareness, enhance fing…

…erprint handling, and improve system volume interactions
spacedriveapp · Nov 3, 2024 · 378edcc · 378edcc
1 parent bd00623
commit 378edcc
Show file tree

Hide file tree

Showing 9 changed files with 227 additions and 232 deletions.
diff --git a/core/src/api/volumes.rs b/core/src/api/volumes.rs
@@ -17,15 +17,16 @@ pub(crate) fn mount() -> AlphaRouter<Ctx> {
 	R.router()
 		.procedure(
 			"list",
-			R.query(|node, _: ()| async move {
-				match node.volumes.list_system_volumes().await {
-					Ok(volumes) => Ok(volumes),
-					Err(e) => {
-						tracing::error!("Error listing volumes: {:?}", e);
-						Err(e.into())
+			R.with2(library())
+				.query(|(node, library), _: ()| async move {
+					match node.volumes.list_system_volumes(library).await {
+						Ok(volumes) => Ok(volumes),
+						Err(e) => {
+							tracing::error!("Error listing volumes: {:?}", e);
+							Err(e.into())
+						}
 					}
-				}
-			}),
+				}),
 		)
 		.procedure(
 			"track",