mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-12-12 08:06:42 +03:00
normalize camera name to lower case and improve hash generation
This commit is contained in:
parent
bedba7a05a
commit
a246b71580
@ -1,20 +1,30 @@
|
|||||||
/**
|
/**
|
||||||
* Generates a fixed-length hash from a camera name for use as a valid camera identifier.
|
* Generates a fixed-length hash from a camera name for use as a valid camera identifier.
|
||||||
* Used when user enters a display name with spaces or special characters.
|
* Works safely with Unicode input while outputting Latin-only identifiers.
|
||||||
*
|
*
|
||||||
* @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 function generateFixedHash(name: string): string {
|
export function generateFixedHash(name: string): string {
|
||||||
const encoded = encodeURIComponent(name);
|
// Safely encode Unicode as UTF-8 bytes
|
||||||
const base64 = btoa(encoded);
|
const utf8Bytes = new TextEncoder().encode(name);
|
||||||
|
|
||||||
|
// Convert to base64 manually
|
||||||
|
let binary = "";
|
||||||
|
for (const byte of utf8Bytes) {
|
||||||
|
binary += String.fromCharCode(byte);
|
||||||
|
}
|
||||||
|
const base64 = btoa(binary);
|
||||||
|
|
||||||
|
// Strip out non-alphanumeric characters and truncate
|
||||||
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.
|
||||||
* Valid camera names contain only letters, numbers, underscores, and hyphens.
|
* Valid camera names contain only ASCII letters, numbers, underscores, and hyphens.
|
||||||
*
|
*
|
||||||
* @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
|
||||||
@ -34,7 +44,7 @@ export function processCameraName(userInput: string): {
|
|||||||
finalCameraName: string;
|
finalCameraName: string;
|
||||||
friendlyName?: string;
|
friendlyName?: string;
|
||||||
} {
|
} {
|
||||||
const normalizedInput = userInput.replace(/\s+/g, "_");
|
const normalizedInput = userInput.replace(/\s+/g, "_").toLowerCase();
|
||||||
|
|
||||||
if (isValidCameraName(normalizedInput)) {
|
if (isValidCameraName(normalizedInput)) {
|
||||||
return {
|
return {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user