From 498dd2db9b0904004564c309c25a9125b6011864 Mon Sep 17 00:00:00 2001
From: qwjyh <urataw421@gmail.com>
Date: Wed, 13 Mar 2024 05:36:19 +0900
Subject: [PATCH] update storage bind

---
 README.md          |  1 +
 src/cmd_storage.rs | 31 ++++++++++++++++---------------
 src/main.rs        |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 4849a60..19b9410 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@
   - [x] storage add online
   - [ ] storage add directory
   - [ ] storage list
+- [x] update storage bind command
 - [ ] add storage remove command
 - [ ] add sync subcommand
 - [ ] add check subcommand
diff --git a/src/cmd_storage.rs b/src/cmd_storage.rs
index d37a8da..53bb1d4 100644
--- a/src/cmd_storage.rs
+++ b/src/cmd_storage.rs
@@ -259,15 +259,22 @@ pub(crate) fn cmd_storage_bind(
             .list
             .get_mut(&storage_name)
             .context(format!("No storage has name {}", storage_name))?;
-        let old_alias = storage
-            .local_info(&device)
-            .context(format!("Failed to get LocalInfo for {}", storage.name()))?
-            .alias()
-            .clone();
+        if let Some(localinfo) = storage.local_info(&device) {
+            return Err(anyhow!(
+                "The storage {} is already bounded on this device as {}",
+                storage.name(),
+                localinfo.alias(),
+            ));
+        }
         // TODO: get mount path for directory automatically?
-        storage.bound_on_device(new_alias, mount_point, &device)?;
+        storage.bound_on_device(new_alias.clone(), mount_point, &device)?;
         // trace!("storage: {}", &storage);
-        format!("{} to {}", old_alias, storage.name())
+        format!(
+            "{} is now {} on the device {}",
+            storage.name(),
+            new_alias,
+            device.name()
+        )
     };
     trace!("bound new system name to the storage");
     trace!("storages: {:#?}", storages);
@@ -277,15 +284,9 @@ pub(crate) fn cmd_storage_bind(
     add_and_commit(
         &repo,
         &Path::new(storages::STORAGESFILE),
-        &format!(
-            "Bound new storage name to physical drive ({})",
-            commit_comment
-        ),
+        &format!("Bound new storage name to storage ({})", commit_comment),
     )?;
-    println!(
-        "Bound new storage name to physical drive ({})",
-        commit_comment
-    );
+    println!("Bound new storage name to storage ({})", commit_comment);
     Ok(())
 }
 
diff --git a/src/main.rs b/src/main.rs
index ede7776..303f66d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -73,7 +73,7 @@ fn main() -> Result<()> {
             match storage.command {
                 StorageCommands::Add(storageargs) => {
                     cmd_storage::cmd_storage_add(storageargs.command, repo, &config_dir)?
-                },
+                }
                 StorageCommands::List { long } => cmd_storage::cmd_storage_list(&config_dir, long)?,
                 StorageCommands::Bind {
                     storage: storage_name,