Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-21 00:59:29 +00:00
Code Issues Projects Releases Wiki Activity

Start pulling parts of skinParser out into a TypeScript utils file

Browse source 
This will let us gradually type this file
This commit is contained in:
Jordan Eldredge 2019-04-25 06:57:10 -07:00
parent fb35324ab6
commit a1495cfd16
2 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

31
js/skinParser.js
View file

@ -2,6 +2,7 @@ import SKIN_SPRITES from "./skinSprites";
import regionParser from "./regionParser";
import { LETTERS, DEFAULT_SKIN } from "./constants";
import { parseViscolors, parseIni, getFileExtension, objectMap } from "./utils";
import * as SkinParserUtils from "./skinParserUtils";
const shallowMerge = objs =>
objs.reduce((prev, img) => Object.assign(prev, img), {});
@ -50,34 +51,6 @@ const CURSORS = [
*/
];
const _genImgFromBlob = async blob =>
new Promise((resolve, reject) => {
const img = new Image();
img.onload = () => {
// Schedule cleanup of object url?
// Maybe on next tick, or with requestidlecallback
resolve(img);
};
img.onerror = () => reject("Failed to decode image");
img.src = URL.createObjectURL(blob);
});
const genImgFromBlob = async blob => {
if (window.createImageBitmap) {
try {
// Use this faster native browser API if available.
return await window.createImageBitmap(blob);
} catch (e) {
console.warn(
"Encountered an error with createImageBitmap. Falling back to Image approach."
);
// There are some bugs in the new API. In case something goes wrong, we call fall back.
return _genImgFromBlob(blob);
}
}
return _genImgFromBlob(blob);
};
async function genFileFromZip(zip, fileName, ext, mode) {
const regex = new RegExp(`^(.*/)?${fileName}(\.${ext})?$`, "i");
const files = zip.file(regex);
@ -119,7 +92,7 @@ async function genImgFromFilename(zip, fileName) {
// mime type, but it looks like Firefox does not. So we specify it here
// explicitly.
const typedBlob = new Blob([file.contents], { type: mimeType });
return genImgFromBlob(typedBlob);
return SkinParserUtils.getImgFromBlob(typedBlob);
}
async function genSpriteUrisFromFilename(zip, fileName) {

30
js/skinParserUtils.ts Normal file
View file

@ -0,0 +1,30 @@
function fallbackGetImgFromBlob(blob: Blob): Promise<HTMLImageElement> {
return new Promise((resolve, reject) => {
const img = new Image();
img.onload = () => {
// Schedule cleanup of object url?
// Maybe on next tick, or with requestidlecallback
resolve(img);
};
img.onerror = () => reject("Failed to decode image");
img.src = URL.createObjectURL(blob);
});
}
export function getImgFromBlob(
blob: Blob
): Promise<ImageBitmap | HTMLImageElement> {
if (window.createImageBitmap) {
try {
// Use this faster native browser API if available.
return window.createImageBitmap(blob);
} catch (e) {
console.warn(
"Encountered an error with createImageBitmap. Falling back to Image approach."
);
// There are some bugs in the new API. In case something goes wrong, we call fall back.
return fallbackGetImgFromBlob(blob);
}
}
return fallbackGetImgFromBlob(blob);
}