Add new arguments

Author: thinknathan

@types/types.d.ts

@@ -3,4 +3,6 @@ declare type Options = {
 	folderPath?: string;
 	width: number;
 	height?: number;
+	canvasWidth?: number;
+	canvasHeight?: number;
 };

slice.cjs

@@ -39,11 +39,27 @@ const options = yargs
 			}
 			return Math.round(value);
 		},
+	})
+	.option('d', {
+		alias: 'canvasWidth',
+		describe: 'Width of the canvas',
+		type: 'number',
+	})
+	.option('g', {
+		alias: 'canvasHeight',
+		describe: 'Height of the canvas',
+		type: 'number',
 	}).argv;
 if (options.filename) {
 	// Process a single image
-	const { filename, width, height } = options;
-	(0, processImage_1.sliceImage)(filename, width, height);
+	const { filename, width, height, canvasWidth, canvasHeight } = options;
+	(0, processImage_1.sliceImage)(
+		filename,
+		width,
+		height,
+		canvasWidth,
+		canvasHeight,
+	);
 } else if (options.folderPath) {
 	// Process all images in a folder, splitting the task into threads
 	let numCores = 2;

src/slice.ts

@@ -40,12 +40,22 @@ const options = yargs
 			}
 			return Math.round(value);
 		},
+	})
+	.option('d', {
+		alias: 'canvasWidth',
+		describe: 'Width of canvas for final output',
+		type: 'number',
+	})
+	.option('g', {
+		alias: 'canvasHeight',
+		describe: 'Height of canvas for final output',
+		type: 'number',
 	}).argv as unknown as Options;
 
 if (options.filename) {
 	// Process a single image
-	const { filename, width, height } = options;
-	sliceImage(filename, width, height);
+	const { filename, width, height, canvasWidth, canvasHeight } = options;
+	sliceImage(filename, width, height, canvasWidth, canvasHeight);
 } else if (options.folderPath) {
 	// Process all images in a folder, splitting the task into threads
 	let numCores = 2;

src/utils/processImage.ts

@@ -12,6 +12,8 @@ export function sliceImage(
 	filename: string,
 	width: number,
 	height?: number,
+	canvasWidth?: number,
+	canvasHeight?: number,
 	skipExtCheck?: boolean,
 ): void {
 	Jimp.read(filename, (err, image) => {
@@ -20,7 +22,14 @@ export function sliceImage(
 		} else {
 			// Continue slicing if image is successfully read
 			if (image) {
-				continueSlicing(image, width, height, filename);
+				continueSlicing(
+					image,
+					width,
+					height,
+					canvasWidth,
+					canvasHeight,
+					filename,
+				);
 				return;
 			}
 		}
@@ -41,7 +50,14 @@ export function sliceImage(
 			Jimp.read(fullFilename, (err, image) => {
 				if (!foundImage && !err) {
 					foundImage = true;
-					continueSlicing(image, width, height, fullFilename);
+					continueSlicing(
+						image,
+						width,
+						height,
+						canvasWidth,
+						canvasHeight,
+						fullFilename,
+					);
 				}
 			});
 		}
@@ -55,6 +71,8 @@ function continueSlicing(
 	image: Jimp,
 	width: number,
 	height: number | undefined,
+	canvasWidth: number | undefined,
+	canvasHeight: number | undefined,
 	inputFilename: string,
 ): void {
 	// If height is not specified, use width as height
@@ -100,6 +118,6 @@ function continueSlicing(
 if (!isMainThread) {
 	const { filePath, options } = workerData;
 	options.filename = filePath;
-	const { filename, width, height } = options;
-	sliceImage(filename, width, height, true);
+	const { filename, width, height, canvasWidth, canvasHeight } = options;
+	sliceImage(filename, width, height, canvasWidth, canvasHeight, true);
 }

utils/processImage.js

@@ -9,15 +9,15 @@ const outputFolder = 'output';
 /**
  * Function to slice an image into smaller segments
  */
-function sliceImage(filename, width, height, skipExtCheck) {
+function sliceImage(filename, width, height, canvasWidth, canvasHeight, skipExtCheck) {
     Jimp.read(filename, (err, image) => {
         if (err && skipExtCheck) {
             console.error(err);
         }
         else {
             // Continue slicing if image is successfully read
             if (image) {
-                continueSlicing(image, width, height, filename);
+                continueSlicing(image, width, height, canvasWidth, canvasHeight, filename);
                 return;
             }
         }
@@ -35,7 +35,7 @@ function sliceImage(filename, width, height, skipExtCheck) {
             Jimp.read(fullFilename, (err, image) => {
                 if (!foundImage && !err) {
                     foundImage = true;
-                    continueSlicing(image, width, height, fullFilename);
+                    continueSlicing(image, width, height, canvasWidth, canvasHeight, fullFilename);
                 }
             });
         }
@@ -45,7 +45,7 @@ exports.sliceImage = sliceImage;
 /**
  * Continue slicing the image into smaller segments
  */
-function continueSlicing(image, width, height, inputFilename) {
+function continueSlicing(image, width, height, canvasWidth, canvasHeight, inputFilename) {
     // If height is not specified, use width as height
     height = height || width;
     const imageWidth = image.getWidth();
@@ -77,6 +77,6 @@ function continueSlicing(image, width, height, inputFilename) {
 if (!worker_threads_1.isMainThread) {
     const { filePath, options } = worker_threads_1.workerData;
     options.filename = filePath;
-    const { filename, width, height } = options;
-    sliceImage(filename, width, height, true);
+    const { filename, width, height, canvasWidth, canvasHeight } = options;
+    sliceImage(filename, width, height, canvasWidth, canvasHeight, true);
 }