This commit is contained in:
parent
58fc8eaf0c
commit
6fd9b756e4
1 changed files with 9 additions and 10 deletions
|
@ -30,22 +30,21 @@ export default class ImageHelper {
|
|||
|
||||
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;
|
||||
|
||||
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 buffer = Buffer.from(response.data);
|
||||
const data = await Jimp.fromBuffer(buffer);
|
||||
|
||||
bitmap = (await Jimp.fromBuffer(buffer)).bitmap;
|
||||
bitmap = data.bitmap;
|
||||
} 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);
|
||||
|
|
Loading…
Add table
Reference in a new issue