Merged in release/1.0.1 (pull request #1)

IO-1931 Remove thumbs.db from listing.

Approved-by: Patrick Fic

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(

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) => {

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"

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;