administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-12-12 16:16:42 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

keep spaces in friendly name

Browse Source
This commit is contained in:
Josh Hawkins 2025-10-12 17:11:15 -05:00
parent f3bde69d73
commit e9119f899f
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
web/src/utils/cameraUtil.ts
View File

@ -5,12 +5,12 @@
* @param name - The original camera name/display name * @param name - The original camera name/display name
* @returns A valid camera identifier (lowercase, alphanumeric, max 8 chars) * @returns A valid camera identifier (lowercase, alphanumeric, max 8 chars)
*/ */
export const generateFixedHash = (name: string): string => { export function generateFixedHash(name: string): string {
const encoded = encodeURIComponent(name); const encoded = encodeURIComponent(name);
const base64 = btoa(encoded); const base64 = btoa(encoded);
const cleanHash = base64.replace(/[^a-zA-Z0-9]/g, "").substring(0, 8); const cleanHash = base64.replace(/[^a-zA-Z0-9]/g, "").substring(0, 8);
return `cam_${cleanHash.toLowerCase()}`; return `cam_${cleanHash.toLowerCase()}`;
}; }
/** /**
* Checks if a string is a valid camera name identifier. * Checks if a string is a valid camera name identifier.
@ -19,9 +19,9 @@ export const generateFixedHash = (name: string): string => {
* @param name - The camera name to validate * @param name - The camera name to validate
* @returns True if the name is valid, false otherwise * @returns True if the name is valid, false otherwise
*/ */
export const isValidCameraName = (name: string): boolean => { export function isValidCameraName(name: string): boolean {
return /^[a-zA-Z0-9_-]+$/.test(name); return /^[a-zA-Z0-9_-]+$/.test(name);
}; }
/** /**
* Processes a user-entered camera name and returns both the final camera name * Processes a user-entered camera name and returns both the final camera name
@ -30,18 +30,21 @@ export const isValidCameraName = (name: string): boolean => {
* @param userInput - The name entered by the user (could be display name) * @param userInput - The name entered by the user (could be display name)
* @returns Object with finalCameraName and friendlyName * @returns Object with finalCameraName and friendlyName
*/ */
export const processCameraName = ( export function processCameraName(userInput: string): {
userInput: string,
): {
finalCameraName: string; finalCameraName: string;
friendlyName?: string; friendlyName?: string;
} => { } {
if (isValidCameraName(userInput)) { const normalizedInput = userInput.replace(/\s+/g, "_");
return { finalCameraName: userInput };
} else { if (isValidCameraName(normalizedInput)) {
return { return {
finalCameraName: generateFixedHash(userInput), finalCameraName: normalizedInput,
friendlyName: userInput, friendlyName: userInput.includes(" ") ? userInput : undefined,
}; };
} }
};
return {
finalCameraName: generateFixedHash(userInput),
friendlyName: userInput,
};
}