diff --git a/bills/billsListMedia.ts b/bills/billsListMedia.ts index 2e94a0c..8908214 100644 --- a/bills/billsListMedia.ts +++ b/bills/billsListMedia.ts @@ -3,6 +3,7 @@ import fs from "fs-extra"; import path from "path"; import GenerateThumbnail from "../util/generateThumbnail"; import MediaFile from "../util/interfaces/MediaFile"; +import ListableChecker from "../util/listableChecker"; import GenerateUrl from "../util/MediaUrlGen"; import { PathToRoBillsFolder, PathToRoFolder } from "../util/pathGenerators"; import { FolderPaths } from "../util/serverInit"; @@ -54,7 +55,8 @@ export async function BillsListMedia(req: Request, res: Response) { !/(^|\/)\.[^\/\.]/g.test(f.name) && (invoice_number !== "" ? f.name.toLowerCase().includes(invoice_number.toLowerCase()) - : true) + : true) && + ListableChecker(f) ); ret = await Promise.all( diff --git a/jobs/jobsListMedia.ts b/jobs/jobsListMedia.ts index 6397512..19ec39f 100644 --- a/jobs/jobsListMedia.ts +++ b/jobs/jobsListMedia.ts @@ -4,6 +4,7 @@ import path from "path"; import { logger } from "../server"; import GenerateThumbnail from "../util/generateThumbnail"; import MediaFile from "../util/interfaces/MediaFile"; +import ListableChecker from "../util/listableChecker"; import GenerateUrl from "../util/MediaUrlGen"; import { PathToRoFolder } from "../util/pathGenerators"; import { FolderPaths } from "../util/serverInit"; @@ -45,7 +46,10 @@ export async function JobsListMedia(req: Request, res: Response) { await fs.readdir(PathToRoFolder(jobid), { withFileTypes: true, }) - ).filter((f) => f.isFile() && !/(^|\/)\.[^\/\.]/g.test(f.name)); + ).filter( + (f) => + f.isFile() && !/(^|\/)\.[^\/\.]/g.test(f.name) && ListableChecker(f) + ); ret = await Promise.all( filesList.map(async (file) => { diff --git a/package.json b/package.json index 563d7aa..1a283d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bodyshop-media-server", - "version": "0.0.1", + "version": "1.0.1", "license": "UNLICENSED", "engines": { "node": "16.15.0" diff --git a/util/listableChecker.ts b/util/listableChecker.ts new file mode 100644 index 0000000..0bc7462 --- /dev/null +++ b/util/listableChecker.ts @@ -0,0 +1,8 @@ +import fs from "fs-extra"; + +function ListableChecker(file: fs.Dirent) { + if (file.name === "Thumbs.db") return false; + return true; +} + +export default ListableChecker;