From 981808b9014d882c6d425b88ab00f5517cc86ab6 Mon Sep 17 00:00:00 2001
From: indigo <indigoo@gmail.com>
Date: Sun, 19 Jul 2026 19:15:05 +0800
Subject: [PATCH] Extend submission config: .mxf/codec/frame-rate checks, regex
 naming, shot/asset tabs

- Movie spec checks now also cover codec (h264/h265/mjpeg/dnxhd/dnxhr/
  prores/uncompressed/avid/cineform) and frame rate (23.976/24/30/48/60),
  detected in-browser via mediainfo.js container parsing - works even
  for formats the native <video> element can't decode (MXF, ProRes,
  DNxHD). Added .mxf to the supported/allowed format lists.
- Naming pattern supports a raw regex mode (validated by compiling
  server-side at save time) as an alternative to the token pattern,
  and gained three more tokens: {task_name}, {project_name},
  {project_code} (fetched lazily only when referenced).
- Submission Configuration settings page now splits Shot Tasks /
  Asset Tasks into separate tabs instead of one merged list; the
  per-task-type card was extracted into SubmissionTypeConfigCard.vue
  to avoid duplicating it across both tabs.
---
 backend/schemas/submission_config.py          |  23 ++-
 .../project/SubmissionConfigManager.vue       | 195 ++++--------------
 .../project/SubmissionTypeConfigCard.vue      | 173 ++++++++++++++++
 .../src/components/task/TaskDetailPanel.vue   |   2 +
 .../src/components/task/TaskSubmissions.vue   |  74 +++++--
 frontend/src/services/project.ts              |   1 +
 6 files changed, 284 insertions(+), 184 deletions(-)
 create mode 100644 frontend/src/components/project/SubmissionTypeConfigCard.vue

diff --git a/backend/schemas/submission_config.py b/backend/schemas/submission_config.py
index 8f83451..c5c0ed9 100644
--- a/backend/schemas/submission_config.py
+++ b/backend/schemas/submission_config.py
@@ -7,8 +7,8 @@ import re
 
 from utils.file_handler import file_handler
 
-# Tokens supported in a naming_pattern: {name} (shot/asset name), {task_type}, {version}
-NAMING_PATTERN_TOKEN_RE = re.compile(r'\{(name|task_type|version)\}')
+# Tokens supported in a token-mode naming_pattern
+NAMING_PATTERN_TOKEN_RE = re.compile(r'\{(name|task_type|task_name|project_name|project_code|version)\}')
 NAMING_PATTERN_ALLOWED_CHARS_RE = re.compile(r'^[A-Za-z0-9_\-\.]*$')
 
 
