Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-22 09:37:17 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "Allow forward slash string separators in skin file paths.""

Browse source 
This reverts commit 01c26f3c6a.
This commit is contained in:
Jordan Eldredge 2020-12-31 11:06:41 -08:00
parent 01c26f3c6a
commit 2dc65cee79
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/webamp/js/skinParserUtils.ts
View file

@ -11,7 +11,11 @@ export const getFileExtension = (fileName: string): string | null => {
};
function getFilenameRegex(base: string, ext: string): RegExp {
return new RegExp(`^(.*/)?${base}.(${ext})$`, "i");
// Note: The four slashes: \\\\ ultimately represent a single escaped slash in
// the regex ("\\"), however each itself needs to be escaped so that
// JavaScript does not interperate it as an escape character in the string
// literal. Wonderful.
return new RegExp(`^(.*[/\\\\])${base}.(${ext})$`, "i");
}
export async function getFileFromZip(
@ -40,6 +44,7 @@ export async function getFileFromZip(
// the last file that JSZip extracted.
const lastFile = files[files.length - 1];
console.log(`Looking for ${fileName} and got ${lastFile.name}`);
try {
const contents = await lastFile.async(mode);
return { contents, name: lastFile.name };