Adjust organized filename regex

dandi · Dec 14, 2022 · 55df999 · 55df999
1 parent 03854a7
commit 55df999
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/dandi/organize.py b/dandi/organize.py
@@ -1032,7 +1032,11 @@ def msg_(msg, n, cond=None):
 
 LABELREGEX = r"[^_*\\/<>:|\"'?%@;.]+"
 ORGANIZED_FILENAME_REGEX = (
-    rf"sub-{LABELREGEX}(_(ses|tis|slice|cell)-{LABELREGEX})*(_[a-z]+(\+[a-z]+)*)?\.nwb"
+    rf"sub-{LABELREGEX}"
+    rf"(_ses-{LABELREGEX})?"
+    rf"(_(tis|slice|cell|probe|obj)-{LABELREGEX})*"
+    r"(_[a-z]+(\+[a-z]+)*)?"
+    r"\.nwb"
 )
 ORGANIZED_FOLDER_REGEX = rf"sub-{LABELREGEX}"