refactor(zone_zfs): convert zfs crate to singleton

Refactored the zone_zfs to be a singleton with a psudo-builder pattern
rocket is now managing the singleton, instead of the config.

1 files changed, 7 insertions, 22 deletions

diff --git a/zone_zfs/src/snapshot.rs b/zone_zfs/src/snapshot.rs
index 14fafb4..b0fabb9 100644
--- a/zone_zfs/src/snapshot.rs
+++ b/zone_zfs/src/snapshot.rs
@@ -2,7 +2,7 @@ use chrono::{DateTime, Utc};
 use std::{ffi::OsString, path::PathBuf, process::Command};
 use tracing::warn;
 
-use crate::{file_system::FileSystem, Error, Result};
+use crate::{error::Error, error::Result, file_system::FileSystem, Config};
 
 #[derive(Debug)]
 pub struct Snapshot {
@@ -38,32 +38,17 @@ impl TryFrom<&str> for Snapshot {
 }
 
 impl Snapshot {
-    pub fn clone_into_file_system(
-        &self,
-        name: String,
-        mountpoint: Option<PathBuf>,
-    ) -> Result<FileSystem> {
-        let new_fs = FileSystem {
-            value: PathBuf::from(&self.file_system.value).join(name).into(),
-            mountpoint,
-        };
+    pub fn clone_into_file_system(&self, new_fs: PathBuf) -> Result<FileSystem> {
+        let mut file_system = self.file_system.clone();
+        file_system.value.push(&new_fs);
 
-        let mut command = Command::new("zfs");
-
-        command.arg("clone");
-
-        if let Some(mp) = &new_fs.mountpoint {
-            command
-                .arg("-o")
-                .arg(format!("mountpoint={}", mp.to_string_lossy()));
-        };
-
-        command
+        Command::new("zfs")
+            .arg("clone")
             .arg(&self.value)
             .arg(&new_fs)
             .status()?
             .success()
-            .then(|| new_fs)
+            .then(|| file_system)
             .ok_or_else(|| Error::Snapshot(format!("Failed to clone snapshot: {:?}", self)))
     }
 }