gsadmin/Firelink
1
0
Fork 0
mirror of https://github.com/nimbold/Firelink.git synced 2026-08-17 23:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(settings): harden locations and site login matching

Browse Source
This commit is contained in:
NimBold
2026-07-02 22:38:25 +03:30
parent 98be029203
commit ae9f14ad6e
5 changed files with 128 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/downloadLocations.ts
+25
View File
@@ -61,6 +61,31 @@ const normalizedForComparison = (value: string): string =>
const legacyDerivedPath = (base: string, subfolder: string): string =>
`${normalizedForComparison(base)}/${subfolder.replace(/^[\\/]+|[\\/]+$/g, '')}`;
const isWindowsLikePath = (value: string): boolean =>
/^[a-z]:[\\/]/i.test(value) || value.startsWith('\\\\') || value.includes('\\');
export const formatDerivedCategoryPath = (base: string, subfolder: string): string => {
const trimmedBase = base.trim() || '~/Downloads';
const relative = subfolder.replace(/^[\\/]+|[\\/]+$/g, '');
const separator = isWindowsLikePath(trimmedBase) ? '\\' : '/';
return `${trimmedBase.replace(/[\\/]+$/, '')}${separator}${relative}`;
};
export const subfolderFromDerivedCategoryPath = (
value: string,
base: string
): string | null => {
const normalizedValue = normalizedForComparison(value.trim());
const normalizedBase = normalizedForComparison((base.trim() || '~/Downloads'));
const isWindows = isWindowsLikePath(base);
const comparableValue = isWindows ? normalizedValue.toLocaleLowerCase() : normalizedValue;
const comparableBase = isWindows ? normalizedBase.toLocaleLowerCase() : normalizedBase;
if (comparableValue === comparableBase) return '';
if (!comparableValue.startsWith(`${comparableBase}/`)) return null;
return normalizedValue.slice(normalizedBase.length + 1);
};
export const normalizeCategorySubfolder = (
value: string,
fallback: string