Introduce VolumeFingerprint and related types, improving type safety …

…and consistency across the module
spacedriveapp · Nov 4, 2024 · 63757a3 · 63757a3
1 parent a50db68
commit 63757a3
Show file tree

Hide file tree

Showing 10 changed files with 460 additions and 271 deletions.
diff --git a/core/src/api/volumes.rs b/core/src/api/volumes.rs
@@ -1,6 +1,6 @@
 use super::{utils::library, Ctx, R};
 use crate::library::Library;
-use crate::volume::VolumeEvent;
+use crate::volume::{VolumeEvent, VolumeFingerprint};
 use rspc::alpha::AlphaRouter;
 use serde::Deserialize;
 use specta::Type;
@@ -10,7 +10,7 @@ use tokio_stream::StreamExt;
 
 #[derive(Type, Deserialize)]
 pub struct TrackVolumeInput {
-	pub volume_id: Vec<u8>,
+	pub volume_id: VolumeFingerprint,
 }
 
 pub(crate) fn mount() -> AlphaRouter<Ctx> {
@@ -56,12 +56,22 @@ pub(crate) fn mount() -> AlphaRouter<Ctx> {
 						.map_err(Into::into)
 				}),
 		)
+		// .procedure(
+		// 	"listByDevice",
+		// 	R.with2(library())
+		// 		.query(|(node, library), _: ()| async move {
+		// 			node.volumes
+		// 				.list_by_device(library)
+		// 				.await
+		// 				.map_err(Into::into)
+		// 		}),
+		// )
 		.procedure(
 			"unmount",
 			R.with2(library())
 				.mutation(|(node, _), fingerprint: Vec<u8>| async move {
 					node.volumes
-						.unmount_volume(fingerprint)
+						.unmount_volume(VolumeFingerprint(fingerprint).into())
 						.await
 						.map_err(Into::into)
 				}),