From c4a36c0cd4b3b6072a9e423ee63218a09ff74ad3 Mon Sep 17 00:00:00 2001
From: abrown38 <a.brown@epcc.ed.ac.uk>
Date: Thu, 13 Aug 2026 10:08:02 +0100
Subject: [PATCH] remove duplicate code and update error message

---
 transfer.sh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/transfer.sh b/transfer.sh
index 36f4a60..66e5ae7 100755
--- a/transfer.sh
+++ b/transfer.sh
@@ -96,19 +96,12 @@ function transfer::import() {
 
     local file=${filepath##*/} # strip directories from path
 
-    # ensure file has correct format
-    if [[ ! "$file" =~ ^eidf[a-zA-Z0-9]{2,5}-[a-zA-Z0-9]{3,8}-.+$ ]]; then
-      logging::failure "[IMPORT] $file — Filename format invalid"
-      continue
-    fi
-
     # Ensure filename matches expected format
-    if [[ ! "$file" =~ ^eidf[a-zA-Z0-9]{2,5}-[a-zA-Z0-9]{3,8}-.+ ]]; then
-      logging::failure "[IMPORT] $file — Filename format invalid"
+    if [[ ! "$file" =~ ^eidf[a-zA-Z0-9]{2,5}-[a-zA-Z0-9]{3,8}-.+$ ]]; then
+      logging::failure "[IMPORT] $file — eidf prefix wrong or missing"
       continue
     fi
 
-
     # example file: eidf123-abc01-file.csv
     local project="${file%%-*}"             # eidf123
     local rest="${file#*-}"                 # abc01-file.csv