Minor refactor

Author: thinknathan

slice.cjs

@@ -97,17 +97,7 @@ function main() {
 		}).argv;
 	if (options.filename) {
 		// Process a single image
-		const { filename, width, height, canvasWidth, canvasHeight, scale, cubic } =
-			options;
-		(0, processImage_1.sliceImage)(
-			filename,
-			width,
-			height,
-			canvasWidth,
-			canvasHeight,
-			scale,
-			cubic,
-		);
+		(0, processImage_1.sliceImage)(options);
 	} else if (options.folderPath) {
 		// Process all images in a folder, splitting the task into threads
 		let numCores = 1;

src/slice.ts

@@ -99,17 +99,7 @@ function main() {
 
 	if (options.filename) {
 		// Process a single image
-		const { filename, width, height, canvasWidth, canvasHeight, scale, cubic } =
-			options;
-		sliceImage(
-			filename,
-			width,
-			height,
-			canvasWidth,
-			canvasHeight,
-			scale,
-			cubic,
-		);
+		sliceImage(options);
 	} else if (options.folderPath) {
 		// Process all images in a folder, splitting the task into threads
 		let numCores = 1;

src/utils/processImage.ts

@@ -12,31 +12,14 @@ function errorCallback(err: unknown) {
 /**
  * Function to slice an image into smaller segments
  */
-export function sliceImage(
-	filename: string,
-	width: number,
-	height: number | undefined,
-	canvasWidth: number | undefined,
-	canvasHeight: number | undefined,
-	scale: number,
-	cubic: boolean,
-	skipExtCheck?: boolean,
-): void {
-	Jimp.read(filename)
+export function sliceImage(options: Options, skipExtCheck?: boolean): void {
+	const { filename } = options;
+	Jimp.read(filename!)
 		.then((image) => {
 			// Continue slicing if image is successfully read
 			if (image) {
 				skipExtCheck = true;
-				continueSlicing(
-					image,
-					width,
-					height,
-					canvasWidth,
-					canvasHeight,
-					scale,
-					cubic,
-					filename,
-				);
+				continueSlicing(image, options);
 			}
 		})
 		.catch((err) => {
@@ -60,16 +43,7 @@ export function sliceImage(
 					Jimp.read(fullFilename)
 						.then((image) => {
 							foundImage = true;
-							continueSlicing(
-								image,
-								width,
-								height,
-								canvasWidth,
-								canvasHeight,
-								scale,
-								cubic,
-								fullFilename,
-							);
+							continueSlicing(image, options);
 						})
 						// Silence errors since we'll handle them later
 						.catch(() => {})
@@ -90,20 +64,12 @@ export function sliceImage(
 /**
  * Continue slicing the image into smaller segments
  */
-function continueSlicing(
-	image: Jimp,
-	width: number,
-	height: number | undefined,
-	canvasWidth: number | undefined,
-	canvasHeight: number | undefined,
-	scale: number,
-	cubic: boolean,
-	inputFilename: string,
-): void {
+function continueSlicing(image: Jimp, options: Options): void {
 	console.time('Done in');
 
+	const { filename, width, canvasWidth, canvasHeight, scale, cubic } = options;
 	// If height is not specified, use width as height
-	height = height || width;
+	const height = options.height || options.width;
 
 	const imageWidth = image.getWidth();
 	const imageHeight = image.getHeight();
@@ -130,10 +96,7 @@ function continueSlicing(
 			const slice = image.clone().crop(startX, startY, sliceWidth, sliceHeight);
 
 			// Incorporate the input filename into the output filename
-			const baseFilename = path.basename(
-				inputFilename,
-				path.extname(inputFilename),
-			);
+			const baseFilename = path.basename(filename!, path.extname(filename!));
 			const outputFilename = `${outputFolder}/${baseFilename}_${x}_${y}.png`;
 
 			if (canvasWidth || canvasHeight) {
@@ -179,16 +142,6 @@ function continueSlicing(
 if (!isMainThread) {
 	const { filePath, options } = workerData;
 	options.filename = filePath;
-	const { filename, width, height, canvasWidth, canvasHeight, scale, cubic } =
-		options;
-	sliceImage(
-		filename,
-		width,
-		height,
-		canvasWidth,
-		canvasHeight,
-		scale,
-		cubic,
-		true,
-	);
+
+	sliceImage(options, true);
 }

utils/processImage.js

@@ -13,13 +13,14 @@ function errorCallback(err) {
 /**
  * Function to slice an image into smaller segments
  */
-function sliceImage(filename, width, height, canvasWidth, canvasHeight, scale, cubic, skipExtCheck) {
+function sliceImage(options, skipExtCheck) {
+    const { filename } = options;
     Jimp.read(filename)
         .then((image) => {
         // Continue slicing if image is successfully read
         if (image) {
             skipExtCheck = true;
-            continueSlicing(image, width, height, canvasWidth, canvasHeight, scale, cubic, filename);
+            continueSlicing(image, options);
         }
     })
         .catch((err) => {
@@ -40,7 +41,7 @@ function sliceImage(filename, width, height, canvasWidth, canvasHeight, scale, c
             return (Jimp.read(fullFilename)
                 .then((image) => {
                 foundImage = true;
-                continueSlicing(image, width, height, canvasWidth, canvasHeight, scale, cubic, fullFilename);
+                continueSlicing(image, options);
             })
                 // Silence errors since we'll handle them later
                 .catch(() => { }));
@@ -59,10 +60,11 @@ exports.sliceImage = sliceImage;
 /**
  * Continue slicing the image into smaller segments
  */
-function continueSlicing(image, width, height, canvasWidth, canvasHeight, scale, cubic, inputFilename) {
+function continueSlicing(image, options) {
     console.time('Done in');
+    const { filename, width, canvasWidth, canvasHeight, scale, cubic } = options;
     // If height is not specified, use width as height
-    height = height || width;
+    const height = options.height || options.width;
     const imageWidth = image.getWidth();
     const imageHeight = image.getHeight();
     // Calculate the number of slices in both dimensions
@@ -82,7 +84,7 @@ function continueSlicing(image, width, height, canvasWidth, canvasHeight, scale,
             const sliceHeight = Math.min(height, imageHeight - startY);
             const slice = image.clone().crop(startX, startY, sliceWidth, sliceHeight);
             // Incorporate the input filename into the output filename
-            const baseFilename = path.basename(inputFilename, path.extname(inputFilename));
+            const baseFilename = path.basename(filename, path.extname(filename));
             const outputFilename = `${outputFolder}/${baseFilename}_${x}_${y}.png`;
             if (canvasWidth || canvasHeight) {
                 // Calculate canvas dimensions
@@ -114,6 +116,5 @@ function continueSlicing(image, width, height, canvasWidth, canvasHeight, scale,
 if (!worker_threads_1.isMainThread) {
     const { filePath, options } = worker_threads_1.workerData;
     options.filename = filePath;
-    const { filename, width, height, canvasWidth, canvasHeight, scale, cubic } = options;
-    sliceImage(filename, width, height, canvasWidth, canvasHeight, scale, cubic, true);
+    sliceImage(options, true);
 }