Fix Service Crashes on Multiple Page Scan #806

manuc66 · Nov 29, 2023 · d2e734b · d2e734b
1 parent add48f2
commit d2e734b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -131,7 +131,7 @@ async function adfAutoscanCmd(
         tempFolder,
         adfAutoScanConfig,
         deviceCapabilities,
-        new Date()
+        new Date(),
       );
     } catch (e) {
       console.log(e);

diff --git a/src/scanProcessing.ts b/src/scanProcessing.ts
@@ -154,7 +154,6 @@ async function executeScanJob(
   scanCount: number,
   scanJobContent: ScanContent,
   filePattern: string | undefined,
-  date: Date,
 ): Promise<"Completed" | "Canceled"> {
   const jobUrl = await HPApi.postJob(scanJobSettings);
 
@@ -176,7 +175,7 @@ async function executeScanJob(
         scanCount,
         scanJobContent.elements.length + 1,
         filePattern,
-        date,
+        new Date(),
       );
       job = await HPApi.getJob(jobUrl);
       if (page != null && job.jobState != "Canceled") {
@@ -230,7 +229,6 @@ async function executeScanJobs(
   firstEvent: Event,
   deviceCapabilities: DeviceCapabilities,
   filePattern: string | undefined,
-  date: Date,
 ) {
   let jobState = await executeScanJob(
     scanJobSettings,
@@ -239,7 +237,6 @@ async function executeScanJobs(
     scanCount,
     scanJobContent,
     filePattern,
-    date,
   );
   let lastEvent = firstEvent;
   if (
@@ -265,7 +262,6 @@ async function executeScanJobs(
         scanCount,
         scanJobContent,
         filePattern,
-        new Date(),
       );
       if (jobState !== "Completed") {
         return;
@@ -473,7 +469,6 @@ export async function saveScan(
     event,
     deviceCapabilities,
     scanConfig.directoryConfig.filePattern,
-    scanDate,
   );
 
   console.log(
@@ -533,7 +528,11 @@ export async function scanFromAdf(
     destinationFolder = folder;
   }
 
-  const scanWidth = getScanWidth(adfAutoScanConfig, InputSource.Adf, deviceCapabilities);
+  const scanWidth = getScanWidth(
+    adfAutoScanConfig,
+    InputSource.Adf,
+    deviceCapabilities,
+  );
   const scanHeight = getScanHeight(
     adfAutoScanConfig,
     InputSource.Adf,
@@ -558,7 +557,6 @@ export async function scanFromAdf(
     scanCount,
     scanJobContent,
     adfAutoScanConfig.directoryConfig.filePattern,
-    date,
   );
 
   console.log(

diff --git a/test/PathHelper.test.ts b/test/PathHelper.test.ts
@@ -13,7 +13,7 @@ const now: Date = new Date();
 describe("PathHelper", () => {
   describe("getFileForPage", () => {
     it("Can format a file with formatted timestamp", async () => {
-      const nextFileName = PathHelper.getFileForPage(
+        const nextFileName = PathHelper.getFileForPage(
         "someFolder",
         2,
         1,