@@ -26,7 +26,12 @@ class SubmissionTypeConfig(BaseModel):
     itself, it is never used to inspect an uploaded file server-side.
     """
     allowed_extensions: List[str] = Field(default_factory=list, description="Accepted file extensions, e.g. ['.mov', '.exr']")
-    naming_pattern: Optional[str] = Field(None, description="Filename pattern using {name}, {task_type}, {version} tokens")
+    naming_pattern_is_regex: bool = Field(False, description="If true, naming_pattern is a raw regular expression instead of a token pattern")
+    naming_pattern: Optional[str] = Field(
+        None,
+        description="Either a token pattern (using {name}, {task_type}, {task_name}, {project_name}, "
+                    "{project_code}, {version}) or, if naming_pattern_is_regex is set, a raw regular expression"
+    )
     check_naming: bool = Field(True, description="Whether the naming pattern is actively checked")
     required: bool = Field(False, description="Whether a submission is expected for this task type (informational only)")
     check_movie_spec: bool = Field(False, description="Whether to check video submissions against movie_resolution/movie_format/movie_codec/movie_frame_rate")
@@ -51,15 +56,21 @@ class SubmissionTypeConfig(BaseModel):
         return normalized
 
     @validator('naming_pattern')
-    def validate_naming_pattern(cls, v):
+    def validate_naming_pattern(cls, v, values):
         if v is None or v == '':
             return None
-        # Strip out known tokens, then everything left must be safe literal characters
+        if values.get('naming_pattern_is_regex'):
+            try:
+                re.compile(v)
+            except re.error as e:
+                raise ValueError(f'Invalid regular expression: {e}')
+            return v
+        # Token mode: strip out known tokens, then everything left must be safe literal characters
         stripped = NAMING_PATTERN_TOKEN_RE.sub('', v)
         if not NAMING_PATTERN_ALLOWED_CHARS_RE.match(stripped):
             raise ValueError(
                 'Naming pattern may only contain letters, numbers, "_", "-", "." '
-                'and the tokens {name}, {task_type}, {version}'
+                'and the tokens {name}, {task_type}, {task_name}, {project_name}, {project_code}, {version}'
             )
         return v
 
diff --git a/frontend/src/components/project/SubmissionConfigManager.vue b/frontend/src/components/project/SubmissionConfigManager.vue
index 39de198..3f32540 100644
--- a/frontend/src/components/project/SubmissionConfigManager.vue
+++ b/frontend/src/components/project/SubmissionConfigManager.vue
@@ -11,132 +11,36 @@
       Loading submission configuration...
     </div>
 
-    <div v-else class="space-y-4">
-      <Card v-for="taskType in taskTypes" :key="taskType">
-        <CardHeader>
-          <div class="flex items-center justify-between">
-            <CardTitle class="text-base capitalize">{{ formatTaskType(taskType) }}</CardTitle>
-            <div class="flex items-center gap-2">
-              <Label :for="`${taskType}_required`" class="text-xs text-muted-foreground">Required</Label>
-              <Switch
-                :id="`${taskType}_required`"
-                :model-value="getConfig(taskType).required"
-                @update:model-value="(val) => (getConfig(taskType).required = !!val)"
-              />
-            </div>
-          </div>
-        </CardHeader>
-        <CardContent class="space-y-4">
-          <div>
-            <Label class="text-xs">Allowed File Types</Label>
-            <div class="flex flex-wrap gap-3 mt-1">
-              <label
-                v-for="ext in ALLOWED_EXTENSIONS"
-                :key="ext"
-                class="flex items-center gap-1.5 text-sm"
-              >
-                <Checkbox
-                  :model-value="getConfig(taskType).allowed_extensions.includes(ext)"
-                  @update:model-value="(val) => toggleExtension(taskType, ext, !!val)"
-                />
-                {{ ext }}
-              </label>
-            </div>
-            <p class="text-xs text-muted-foreground mt-1">Leave all unchecked to accept any supported file type</p>
-          </div>
+    <Tabs v-else default-value="shot" class="w-full">
+      <TabsList class="grid w-full grid-cols-2">
+        <TabsTrigger value="shot">Shot Tasks</TabsTrigger>
+        <TabsTrigger value="asset">Asset Tasks</TabsTrigger>
+      </TabsList>
 
-          <div>
-            <div class="flex items-center justify-between">
-              <Label :for="`${taskType}_pattern`" class="text-xs">Naming Pattern</Label>
-              <div class="flex items-center gap-2">
-                <Label :for="`${taskType}_check_naming`" class="text-xs text-muted-foreground">Check</Label>
-                <Switch
-                  :id="`${taskType}_check_naming`"
-                  :model-value="getConfig(taskType).check_naming"
-                  @update:model-value="(val) => (getConfig(taskType).check_naming = !!val)"
-                />
-              </div>
-            </div>
-            <Input
-              :id="`${taskType}_pattern`"
-              v-model="getConfig(taskType).naming_pattern"
-              placeholder="e.g. {name}_{task_type}_v{version}"
-              class="h-8"
-            />
-            <p class="text-xs text-muted-foreground mt-1">
-              Tokens: <code>{name}</code> (shot/asset name), <code>{task_type}</code>, <code>{version}</code> (auto 3-digit)
-            </p>
-          </div>
+      <TabsContent value="shot" class="space-y-4 mt-4">
+        <SubmissionTypeConfigCard
+          v-for="taskType in shotTaskTypes"
+          :key="taskType"
+          :task-type="taskType"
+          :config="getConfig(taskType)"
+        />
+        <div v-if="shotTaskTypes.length === 0" class="text-center py-8 text-sm text-muted-foreground">
+          No shot task types configured for this project yet.
+        </div>
+      </TabsContent>
 
-          <div>
-            <div class="flex items-center justify-between">
-              <Label class="text-xs">Movie Spec</Label>
-              <div class="flex items-center gap-2">
-                <Label :for="`${taskType}_check_movie_spec`" class="text-xs text-muted-foreground">Check</Label>
-                <Switch
-                  :id="`${taskType}_check_movie_spec`"
-                  :model-value="getConfig(taskType).check_movie_spec"
-                  @update:model-value="(val) => (getConfig(taskType).check_movie_spec = !!val)"
-                />
-              </div>
-            </div>
-            <div v-if="getConfig(taskType).check_movie_spec" class="grid grid-cols-4 gap-3 mt-1">
-              <div>
-                <Input
-                  v-model="getConfig(taskType).movie_resolution"
-                  placeholder="e.g. 1920x1080"
-                  class="h-8"
-                />
-              </div>
-              <div>
-                <Select
-                  :model-value="getConfig(taskType).movie_format || undefined"
-                  @update:model-value="(val) => (getConfig(taskType).movie_format = val ? String(val) : '')"
-                >
-                  <SelectTrigger class="h-8">
-                    <SelectValue placeholder="Format" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectItem v-for="fmt in MOVIE_FORMATS" :key="fmt" :value="fmt">{{ fmt }}</SelectItem>
-                  </SelectContent>
-                </Select>
-              </div>
-              <div>
-                <Select
-                  :model-value="getConfig(taskType).movie_codec || undefined"
-                  @update:model-value="(val) => (getConfig(taskType).movie_codec = val ? String(val) : '')"
-                >
-                  <SelectTrigger class="h-8">
-                    <SelectValue placeholder="Codec" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectItem v-for="codec in MOVIE_CODECS" :key="codec" :value="codec">{{ codec }}</SelectItem>
-                  </SelectContent>
-                </Select>
-              </div>
-              <div>
-                <Select
-                  :model-value="getConfig(taskType).movie_frame_rate ? String(getConfig(taskType).movie_frame_rate) : undefined"
-                  @update:model-value="(val) => (getConfig(taskType).movie_frame_rate = val ? Number(val) : null)"
-                >
-                  <SelectTrigger class="h-8">
-                    <SelectValue placeholder="Frame rate" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectItem v-for="rate in MOVIE_FRAME_RATES" :key="rate" :value="String(rate)">{{ rate }} fps</SelectItem>
-                  </SelectContent>
-                </Select>
-              </div>
-            </div>
-            <p class="text-xs text-muted-foreground mt-1">Checks resolution/format/codec/frame rate for video submissions only, in-browser before upload</p>
-          </div>
-        </CardContent>
-      </Card>
-
-      <div v-if="taskTypes.length === 0" class="text-center py-8 text-sm text-muted-foreground">
-        No task types configured for this project yet.
-      </div>
-    </div>
+      <TabsContent value="asset" class="space-y-4 mt-4">
+        <SubmissionTypeConfigCard
+          v-for="taskType in assetTaskTypes"
+          :key="taskType"
+          :task-type="taskType"
+          :config="getConfig(taskType)"
+        />
+        <div v-if="assetTaskTypes.length === 0" class="text-center py-8 text-sm text-muted-foreground">
+          No asset task types configured for this project yet.
+        </div>
+      </TabsContent>
+    </Tabs>
 
     <div class="flex justify-end">
       <Button :disabled="isLoading || isSaving" @click="onSave">
@@ -150,15 +54,11 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted } from 'vue'
 import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Checkbox } from '@/components/ui/checkbox'
-import { Switch } from '@/components/ui/switch'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import { useToast } from '@/components/ui/toast/use-toast'
 import { projectService, type SubmissionTypeConfig } from '@/services/project'
 import { customTaskTypeService } from '@/services/customTaskType'
+import SubmissionTypeConfigCard from './SubmissionTypeConfigCard.vue'
 
 interface Props {
   projectId: number
@@ -167,30 +67,17 @@ interface Props {
 const props = defineProps<Props>()
 const { toast } = useToast()
 
-// Mirrors backend's file_handler.SUPPORTED_FORMATS - kept for the picker only; the actual check happens client-side at submit time
-const ALLOWED_EXTENSIONS = [
-  '.mov', '.mp4', '.avi', '.mkv', '.webm', '.mxf',
-  '.exr', '.jpg', '.jpeg', '.png', '.tiff', '.tif', '.dpx', '.hdr',
-  '.pdf', '.txt', '.doc', '.docx',
-  '.zip', '.rar', '.7z',
-  '.ma', '.usd', '.usda', '.usdc'
-]
-
-const MOVIE_FORMATS = ['mov', 'mp4', 'avi', 'mkv', 'webm', 'mxf']
-const MOVIE_CODECS = ['h264', 'h265', 'mjpeg', 'dnxhd', 'dnxhr', 'prores', 'uncompressed', 'avid', 'cineform']
-const MOVIE_FRAME_RATES = [23.976, 24, 30, 48, 60]
-
 const isLoading = ref(false)
 const isSaving = ref(false)
-const taskTypes = ref<string[]>([])
+const shotTaskTypes = ref<string[]>([])
+const assetTaskTypes = ref<string[]>([])
 const formState = reactive<Record<string, SubmissionTypeConfig>>({})
 
-const formatTaskType = (taskType: string) => taskType.replace(/_/g, ' ')
-
 const getConfig = (taskType: string): SubmissionTypeConfig => {
   if (!formState[taskType]) {
     formState[taskType] = {
       allowed_extensions: [],
+      naming_pattern_is_regex: false,
       naming_pattern: '',
       check_naming: true,
       required: false,
@@ -204,15 +91,6 @@ const getConfig = (taskType: string): SubmissionTypeConfig => {
   return formState[taskType]
 }
 
-const toggleExtension = (taskType: string, ext: string, checked: boolean) => {
-  const config = getConfig(taskType)
-  if (checked) {
-    if (!config.allowed_extensions.includes(ext)) config.allowed_extensions.push(ext)
-  } else {
-    config.allowed_extensions = config.allowed_extensions.filter(e => e !== ext)
-  }
-}
-
 const load = async () => {
   try {
     isLoading.value = true
@@ -221,11 +99,13 @@ const load = async () => {
       projectService.getProjectSubmissionConfig(props.projectId)
     ])
 
-    taskTypes.value = Array.from(new Set([...allTypes.asset_task_types, ...allTypes.shot_task_types]))
+    shotTaskTypes.value = allTypes.shot_task_types
+    assetTaskTypes.value = allTypes.asset_task_types
 
     for (const [taskType, cfg] of Object.entries(config.config_by_task_type)) {
       formState[taskType] = {
         allowed_extensions: [...cfg.allowed_extensions],
+        naming_pattern_is_regex: cfg.naming_pattern_is_regex,
         naming_pattern: cfg.naming_pattern || '',
         check_naming: cfg.check_naming,
         required: cfg.required,
@@ -252,7 +132,7 @@ const onSave = async () => {
   try {
     isSaving.value = true
     const configByTaskType: Record<string, SubmissionTypeConfig> = {}
-    for (const taskType of taskTypes.value) {
+    for (const taskType of [...shotTaskTypes.value, ...assetTaskTypes.value]) {
       const config = formState[taskType]
       if (!config) continue
       const hasConfig = config.allowed_extensions.length > 0 || !!config.naming_pattern
@@ -260,6 +140,7 @@ const onSave = async () => {
       if (hasConfig) {
         configByTaskType[taskType] = {
           allowed_extensions: config.allowed_extensions,
+          naming_pattern_is_regex: config.naming_pattern_is_regex,
           naming_pattern: config.naming_pattern || null,
           check_naming: config.check_naming,
           required: config.required,
diff --git a/frontend/src/components/project/SubmissionTypeConfigCard.vue b/frontend/src/components/project/SubmissionTypeConfigCard.vue
new file mode 100644
index 0000000..8c3a760
--- /dev/null
+++ b/frontend/src/components/project/SubmissionTypeConfigCard.vue
@@ -0,0 +1,173 @@
+<template>
+  <Card>
+    <CardHeader>
+      <div class="flex items-center justify-between">
+        <CardTitle class="text-base capitalize">{{ formatTaskType(taskType) }}</CardTitle>
+        <div class="flex items-center gap-2">
+          <Label :for="`${taskType}_required`" class="text-xs text-muted-foreground">Required</Label>
+          <Switch
+            :id="`${taskType}_required`"
+            :model-value="config.required"
+            @update:model-value="(val) => (config.required = !!val)"
+          />
+        </div>
+      </div>
+    </CardHeader>
+    <CardContent class="space-y-4">
+      <div>
+        <Label class="text-xs">Allowed File Types</Label>
+        <div class="flex flex-wrap gap-3 mt-1">
+          <label
+            v-for="ext in ALLOWED_EXTENSIONS"
+            :key="ext"
+            class="flex items-center gap-1.5 text-sm"
+          >
+            <Checkbox
+              :model-value="config.allowed_extensions.includes(ext)"
+              @update:model-value="(val) => toggleExtension(ext, !!val)"
+            />
+            {{ ext }}
+          </label>
+        </div>
+        <p class="text-xs text-muted-foreground mt-1">Leave all unchecked to accept any supported file type</p>
+      </div>
+
+      <div>
+        <div class="flex items-center justify-between">
+          <Label :for="`${taskType}_pattern`" class="text-xs">Naming Pattern</Label>
+          <div class="flex items-center gap-3">
+            <label class="flex items-center gap-1.5 text-xs text-muted-foreground">
+              <Checkbox
+                :model-value="config.naming_pattern_is_regex"
+                @update:model-value="(val) => (config.naming_pattern_is_regex = !!val)"
+              />
+              Regex
+            </label>
+            <div class="flex items-center gap-2">
+              <Label :for="`${taskType}_check_naming`" class="text-xs text-muted-foreground">Check</Label>
+              <Switch
+                :id="`${taskType}_check_naming`"
+                :model-value="config.check_naming"
+                @update:model-value="(val) => (config.check_naming = !!val)"
+              />
+            </div>
+          </div>
+        </div>
+        <Input
+          :id="`${taskType}_pattern`"
+          v-model="config.naming_pattern"
+          :placeholder="config.naming_pattern_is_regex ? 'e.g. ^[A-Z]+\\d{3}_layout_v\\d{3}$' : 'e.g. {project_code}_{name}_{task_type}_v{version}'"
+          class="h-8 font-mono"
+        />
+        <p v-if="config.naming_pattern_is_regex" class="text-xs text-muted-foreground mt-1">
+          Matched as a regular expression against the filename (without extension)
+        </p>
+        <p v-else class="text-xs text-muted-foreground mt-1">
+          Tokens: <code>{name}</code> (shot/asset name), <code>{task_name}</code>, <code>{task_type}</code>,
+          <code>{project_name}</code>, <code>{project_code}</code>, <code>{version}</code> (auto 3-digit)
+        </p>
+      </div>
+
+      <div>
+        <div class="flex items-center justify-between">
+          <Label class="text-xs">Movie Spec</Label>
+          <div class="flex items-center gap-2">
+            <Label :for="`${taskType}_check_movie_spec`" class="text-xs text-muted-foreground">Check</Label>
+            <Switch
+              :id="`${taskType}_check_movie_spec`"
+              :model-value="config.check_movie_spec"
+              @update:model-value="(val) => (config.check_movie_spec = !!val)"
+            />
+          </div>
+        </div>
+        <div v-if="config.check_movie_spec" class="grid grid-cols-4 gap-3 mt-1">
+          <div>
+            <Input
+              v-model="config.movie_resolution"
+              placeholder="e.g. 1920x1080"
+              class="h-8"
+            />
+          </div>
+          <div>
+            <Select
+              :model-value="config.movie_format || undefined"
+              @update:model-value="(val) => (config.movie_format = val ? String(val) : '')"
+            >
+              <SelectTrigger class="h-8">
+                <SelectValue placeholder="Format" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem v-for="fmt in MOVIE_FORMATS" :key="fmt" :value="fmt">{{ fmt }}</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+          <div>
+            <Select
+              :model-value="config.movie_codec || undefined"
+              @update:model-value="(val) => (config.movie_codec = val ? String(val) : '')"
+            >
+              <SelectTrigger class="h-8">
+                <SelectValue placeholder="Codec" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem v-for="codec in MOVIE_CODECS" :key="codec" :value="codec">{{ codec }}</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+          <div>
+            <Select
+              :model-value="config.movie_frame_rate ? String(config.movie_frame_rate) : undefined"
+              @update:model-value="(val) => (config.movie_frame_rate = val ? Number(val) : null)"
+            >
+              <SelectTrigger class="h-8">
+                <SelectValue placeholder="Frame rate" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem v-for="rate in MOVIE_FRAME_RATES" :key="rate" :value="String(rate)">{{ rate }} fps</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+        </div>
+        <p class="text-xs text-muted-foreground mt-1">Checks resolution/format/codec/frame rate for video submissions only, in-browser before upload</p>
+      </div>
+    </CardContent>
+  </Card>
+</template>
+
+<script setup lang="ts">
+import { Label } from '@/components/ui/label'
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
+import { Checkbox } from '@/components/ui/checkbox'
+import { Switch } from '@/components/ui/switch'
+import { Input } from '@/components/ui/input'
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import type { SubmissionTypeConfig } from '@/services/project'
+
+const props = defineProps<{
+  taskType: string
+  config: SubmissionTypeConfig
+}>()
+
+// Mirrors backend's file_handler.SUPPORTED_FORMATS - kept for the picker only; the actual check happens client-side at submit time
+const ALLOWED_EXTENSIONS = [
+  '.mov', '.mp4', '.avi', '.mkv', '.webm', '.mxf',
+  '.exr', '.jpg', '.jpeg', '.png', '.tiff', '.tif', '.dpx', '.hdr',
+  '.pdf', '.txt', '.doc', '.docx',
+  '.zip', '.rar', '.7z',
+  '.ma', '.usd', '.usda', '.usdc'
+]
+
+const MOVIE_FORMATS = ['mov', 'mp4', 'avi', 'mkv', 'webm', 'mxf']
+const MOVIE_CODECS = ['h264', 'h265', 'mjpeg', 'dnxhd', 'dnxhr', 'prores', 'uncompressed', 'avid', 'cineform']
+const MOVIE_FRAME_RATES = [23.976, 24, 30, 48, 60]
+
+const formatTaskType = (taskType: string) => taskType.replace(/_/g, ' ')
+
+function toggleExtension(ext: string, checked: boolean) {
+  if (checked) {
+    if (!props.config.allowed_extensions.includes(ext)) props.config.allowed_extensions.push(ext)
+  } else {
+    props.config.allowed_extensions = props.config.allowed_extensions.filter(e => e !== ext)
+  }
+}
+</script>
diff --git a/frontend/src/components/task/TaskDetailPanel.vue b/frontend/src/components/task/TaskDetailPanel.vue
index d93bee3..ef2b758 100644
--- a/frontend/src/components/task/TaskDetailPanel.vue
+++ b/frontend/src/components/task/TaskDetailPanel.vue
@@ -207,6 +207,8 @@
             :task-type="task?.task_type"
             :project-id="task?.project_id"
             :name="task?.shot_name || task?.asset_name"
+            :task-name="task?.name"
+            :project-name="task?.project_name"
             @submissions-updated="loadSubmissions"
           />
         </TabsContent>
diff --git a/frontend/src/components/task/TaskSubmissions.vue b/frontend/src/components/task/TaskSubmissions.vue
index 8b91a42..019a39d 100644
--- a/frontend/src/components/task/TaskSubmissions.vue
+++ b/frontend/src/components/task/TaskSubmissions.vue
@@ -30,7 +30,8 @@
             <Badge v-if="submissionConfig.required" variant="outline" class="text-[10px] px-1 py-0">Required</Badge>
           </div>
           <div v-if="submissionConfig.naming_pattern && submissionConfig.check_naming">
-            Naming: <code>{{ submissionConfig.naming_pattern }}</code>
+            {{ submissionConfig.naming_pattern_is_regex ? 'Naming (regex):' : 'Naming:' }}
+            <code>{{ submissionConfig.naming_pattern }}</code>
           </div>
           <div v-if="submissionConfig.check_movie_spec && (submissionConfig.movie_resolution || submissionConfig.movie_format || submissionConfig.movie_codec || submissionConfig.movie_frame_rate)">
             Movie spec:
@@ -155,6 +156,8 @@ const props = defineProps<{
   taskType?: string
   projectId?: number
   name?: string
+  taskName?: string
+  projectName?: string
 }>()
 
 const emit = defineEmits<{
@@ -170,13 +173,19 @@ const viewerOpen = ref(false)
 const selectedSubmission = ref<Submission | null>(null)
 const mediaBlobUrl = ref<string | null>(null)
 const submissionConfig = ref<SubmissionTypeConfig | null>(null)
+const projectCode = ref<string | null>(null)
 
 async function loadSubmissionConfig() {
   submissionConfig.value = null
+  projectCode.value = null
   if (!props.projectId || !props.taskType) return
   try {
     const config = await projectService.getProjectSubmissionConfig(props.projectId)
     submissionConfig.value = config.config_by_task_type[props.taskType] || null
+    if (submissionConfig.value?.naming_pattern?.includes('{project_code}')) {
+      const project = await projectService.getProject(props.projectId)
+      projectCode.value = project.code_name
+    }
   } catch (error) {
     console.error('Failed to load submission configuration:', error)
   }
@@ -273,26 +282,49 @@ async function findSubmissionViolation(file: File): Promise<string | null> {
   }
 
   if (config.check_naming && config.naming_pattern) {
-    if (config.naming_pattern.includes('{name}') && !props.name) {
-      return null // can't resolve {name} client-side
-    }
-    const escapeRegex = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-    const pattern = config.naming_pattern
-      .split(/(\{name\}|\{task_type\}|\{version\})/)
-      .map(part => {
-        if (part === '{name}') return escapeRegex(props.name || '')
-        if (part === '{task_type}') return escapeRegex(props.taskType || '')
-        if (part === '{version}') return '\\d{3}'
-        return escapeRegex(part)
-      })
-      .join('')
-    const regex = new RegExp(`^${pattern}$`)
-    if (!regex.test(stem)) {
-      const example = config.naming_pattern
-        .replace('{name}', props.name || 'name')
-        .replace('{task_type}', props.taskType || '')
-        .replace('{version}', '001')
-      return `Filename does not match the required naming convention '${config.naming_pattern}' (e.g. '${example}${extension}')`
+    if (config.naming_pattern_is_regex) {
+      try {
+        const regex = new RegExp(config.naming_pattern)
+        if (!regex.test(stem)) {
+          return `Filename does not match the required pattern '${config.naming_pattern}'`
+        }
+      } catch (error) {
+        console.error('Invalid naming pattern regex:', error)
+      }
+    } else {
+      const tokenValues: Record<string, string | undefined> = {
+        name: props.name,
+        task_type: props.taskType,
+        task_name: props.taskName,
+        project_name: props.projectName,
+        project_code: projectCode.value || undefined
+      }
+      const usedTokens = config.naming_pattern.match(/\{(name|task_name|project_name|project_code)\}/g) || []
+      const unresolvable = usedTokens.some(token => !tokenValues[token.slice(1, -1)])
+      if (!unresolvable) {
+        const escapeRegex = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+        const pattern = config.naming_pattern
+          .split(/(\{name\}|\{task_type\}|\{task_name\}|\{project_name\}|\{project_code\}|\{version\})/)
+          .map(part => {
+            if (part === '{version}') return '\\d{3}'
+            const key = part.startsWith('{') && part.endsWith('}') ? part.slice(1, -1) : null
+            if (key && key in tokenValues) return escapeRegex(tokenValues[key] || '')
+            return escapeRegex(part)
+          })
+          .join('')
+        const regex = new RegExp(`^${pattern}$`)
+        if (!regex.test(stem)) {
+          const example = config.naming_pattern
+            .replace('{name}', props.name || 'name')
+            .replace('{task_name}', props.taskName || 'taskname')
+            .replace('{project_name}', props.projectName || 'project')
+            .replace('{project_code}', projectCode.value || 'CODE')
+            .replace('{task_type}', props.taskType || '')
+            .replace('{version}', '001')
+          return `Filename does not match the required naming convention '${config.naming_pattern}' (e.g. '${example}${extension}')`
+        }
+      }
+      // If a token couldn't be resolved client-side, don't false-block
     }
   }
 
diff --git a/frontend/src/services/project.ts b/frontend/src/services/project.ts
index a3ebdd5..29bce11 100644
--- a/frontend/src/services/project.ts
+++ b/frontend/src/services/project.ts
@@ -97,6 +97,7 @@ export interface ProjectSettings {
 
 export interface SubmissionTypeConfig {
   allowed_extensions: string[]
+  naming_pattern_is_regex: boolean
   naming_pattern?: string | null
   check_naming: boolean
   required: boolean