remove duplicate code and update error message
This commit is contained in:
1 parent
0487eb1c0c
commit
c4a36c0cd4
1 file changed
+2
-9
+2
-9
@@ -96,19 +96,12 @@ function transfer::import() {
|
|||||||
|
|
||||||
local file=${filepath##*/} # strip directories from path
|
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
|
# Ensure filename matches expected format
|
||||||
if [[ ! "$file" =~ ^eidf[a-zA-Z0-9]{2,5}-[a-zA-Z0-9]{3,8}-.+ ]]; then
|
if [[ ! "$file" =~ ^eidf[a-zA-Z0-9]{2,5}-[a-zA-Z0-9]{3,8}-.+$ ]]; then
|
||||||
logging::failure "[IMPORT] $file — Filename format invalid"
|
logging::failure "[IMPORT] $file — eidf prefix wrong or missing"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# example file: eidf123-abc01-file.csv
|
# example file: eidf123-abc01-file.csv
|
||||||
local project="${file%%-*}" # eidf123
|
local project="${file%%-*}" # eidf123
|
||||||
local rest="${file#*-}" # abc01-file.csv
|
local rest="${file#*-}" # abc01-file.csv
|
||||||
|
|||||||
Reference in new issue
Block a user