From 3a223aa0848c8d7763e2fff4649e24ceff12d7c4 Mon Sep 17 00:00:00 2001
From: voidarc <admin@voidarc.co.uk>
Date: Fri, 21 Aug 2026 16:34:34 +0100
Subject: [PATCH] fixed matching order so that shelf matches before files in
 current dir

---
 src/utils.rs | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/utils.rs b/src/utils.rs
index d7b5b67..1d71fe8 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -90,26 +90,26 @@ pub fn match_file_name(file_name: &str, shelf: &mut Shelf) -> Result<usize, std:
     // Turn given file into string
     let match_path = Path::new(file_name);
 
-    // If the file path doesnt exist
-    if !match_path.exists() {
-        let file_ending = match_path.file_name().expect("Error getting file name");
-        // For every entry in current shelf
-        for (i, path) in shelf.content.iter().enumerate() {
-            // Turn the string back into a path
-            let shelf_path = Path::new(path).canonicalize()?;
-
-            if shelf_path.ends_with(file_ending) {
-                return Ok(i);
-            };
-        }
-    } // else if it does
-
-    let cannonical_path = match_path.canonicalize()?;
-
+    // Check if there is a match in the shelf before taking the path verbatim
+    let file_ending = match_path.file_name().expect("Error getting file name");
+    // For every entry in current shelf
     for (i, path) in shelf.content.iter().enumerate() {
+        // Turn the string back into a path
         let shelf_path = Path::new(path).canonicalize()?;
-        if cannonical_path == shelf_path {
+
+        if shelf_path.ends_with(file_ending) {
             return Ok(i);
+        };
+    }
+
+    if match_path.exists() {
+        let cannonical_path = match_path.canonicalize()?;
+
+        for (i, path) in shelf.content.iter().enumerate() {
+            let shelf_path = Path::new(path).canonicalize()?;
+            if cannonical_path == shelf_path {
+                return Ok(i);
+            }
         }
     }