diff --git a/js/skinParser.js b/js/skinParser.js index c95bc3c2..1c7087ae 100644 --- a/js/skinParser.js +++ b/js/skinParser.js @@ -51,16 +51,6 @@ const CURSORS = [ */ ]; -async function getCursorFromFilename(zip, fileName) { - const file = await SkinParserUtils.getFileFromZip( - zip, - fileName, - "CUR", - "base64" - ); - return file && `data:image/x-win-bitmap;base64,${file.contents}`; -} - async function genPlaylistStyle(zip) { const pledit = await SkinParserUtils.getFileFromZip( zip, @@ -114,7 +104,10 @@ async function genImages(zip) { async function genCursors(zip) { const cursorObjs = await Promise.all( CURSORS.map(async cursorName => ({ - [cursorName]: await getCursorFromFilename(zip, cursorName), + [cursorName]: await SkinParserUtils.getCursorFromFilename( + zip, + cursorName + ), })) ); return shallowMerge(cursorObjs); diff --git a/js/skinParserUtils.ts b/js/skinParserUtils.ts index 17cba266..4093750f 100644 --- a/js/skinParserUtils.ts +++ b/js/skinParserUtils.ts @@ -106,3 +106,13 @@ export async function getSpriteUrisFromFilename( } return getSpriteUrisFromImg(img, SKIN_SPRITES[fileName]); } + +export async function getCursorFromFilename( + zip: JSZip, + fileName: string +): Promise { + const file = await getFileFromZip(zip, fileName, "CUR", "base64"); + return file == null + ? null + : `data:image/x-win-bitmap;base64,${file.contents}`; +}