mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-03 06:47:33 +00:00
S&R improved filename sanitizing (#2784)
Co-authored-by: typpos <28550406+typpos@users.noreply.github.com>
This commit is contained in:
@@ -272,3 +272,28 @@ export function parseFilePath(filepath: string): {
|
||||
subfolder: normalizedPath.slice(0, lastSlashIndex)
|
||||
}
|
||||
}
|
||||
|
||||
// Simple date formatter
|
||||
const parts = {
|
||||
d: (d: Date) => d.getDate(),
|
||||
M: (d: Date) => d.getMonth() + 1,
|
||||
h: (d: Date) => d.getHours(),
|
||||
m: (d: Date) => d.getMinutes(),
|
||||
s: (d: Date) => d.getSeconds()
|
||||
}
|
||||
const format =
|
||||
Object.keys(parts)
|
||||
.map((k) => k + k + '?')
|
||||
.join('|') + '|yyy?y?'
|
||||
|
||||
export function formatDate(text: string, date: Date) {
|
||||
return text.replace(new RegExp(format, 'g'), (text: string): string => {
|
||||
if (text === 'yy') return (date.getFullYear() + '').substring(2)
|
||||
if (text === 'yyyy') return date.getFullYear().toString()
|
||||
if (text[0] in parts) {
|
||||
const p = parts[text[0] as keyof typeof parts](date)
|
||||
return (p + '').padStart(text.length, '0')
|
||||
}
|
||||
return text
|
||||
})
|
||||
}
|
||||
|
||||
54
src/utils/searchAndReplace.ts
Normal file
54
src/utils/searchAndReplace.ts
Normal file
@@ -0,0 +1,54 @@
|
||||
import type { LGraphNode } from '@comfyorg/litegraph'
|
||||
|
||||
import { formatDate } from '@/utils/formatUtil'
|
||||
|
||||
export function applyTextReplacements(
|
||||
allNodes: LGraphNode[],
|
||||
value: string
|
||||
): string {
|
||||
return value.replace(/%([^%]+)%/g, function (match, text) {
|
||||
const split = text.split('.')
|
||||
if (split.length !== 2) {
|
||||
// Special handling for dates
|
||||
if (split[0].startsWith('date:')) {
|
||||
return formatDate(split[0].substring(5), new Date())
|
||||
}
|
||||
|
||||
if (text !== 'width' && text !== 'height') {
|
||||
// Dont warn on standard replacements
|
||||
console.warn('Invalid replacement pattern', text)
|
||||
}
|
||||
return match
|
||||
}
|
||||
|
||||
// Find node with matching S&R property name
|
||||
let nodes = allNodes.filter(
|
||||
(n) => n.properties?.['Node name for S&R'] === split[0]
|
||||
)
|
||||
// If we cant, see if there is a node with that title
|
||||
if (!nodes.length) {
|
||||
nodes = allNodes.filter((n) => n.title === split[0])
|
||||
}
|
||||
if (!nodes.length) {
|
||||
console.warn('Unable to find node', split[0])
|
||||
return match
|
||||
}
|
||||
|
||||
if (nodes.length > 1) {
|
||||
console.warn('Multiple nodes matched', split[0], 'using first match')
|
||||
}
|
||||
|
||||
const node = nodes[0]
|
||||
|
||||
const widget = node.widgets?.find((w) => w.name === split[1])
|
||||
if (!widget) {
|
||||
console.warn('Unable to find widget', split[1], 'on node', split[0], node)
|
||||
return match
|
||||
}
|
||||
return ((widget.value ?? '') + '').replaceAll(
|
||||
// eslint-disable-next-line no-control-regex
|
||||
/[/?<>\\:*|"\x00-\x1F\x7F]/g,
|
||||
'_'
|
||||
)
|
||||
})
|
||||
}
|
||||
Reference in New Issue
Block a user