External/card-drop
5
0
Fork 0
Code Issues 46 Pull requests 2 Projects 1 Releases 29 Packages Wiki Activity Actions

Simplify image helper
All checks were successful
Test / build (push) Successful in 42s
Details

Browse source
This commit is contained in:
Ethan Lane 2025-04-17 14:54:46 +01:00
parent 58fc8eaf0c
commit 6fd9b756e4
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/helpers/ImageHelper.ts
View file

@ -30,22 +30,21 @@ export default class ImageHelper {
const filePath = path.join(process.env.DATA_DIR!, "cards", card.path); const filePath = path.join(process.env.DATA_DIR!, "cards", card.path);
const exists = existsSync(filePath) || card.path.startsWith("http://") || card.path.startsWith("https://");
if (!exists) {
AppLogger.LogError("ImageHelper/GenerateCardImageGrid", `Failed to load image from path ${card.path}`);
continue;
}
let bitmap: Bitmap; let bitmap: Bitmap;
if (card.path.startsWith("http://") || card.path.startsWith("https://")) { if (existsSync(filePath)) {
const data = await Jimp.read(filePath);
bitmap = data.bitmap;
} else if (card.path.startsWith("http://") || card.path.startsWith("https://")) {
const response = await axios.get(card.path, { responseType: "arraybuffer" }); const response = await axios.get(card.path, { responseType: "arraybuffer" });
const buffer = Buffer.from(response.data); const buffer = Buffer.from(response.data);
const data = await Jimp.fromBuffer(buffer);
bitmap = (await Jimp.fromBuffer(buffer)).bitmap; bitmap = data.bitmap;
} else { } else {
bitmap = (await Jimp.read(filePath)).bitmap; AppLogger.LogError("ImageHelper/GenerateCardImageGrid", `Failed to load image from path ${card.path}`);
continue;
} }
const imageData = Jimp.fromBitmap(bitmap); const imageData = Jimp.fromBitmap(bitmap);