Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 21:04:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix tagger query path on Windows (#3804)

Browse Source
This commit is contained in:
WithoutPants
2023-06-09 08:21:56 +10:00
committed by GitHub
parent 09df203bcf
commit 2e40a41c1e
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ui/v2.5/src/components/Tagger/utils.ts
View File

@@ -108,7 +108,7 @@ export function prepareQueryString(
s = s.replace(new RegExp(b, "gi"), " "); s = s.replace(new RegExp(b, "gi"), " ");
}); });
s = parseDate(s); s = parseDate(s);
return s.replace(/\./g, " "); return s.replace(/\./g, " ").replace(/ +/g, " ");
} }
export const parsePath = (filePath: string) => { export const parsePath = (filePath: string) => {
@@ -121,10 +121,10 @@ export const parsePath = (filePath: string) => {
} }
const path = filePath.toLowerCase(); const path = filePath.toLowerCase();
const isWin = /^([a-z]:|\\\\)/.test(path); // Absolute paths on Windows start with a drive letter (e.g. C:\)
const normalizedPath = isWin // Alternatively, they may start with a UNC path (e.g. \\server\share)
? path.replace(/^[a-z]:/, "").replace(/\\/g, "/") // Remove the drive letter/UNC and replace backslashes with forward slashes
: path; const normalizedPath = path.replace(/^[a-z]:|\\\\/, "").replace(/\\/g, "/");
const pathComponents = normalizedPath const pathComponents = normalizedPath
.split("/") .split("/")
.filter((component) => component.trim().length > 0); .filter((component) => component.trim().length > 0);
@@ -132,10 +132,13 @@ export const parsePath = (filePath: string) => {
const ext = fileName.match(/\.[a-z0-9]*$/)?.[0] ?? ""; const ext = fileName.match(/\.[a-z0-9]*$/)?.[0] ?? "";
const file = fileName.slice(0, ext.length * -1); const file = fileName.slice(0, ext.length * -1);
const paths =
pathComponents.length >= 2 // remove any .. or . paths
? pathComponents.slice(0, pathComponents.length - 2) const paths = (
: []; pathComponents.length >= 1
? pathComponents.slice(0, pathComponents.length - 1)
: []
).filter((p) => p !== ".." && p !== ".");
return { paths, file, ext }; return { paths, file, ext };
}; };