From 01c26f3c6a8e34ff8bf274c8de82954079615a93 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Thu, 31 Dec 2020 11:05:10 -0800 Subject: [PATCH] Revert "Allow forward slash string separators in skin file paths." This reverts commit 3ed8e5005f45449dbe28403a42b987834f2a492c. --- packages/webamp/js/skinParserUtils.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/webamp/js/skinParserUtils.ts b/packages/webamp/js/skinParserUtils.ts index 3809ccb3..cc84b625 100644 --- a/packages/webamp/js/skinParserUtils.ts +++ b/packages/webamp/js/skinParserUtils.ts @@ -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 };