From 7121616a1f00b852d733d92fa7f7729e002771aa Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Thu, 8 Sep 2022 10:05:38 -0700 Subject: [PATCH] IO-2039 Add unknown file type thumbnail. --- assets/file.png | Bin 0 -> 8811 bytes server.ts | 2 ++ util/generateThumbnail.ts | 6 +++--- util/serverInit.ts | 4 ++++ 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 assets/file.png diff --git a/assets/file.png b/assets/file.png new file mode 100644 index 0000000000000000000000000000000000000000..4a592848d6c776f78b068547b2615b28fbaf9961 GIT binary patch literal 8811 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 C4gRnI literal 0 HcmV?d00001 diff --git a/server.ts b/server.ts index e6d6017..56c5fad 100644 --- a/server.ts +++ b/server.ts @@ -150,6 +150,7 @@ app.post( BillRequestValidator, BillsUploadMedia ); + app.get( "/", ValidateImsToken, @@ -160,6 +161,7 @@ app.get( InitServer(); app.use(FolderPaths.StaticPath, express.static(FolderPaths.Root, {})); +app.use("/assets", express.static("./assets", {})); app.listen(port, () => { logger.info(`ImEX Media Server is running at http://localhost:${port}`); }); diff --git a/util/generateThumbnail.ts b/util/generateThumbnail.ts index e3cc238..36529e1 100644 --- a/util/generateThumbnail.ts +++ b/util/generateThumbnail.ts @@ -6,7 +6,7 @@ import gm from "gm"; import ft from "file-type"; import core from "file-type/core"; import GenerateUrl from "./MediaUrlGen"; -import { FolderPaths } from "./serverInit"; +import { AssetPaths, FolderPaths } from "./serverInit"; import { logger } from "../server"; const simpleThumb = require("simple-thumbnail"); const ffmpeg = require("ffmpeg-static"); @@ -53,7 +53,7 @@ export default async function GenerateThumbnail( height: 250, width: 250, }); - + console.log("Image success."); await fs.writeFile(thumbPath, thumbnail); } return path.relative(path.dirname(file), thumbPath); @@ -63,7 +63,7 @@ export default async function GenerateThumbnail( err, message: (err as Error).message, }); - return path.relative(path.dirname(file), thumbPath); + return path.relative(path.dirname(file), AssetPaths.File); } } diff --git a/util/serverInit.ts b/util/serverInit.ts index 3895c16..4fc0419 100644 --- a/util/serverInit.ts +++ b/util/serverInit.ts @@ -24,6 +24,10 @@ export const FolderPaths = { VendorsFolder, }; +export const AssetPaths = { + File: "/assets/file.png", +}; + export function JobRelativeFilePath(jobid: string, filename: string) { return path.join(FolderPaths.Jobs, jobid, filename); }