`8dc3328`

fix: Keep Both paste now properly selects and renames file

- Fix directory copy to use unique name (was using original name)
- Make select_by_name more robust: try exact, case-insensitive, path match
- Add fallback status message with F2 hint if auto-select fails
- Show "Pasted as 'name' - press F2 to rename" when select fails

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 3 months ago

SHA: 8dc3328fb668b8cbd2ed308add1d2673bcc68147
Parents: 38b547c
Tree: 98a4f4e

2 changed files

Status	File	+	-
M	`garfield/src/app.rs`	27	2
M	`garfield/src/ui/tab.rs`	8	1

garfield/src/app.rsmodified

                  let unique_name = make_unique_name(&pending.dest_dir, &name_str);
                  let final_dest = pending.dest_dir.join(&unique_name);
 +                // Perform the copy/move with the unique name
                  let result = match pending.operation {
                      ClipboardOperation::Copy => {
                          if conflict_file.is_dir() {
 -                            garfield::core::copy_path(&conflict_file, &pending.dest_dir)
 +                            // For directories, copy then rename to unique name
 +                            match garfield::core::copy_path(&conflict_file, &pending.dest_dir) {
 +                                Ok(copied_path) => {
 +                                    // Rename to unique name if different
 +                                    if copied_path != final_dest {
 +                                        std::fs::rename(&copied_path, &final_dest)
 +                                            .map(|_| final_dest.clone())
 +                                            .or(Ok(copied_path))
 +                                    } else {
 +                                        Ok(copied_path)
 +                                    }
 +                                }
 +                                Err(e) => Err(e),
 +                            }
                          } else {
                              std::fs::copy(&conflict_file, &final_dest).map(|_| final_dest.clone())
+                         }
                      self.refresh();
                      // Select the newly pasted file and start rename
 -                    if let Some(pane) = self.focused_pane_mut() {
 +                    let found = if let Some(pane) = self.focused_pane_mut() {
                          if let Some(tab) = pane.active_tab_mut() {
                              // Find and select the file by name
                              if tab.select_by_name(&unique_name) {
                                  // Start rename with the suggested name pre-populated
                                  tab.start_rename_with_text(&unique_name);
 +                                true
 +                            } else {
 +                                false
+                             }
 +                        } else {
 +                            false
+                         }
 +                    } else {
 +                        false
 +                    };
++
 +                    if !found {
 +                        self.status_bar.set_status_message(format!("Pasted as '{}' - press F2 to rename", unique_name));
+                     }
                      // Store remaining conflicts if not apply_to_all

garfield/src/ui/tab.rsmodified

      /// Select a file by name. Returns true if found and selected.
      pub fn select_by_name(&mut self, name: &str) -> bool {
          let entries = self.visible_entries();
 -        if let Some(index) = entries.iter().position(|e| e.name == name) {
 +        // Try exact match first
 +        let index = entries.iter().position(|e| e.name == name)
 +            // Then try case-insensitive match
 +            .or_else(|| entries.iter().position(|e| e.name.eq_ignore_ascii_case(name)))
 +            // Then try matching the end of the path
 +            .or_else(|| entries.iter().position(|e| e.path.ends_with(name)));
++
 +        if let Some(index) = index {
              match self.view_mode {
                  ViewMode::List => self.list_view.set_focused(index),
                  ViewMode::Grid => self.grid_view.set_focused(index),