Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-08-01 22:45:18 +00:00
Code Issues Projects Releases Wiki Activity

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

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

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

@ -11,11 +11,7 @@ export const getFileExtension = (fileName: string): string | null => {
};
function getFilenameRegex(base: string, ext: string): RegExp {
// 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");
return new RegExp(`^(.*/)?${base}.(${ext})$`, "i");
}
export async function getFileFromZip(
@ -44,7 +40,6 @@ 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 };