Merge branch 'dev' of https://github.com/jacksonkasi1/ImagePro-Export …

…into dev
jacksonkasi1 · Sep 28, 2024 · 691715a · 691715a
2 parents 8144050 + 2cb46d1
commit 691715a
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 6 deletions.
diff --git a/server/imagepro-file-process/package.json b/server/imagepro-file-process/package.json
@@ -15,12 +15,14 @@
   "dependencies": {
     "@types/cors": "^2.8.17",
     "@types/node-cron": "^3.0.11",
+    "@types/uuid": "^10.0.0",
     "cors": "^2.8.5",
     "express": "^4.21.0",
     "morgan": "^1.10.0",
     "multer": "^1.4.5-lts.1",
     "node-cron": "^3.0.3",
-    "tsconfig-paths": "^4.2.0"
+    "tsconfig-paths": "^4.2.0",
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",

diff --git a/server/imagepro-file-process/pnpm-lock.yaml b/server/imagepro-file-process/pnpm-lock.yaml
diff --git a/server/imagepro-file-process/src/utils/pdf-utils/pdf-color.ts b/server/imagepro-file-process/src/utils/pdf-utils/pdf-color.ts
@@ -1,5 +1,8 @@
 import path from "path";
 import { promises as fs } from "fs";
+
+import { v4 as uuidv4 } from 'uuid'; 
+
 import { convertPdf } from "./pdf-convert";
 import { sanitizeFileName } from "../../utils/file-utils";
 import { UploadedPdf } from "../../types/pdf";
@@ -15,12 +18,14 @@ export const convertToColorMode = async (
   file: Express.Multer.File | UploadedPdf,
   mode: "cmyk" | "grayscale"
 ): Promise<UploadedPdf> => {
-  // Handle both file types (Express.Multer.File or UploadedPdf)
   const inputPath = 'path' in file ? path.resolve(file.path) : path.resolve(file.outputPath);
   const originalName = 'originalname' in file ? file.originalname : file.outputFilename;
   const sanitizedOriginalName = sanitizeFileName(path.parse(originalName).name);
 
-  const outputFilename = `${sanitizedOriginalName}_${mode}.pdf`;
+  // Generate a unique identifier
+  const uniqueId = uuidv4();
+
+  const outputFilename = `${sanitizedOriginalName}_${mode}_${uniqueId}.pdf`;
   const outputDir = path.resolve("public/assets");
   const outputPath = path.join(outputDir, outputFilename);
 

diff --git a/server/imagepro-file-process/src/utils/pdf-utils/pdf-merge.ts b/server/imagepro-file-process/src/utils/pdf-utils/pdf-merge.ts
@@ -1,6 +1,9 @@
 import path from "path";
-import { exec } from "child_process";
 import { promises as fs } from "fs";
+import { exec } from "child_process";
+
+import { v4 as uuidv4 } from 'uuid';
+
 import { UploadedPdf } from "../../types/pdf";
 
 /**
@@ -10,7 +13,8 @@ import { UploadedPdf } from "../../types/pdf";
  */
 export const mergePdfFiles = async (files: Express.Multer.File[]): Promise<UploadedPdf> => {
   const outputDir = path.resolve("public/assets");
-  const outputFilename = `merged_${Date.now()}.pdf`;
+  const uniqueId = uuidv4();
+  const outputFilename = `merged_${uniqueId}.pdf`;
   const outputPath = path.join(outputDir, outputFilename);
 
   await fs.mkdir(outputDir, { recursive: true });

diff --git a/server/imagepro-file-process/src/utils/pdf-utils/pdf-password.ts b/server/imagepro-file-process/src/utils/pdf-utils/pdf-password.ts
@@ -1,7 +1,11 @@
 import path from "path";
 import { promises as fs } from "fs";
+
+import { v4 as uuidv4 } from 'uuid';
+
 import { applyEncryption } from "./pdf-convert";
 import { sanitizeFileName } from "../../utils/file-utils";
+
 import { UploadedPdf } from "../../types/pdf";
 
 /**
@@ -12,7 +16,8 @@ import { UploadedPdf } from "../../types/pdf";
  */
 export const applyPassword = async (file: UploadedPdf, password: string): Promise<UploadedPdf> => {
   const outputDir = path.resolve("public/assets");
-  const outputFilename = `${sanitizeFileName(path.parse(file.outputFilename).name)}_protected.pdf`;
+  const uniqueId = uuidv4();
+  const outputFilename = `${sanitizeFileName(path.parse(file.outputFilename).name)}_protected_${uniqueId}.pdf`;
   const outputPath = path.join(outputDir, outputFilename);
 
   await fs.mkdir(outputDir, { recursive: true });