IO-2086 Create optimized images.

This commit is contained in:
Patrick Fic
2022-10-24 12:43:41 -07:00
parent 3ef5d4200e
commit 32beabccb5
8 changed files with 107 additions and 42 deletions

View File

@@ -1,13 +1,12 @@
import fs from "fs-extra";
import { access } from "fs/promises";
import imageThumbnail from "image-thumbnail";
import path from "path";
import gm from "gm";
import ft from "file-type";
import core from "file-type/core";
import GenerateUrl from "./MediaUrlGen";
import { AssetPaths, FolderPaths } from "./serverInit";
import fs from "fs-extra";
import { access } from "fs/promises";
import gm from "gm";
import imageThumbnail from "image-thumbnail";
import path from "path";
import { logger } from "../server";
import { AssetPaths, FolderPaths } from "./serverInit";
const simpleThumb = require("simple-thumbnail");
const ffmpeg = require("ffmpeg-static");
@@ -67,6 +66,67 @@ export default async function GenerateThumbnail(
}
}
/** @returns {string} Returns the relative path from the file to the thumbnail on the server. This must be converted to a URL. */
export async function GenerateOptimized(
file: string
//thumbPath: string
) {
const type: core.FileTypeResult | undefined = await ft.fromFile(file);
let thumbnailExtension: string = GetThumbnailExtension(type, true);
let thumbPath: string = path.join(
path.dirname(file),
FolderPaths.OptimizedSubDir,
path.parse(path.basename(file)).name + thumbnailExtension
);
try {
//Ensure the thumbs directory exists.
await fs.ensureDir(path.dirname(thumbPath));
try {
await access(thumbPath);
logger.debug("Optimized image already exists for : " + thumbPath);
return path.relative(path.dirname(file), thumbPath);
} catch {}
//Check to see if the file is an image, PDF, or video.
if (type?.mime === "application/pdf") {
const fileOnDisk: Buffer = await fs.readFile(file);
await GeneratePdfThumbnail(file, thumbPath);
} else if (type?.mime.startsWith("video")) {
await simpleThumb(file, thumbPath, "250x?", {
path: ffmpeg,
});
} else {
logger.debug("Optimized image being created for : " + thumbPath);
await OptimizeImage(file, thumbPath);
}
return path.relative(path.dirname(file), thumbPath);
} catch (err) {
logger.error("Error when genenerating optimized image:", {
thumbPath,
err,
message: (err as Error).message,
});
return path.relative(path.dirname(file), AssetPaths.File);
}
}
async function OptimizeImage(file: string, optimizedPath: string) {
const fileOnDisk: Buffer = await fs.readFile(file);
return new Promise<string>((resolve, reject) => {
const result = gm(fileOnDisk)
.resize(1500)
.quality(75)
.write(optimizedPath, (error) => {
if (error) reject(error.message);
resolve(optimizedPath);
});
});
}
async function GeneratePdfThumbnail(file: string, thumbPath: string) {
const fileOnDisk: Buffer = await fs.readFile(file);
return new Promise<string>((resolve, reject) => {
@@ -82,7 +142,11 @@ async function GeneratePdfThumbnail(file: string, thumbPath: string) {
});
}
function GetThumbnailExtension(file: core.FileTypeResult | undefined) {
function GetThumbnailExtension(
file: core.FileTypeResult | undefined,
useJpeg?: boolean
) {
if (useJpeg) return ".jpg";
if (file === undefined) return ".png";
return ".png";
}

View File

@@ -1,22 +1,13 @@
import { Request, Response } from "express";
import multer from "multer";
import GenerateThumbnail from "../util/generateThumbnail";
import generateUniqueFilename from "../util/generateUniqueFilename";
import { PathToRoFolder } from "../util/pathGenerators";
import fs from "fs-extra";
import { access } from "fs/promises";
import imageThumbnail from "image-thumbnail";
import path, { resolve } from "path";
import gm from "gm";
import dotenv from "dotenv";
import ft from "file-type";
import core from "file-type/core";
import GenerateUrl from "./MediaUrlGen";
import { FolderPaths } from "./serverInit";
import path, { resolve } from "path";
import { logger } from "../server";
import dotenv from "dotenv";
import { FolderPaths } from "./serverInit";
const heicConverter = require("heic-convert");

View File

@@ -17,6 +17,7 @@ export const FolderPaths = {
Jobs: path.join(RootDirectory, JobsFolder),
Vendors: path.join(RootDirectory, VendorsFolder),
ThumbsSubDir: "/thumbs",
OptimizedSubDir: "/optimized",
BillsSubDir: "/bills",
ConvertedOriginalSubDir: "/ConvertedOriginal",
StaticPath: "/static",