node-hp-scan-to 1.6.0 → 1.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/commitInfo.json +1 -1
- package/dist/postProcessing.js +18 -16
- package/dist/postProcessing.js.map +1 -1
- package/package.json +1 -1
- package/src/commitInfo.json +1 -1
- package/src/postProcessing.ts +19 -17
package/README.md
CHANGED
|
@@ -59,7 +59,7 @@ Please note that the `node-hp-scan-to` project is not endorsed by nor affiliated
|
|
|
59
59
|
- ✔️ Customizable resolution
|
|
60
60
|
- ✔️ Customizable label on the device
|
|
61
61
|
- ✔️ Multi platform: Linux, Windows and most probably macOS
|
|
62
|
-
- ✔️
|
|
62
|
+
- ✔️ Mutile target supported: folder, [paperless-ngx](https://docs.paperless-ngx.com/) api upload, nextcloud webdav upload
|
|
63
63
|
- ✔️ Clear all registered target
|
|
64
64
|
- ✔️ Automatic scan when automatic document feeder is getting loaded
|
|
65
65
|
|
package/dist/commitInfo.json
CHANGED
package/dist/postProcessing.js
CHANGED
|
@@ -10,27 +10,29 @@ const nextcloud_1 = require("./nextcloud/nextcloud");
|
|
|
10
10
|
const promises_1 = __importDefault(require("fs/promises"));
|
|
11
11
|
async function postProcessing(scanConfig, folder, tempFolder, scanCount, scanJobContent, scanDate, toPdf) {
|
|
12
12
|
if (toPdf) {
|
|
13
|
-
await
|
|
13
|
+
await handlePdfPostProcessing(folder, tempFolder, scanCount, scanJobContent, scanDate, scanConfig);
|
|
14
14
|
}
|
|
15
15
|
else {
|
|
16
|
-
await
|
|
16
|
+
await handleImagePostProcessing(folder, scanCount, scanJobContent, scanDate, scanConfig);
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
exports.postProcessing = postProcessing;
|
|
20
|
-
async function
|
|
20
|
+
async function handlePdfPostProcessing(folder, tempFolder, scanCount, scanJobContent, scanDate, scanConfig) {
|
|
21
21
|
const paperlessConfig = scanConfig.paperlessConfig;
|
|
22
22
|
const nextcloudConfig = scanConfig.nextcloudConfig;
|
|
23
23
|
const pdfFilePath = await (0, pdfProcessing_1.mergeToPdf)(paperlessConfig ? tempFolder : folder, scanCount, scanJobContent, scanConfig.directoryConfig.filePattern, scanDate, true);
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
24
|
+
if (pdfFilePath != null) {
|
|
25
|
+
displayPdfScan(pdfFilePath, scanJobContent);
|
|
26
|
+
if (paperlessConfig) {
|
|
27
|
+
await (0, paperless_1.uploadPdfToPaperless)(pdfFilePath, paperlessConfig);
|
|
28
|
+
}
|
|
29
|
+
if (nextcloudConfig) {
|
|
30
|
+
await (0, nextcloud_1.uploadPdfToNextcloud)(pdfFilePath, nextcloudConfig);
|
|
31
|
+
}
|
|
32
|
+
await cleanUpFilesIfNeeded([pdfFilePath], paperlessConfig, nextcloudConfig);
|
|
30
33
|
}
|
|
31
|
-
await cleanUpFilesIfNeeded([pdfFilePath], paperlessConfig, nextcloudConfig);
|
|
32
34
|
}
|
|
33
|
-
async function
|
|
35
|
+
async function handleImagePostProcessing(folder, scanCount, scanJobContent, scanDate, scanConfig) {
|
|
34
36
|
const paperlessConfig = scanConfig.paperlessConfig;
|
|
35
37
|
const nextcloudConfig = scanConfig.nextcloudConfig;
|
|
36
38
|
displayJpegScan(scanJobContent);
|
|
@@ -65,12 +67,12 @@ function displayJpegScan(scanJobContent) {
|
|
|
65
67
|
scanJobContent.elements.forEach((e) => console.log(`\t- page ${e.pageNumber.toString().padStart(3, " ")} - ${e.width}x${e.height} - ${e.path}`));
|
|
66
68
|
}
|
|
67
69
|
async function cleanUpFilesIfNeeded(filePaths, paperlessConfig, nextcloudConfig) {
|
|
68
|
-
|
|
70
|
+
var _a, _b;
|
|
71
|
+
let keepFiles = (_b = (_a = paperlessConfig === null || paperlessConfig === void 0 ? void 0 : paperlessConfig.keepFiles) !== null && _a !== void 0 ? _a : nextcloudConfig === null || nextcloudConfig === void 0 ? void 0 : nextcloudConfig.keepFiles) !== null && _b !== void 0 ? _b : true;
|
|
72
|
+
if (!keepFiles) {
|
|
69
73
|
await Promise.all(filePaths.map(async (filePath) => {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
console.log(`File ${filePath} has been removed from the filesystem`);
|
|
73
|
-
}
|
|
74
|
+
await promises_1.default.unlink(filePath);
|
|
75
|
+
console.log(`File ${filePath} has been removed from the filesystem`);
|
|
74
76
|
}));
|
|
75
77
|
}
|
|
76
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postProcessing.js","sourceRoot":"","sources":["../src/postProcessing.ts"],"names":[],"mappings":";;;;;;AACA,mDAA6C;AAC7C,qDAK+B;AAC/B,qDAG+B;AAE/B,2DAA6B;AAItB,KAAK,UAAU,cAAc,CAClC,UAAsB,EACtB,MAAc,EACd,UAAkB,EAClB,SAAiB,EACjB,cAA2B,EAC3B,QAAc,EACd,KAAc;IAEd,IAAI,KAAK,EAAE;QACT,MAAM,
|
|
1
|
+
{"version":3,"file":"postProcessing.js","sourceRoot":"","sources":["../src/postProcessing.ts"],"names":[],"mappings":";;;;;;AACA,mDAA6C;AAC7C,qDAK+B;AAC/B,qDAG+B;AAE/B,2DAA6B;AAItB,KAAK,UAAU,cAAc,CAClC,UAAsB,EACtB,MAAc,EACd,UAAkB,EAClB,SAAiB,EACjB,cAA2B,EAC3B,QAAc,EACd,KAAc;IAEd,IAAI,KAAK,EAAE;QACT,MAAM,uBAAuB,CAC3B,MAAM,EACN,UAAU,EACV,SAAS,EACT,cAAc,EACd,QAAQ,EACR,UAAU,CACX,CAAC;KACH;SAAM;QACL,MAAM,yBAAyB,CAC7B,MAAM,EACN,SAAS,EACT,cAAc,EACd,QAAQ,EACR,UAAU,CACX,CAAC;KACH;AACH,CAAC;AA3BD,wCA2BC;AAED,KAAK,UAAU,uBAAuB,CACpC,MAAc,EACd,UAAkB,EAClB,SAAiB,EACjB,cAA2B,EAC3B,QAAc,EACd,UAAsB;IAEtB,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC;IACnD,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC;IAEnD,MAAM,WAAW,GAAG,MAAM,IAAA,0BAAU,EAClC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,EACrC,SAAS,EACT,cAAc,EACd,UAAU,CAAC,eAAe,CAAC,WAAW,EACtC,QAAQ,EACR,IAAI,CACL,CAAC;IACF,IAAI,WAAW,IAAI,IAAI,EAAE;QACvB,cAAc,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAC5C,IAAI,eAAe,EAAE;YACnB,MAAM,IAAA,gCAAoB,EAAC,WAAW,EAAE,eAAe,CAAC,CAAC;SAC1D;QACD,IAAI,eAAe,EAAE;YACnB,MAAM,IAAA,gCAAoB,EAAC,WAAW,EAAE,eAAe,CAAC,CAAC;SAC1D;QACD,MAAM,oBAAoB,CAAC,CAAC,WAAW,CAAC,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;KAC7E;AACH,CAAC;AAED,KAAK,UAAU,yBAAyB,CACtC,MAAc,EACd,SAAiB,EACjB,cAA2B,EAC3B,QAAc,EACd,UAAsB;IAEtB,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC;IACnD,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC;IAEnD,eAAe,CAAC,cAAc,CAAC,CAAC;IAChC,IAAI,eAAe,EAAE;QACnB,IAAI,eAAe,CAAC,0BAA0B,EAAE;YAC9C,MAAM,IAAA,0DAA8C,EAClD,MAAM,EACN,SAAS,EACT,cAAc,EACd,UAAU,EACV,QAAQ,EACR,eAAe,CAChB,CAAC;SACH;aAAM;YACL,IAAI,eAAe,CAAC,mBAAmB,EAAE;gBACvC,MAAM,IAAA,qEAAyD,EAC7D,cAAc,EACd,eAAe,CAChB,CAAC;aACH;iBAAM;gBACL,MAAM,IAAA,sDAA0C,EAC9C,cAAc,EACd,eAAe,CAChB,CAAC;aACH;SACF;KACF;IACD,IAAI,eAAe,EAAE;QACnB,MAAM,IAAA,mCAAuB,EAAC,cAAc,EAAE,eAAe,CAAC,CAAC;KAChE;IACD,MAAM,SAAS,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,oBAAoB,CAAC,SAAS,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,cAAc,CACrB,WAA0B,EAC1B,cAA2B;IAE3B,IAAI,WAAW,KAAK,IAAI,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;QACpD,OAAO;KACR;IACD,OAAO,CAAC,GAAG,CACT,oDAAoD,WAAW,KAAK,CACrE,CAAC;IACF,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACpC,OAAO,CAAC,GAAG,CACT,YAAY,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,IAC/D,CAAC,CAAC,MACJ,EAAE,CACH,CACF,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,cAA2B;IAClD,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACpC,OAAO,CAAC,GAAG,CACT,YAAY,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,IAC/D,CAAC,CAAC,MACJ,MAAM,CAAC,CAAC,IAAI,EAAE,CACf,CACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,SAAmB,EACnB,eAA4C,EAC5C,eAA4C;;IAE5C,IAAI,SAAS,GACX,MAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,SAAS,mCAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,SAAS,mCAAI,IAAI,CAAC;IACnE,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,OAAO,CAAC,GAAG,CACf,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YAC/B,MAAM,kBAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,QAAQ,uCAAuC,CAAC,CAAC;QACvE,CAAC,CAAC,CACH,CAAC;KACH;AACH,CAAC","sourcesContent":["import { ScanContent } from \"./ScanContent\";\nimport { mergeToPdf } from \"./pdfProcessing\";\nimport {\n convertImagesToPdfAndUploadAsSeparateDocumentsToPaperless,\n mergeToPdfAndUploadAsSingleDocumentToPaperless,\n uploadImagesAsSeparateDocumentsToPaperless,\n uploadPdfToPaperless,\n} from \"./paperless/paperless\";\nimport {\n uploadPdfToNextcloud,\n uploadImagesToNextcloud,\n} from \"./nextcloud/nextcloud\";\nimport { ScanConfig } from \"./scanProcessing\";\nimport fs from \"fs/promises\";\nimport { PaperlessConfig } from \"./paperless/PaperlessConfig\";\nimport { NextcloudConfig } from \"./nextcloud/NextcloudConfig\";\n\nexport async function postProcessing(\n scanConfig: ScanConfig,\n folder: string,\n tempFolder: string,\n scanCount: number,\n scanJobContent: ScanContent,\n scanDate: Date,\n toPdf: boolean,\n) {\n if (toPdf) {\n await handlePdfPostProcessing(\n folder,\n tempFolder,\n scanCount,\n scanJobContent,\n scanDate,\n scanConfig,\n );\n } else {\n await handleImagePostProcessing(\n folder,\n scanCount,\n scanJobContent,\n scanDate,\n scanConfig,\n );\n }\n}\n\nasync function handlePdfPostProcessing(\n folder: string,\n tempFolder: string,\n scanCount: number,\n scanJobContent: ScanContent,\n scanDate: Date,\n scanConfig: ScanConfig,\n) {\n const paperlessConfig = scanConfig.paperlessConfig;\n const nextcloudConfig = scanConfig.nextcloudConfig;\n\n const pdfFilePath = await mergeToPdf(\n paperlessConfig ? tempFolder : folder,\n scanCount,\n scanJobContent,\n scanConfig.directoryConfig.filePattern,\n scanDate,\n true,\n );\n if (pdfFilePath != null) {\n displayPdfScan(pdfFilePath, scanJobContent);\n if (paperlessConfig) {\n await uploadPdfToPaperless(pdfFilePath, paperlessConfig);\n }\n if (nextcloudConfig) {\n await uploadPdfToNextcloud(pdfFilePath, nextcloudConfig);\n }\n await cleanUpFilesIfNeeded([pdfFilePath], paperlessConfig, nextcloudConfig);\n }\n}\n\nasync function handleImagePostProcessing(\n folder: string,\n scanCount: number,\n scanJobContent: ScanContent,\n scanDate: Date,\n scanConfig: ScanConfig,\n) {\n const paperlessConfig = scanConfig.paperlessConfig;\n const nextcloudConfig = scanConfig.nextcloudConfig;\n\n displayJpegScan(scanJobContent);\n if (paperlessConfig) {\n if (paperlessConfig.groupMultiPageScanIntoAPdf) {\n await mergeToPdfAndUploadAsSingleDocumentToPaperless(\n folder,\n scanCount,\n scanJobContent,\n scanConfig,\n scanDate,\n paperlessConfig,\n );\n } else {\n if (paperlessConfig.alwaysSendAsPdfFile) {\n await convertImagesToPdfAndUploadAsSeparateDocumentsToPaperless(\n scanJobContent,\n paperlessConfig,\n );\n } else {\n await uploadImagesAsSeparateDocumentsToPaperless(\n scanJobContent,\n paperlessConfig,\n );\n }\n }\n }\n if (nextcloudConfig) {\n await uploadImagesToNextcloud(scanJobContent, nextcloudConfig);\n }\n const filePaths = scanJobContent.elements.map((element) => element.path);\n await cleanUpFilesIfNeeded(filePaths, paperlessConfig, nextcloudConfig);\n}\n\nfunction displayPdfScan(\n pdfFilePath: string | null,\n scanJobContent: ScanContent,\n) {\n if (pdfFilePath === null) {\n console.log(`Pdf generated has not been generated`);\n return;\n }\n console.log(\n `The following page(s) have been rendered inside '${pdfFilePath}': `,\n );\n scanJobContent.elements.forEach((e) =>\n console.log(\n `\\t- page ${e.pageNumber.toString().padStart(3, \" \")} - ${e.width}x${\n e.height\n }`,\n ),\n );\n}\n\nfunction displayJpegScan(scanJobContent: ScanContent) {\n scanJobContent.elements.forEach((e) =>\n console.log(\n `\\t- page ${e.pageNumber.toString().padStart(3, \" \")} - ${e.width}x${\n e.height\n } - ${e.path}`,\n ),\n );\n}\n\nasync function cleanUpFilesIfNeeded(\n filePaths: string[],\n paperlessConfig: PaperlessConfig | undefined,\n nextcloudConfig: NextcloudConfig | undefined,\n) {\n let keepFiles: boolean =\n paperlessConfig?.keepFiles ?? nextcloudConfig?.keepFiles ?? true;\n if (!keepFiles) {\n await Promise.all(\n filePaths.map(async (filePath) => {\n await fs.unlink(filePath);\n console.log(`File ${filePath} has been removed from the filesystem`);\n }),\n );\n }\n}\n"]}
|
package/package.json
CHANGED
package/src/commitInfo.json
CHANGED
package/src/postProcessing.ts
CHANGED
|
@@ -25,7 +25,7 @@ export async function postProcessing(
|
|
|
25
25
|
toPdf: boolean,
|
|
26
26
|
) {
|
|
27
27
|
if (toPdf) {
|
|
28
|
-
await
|
|
28
|
+
await handlePdfPostProcessing(
|
|
29
29
|
folder,
|
|
30
30
|
tempFolder,
|
|
31
31
|
scanCount,
|
|
@@ -34,7 +34,7 @@ export async function postProcessing(
|
|
|
34
34
|
scanConfig,
|
|
35
35
|
);
|
|
36
36
|
} else {
|
|
37
|
-
await
|
|
37
|
+
await handleImagePostProcessing(
|
|
38
38
|
folder,
|
|
39
39
|
scanCount,
|
|
40
40
|
scanJobContent,
|
|
@@ -44,7 +44,7 @@ export async function postProcessing(
|
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
-
async function
|
|
47
|
+
async function handlePdfPostProcessing(
|
|
48
48
|
folder: string,
|
|
49
49
|
tempFolder: string,
|
|
50
50
|
scanCount: number,
|
|
@@ -63,17 +63,19 @@ async function handlePdfProcessing(
|
|
|
63
63
|
scanDate,
|
|
64
64
|
true,
|
|
65
65
|
);
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
66
|
+
if (pdfFilePath != null) {
|
|
67
|
+
displayPdfScan(pdfFilePath, scanJobContent);
|
|
68
|
+
if (paperlessConfig) {
|
|
69
|
+
await uploadPdfToPaperless(pdfFilePath, paperlessConfig);
|
|
70
|
+
}
|
|
71
|
+
if (nextcloudConfig) {
|
|
72
|
+
await uploadPdfToNextcloud(pdfFilePath, nextcloudConfig);
|
|
73
|
+
}
|
|
74
|
+
await cleanUpFilesIfNeeded([pdfFilePath], paperlessConfig, nextcloudConfig);
|
|
72
75
|
}
|
|
73
|
-
await cleanUpFilesIfNeeded([pdfFilePath], paperlessConfig, nextcloudConfig);
|
|
74
76
|
}
|
|
75
77
|
|
|
76
|
-
async function
|
|
78
|
+
async function handleImagePostProcessing(
|
|
77
79
|
folder: string,
|
|
78
80
|
scanCount: number,
|
|
79
81
|
scanJobContent: ScanContent,
|
|
@@ -146,17 +148,17 @@ function displayJpegScan(scanJobContent: ScanContent) {
|
|
|
146
148
|
}
|
|
147
149
|
|
|
148
150
|
async function cleanUpFilesIfNeeded(
|
|
149
|
-
filePaths:
|
|
151
|
+
filePaths: string[],
|
|
150
152
|
paperlessConfig: PaperlessConfig | undefined,
|
|
151
153
|
nextcloudConfig: NextcloudConfig | undefined,
|
|
152
154
|
) {
|
|
153
|
-
|
|
155
|
+
let keepFiles: boolean =
|
|
156
|
+
paperlessConfig?.keepFiles ?? nextcloudConfig?.keepFiles ?? true;
|
|
157
|
+
if (!keepFiles) {
|
|
154
158
|
await Promise.all(
|
|
155
159
|
filePaths.map(async (filePath) => {
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
console.log(`File ${filePath} has been removed from the filesystem`);
|
|
159
|
-
}
|
|
160
|
+
await fs.unlink(filePath);
|
|
161
|
+
console.log(`File ${filePath} has been removed from the filesystem`);
|
|
160
162
|
}),
|
|
161
163
|
);
|
|
162
164
|
}
|