From b1c8b4f490f163740ead96b3dc729b5e63456440 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Tue, 30 Nov 2021 17:40:57 +0100 Subject: [PATCH] fix(core): update --- package-lock.json | 124 ++++++++++++++------------------ package.json | 4 +- ts/smartocr.classes.smartocr.ts | 4 +- 3 files changed, 58 insertions(+), 74 deletions(-) diff --git a/package-lock.json b/package-lock.json index 93d6674..361b5cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.5", "license": "MIT", "dependencies": { - "@pushrocks/smartfile": "^8.0.10", + "@pushrocks/smartfile": "^8.0.11", "@pushrocks/smartpromise": "^3.1.6", "@pushrocks/smartshell": "^2.0.30", "@pushrocks/smartunique": "^3.0.3" @@ -19,7 +19,7 @@ "@gitzone/tsbundle": "^1.0.78", "@gitzone/tstest": "^1.0.44", "@pushrocks/tapbundle": "^3.2.9", - "@types/node": "^14.11.2", + "@types/node": "^16.11.11", "tslint": "^6.1.3", "tslint-config-prettier": "^1.15.0" } @@ -1924,13 +1924,6 @@ "tsbundle": "cli.js" } }, - "node_modules/@gitzone/tsbundle/node_modules/@types/node": { - "version": "16.11.10", - "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-16.11.10.tgz", - "integrity": "sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA==", - "dev": true, - "license": "MIT" - }, "node_modules/@gitzone/tsrun": { "version": "1.2.18", "resolved": "https://verdaccio.lossless.one/@gitzone%2ftsrun/-/tsrun-1.2.18.tgz", @@ -2224,6 +2217,13 @@ "@types/node": "^14.11.2" } }, + "node_modules/@pushrocks/smartenv/node_modules/@types/node": { + "version": "14.17.34", + "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.17.34.tgz", + "integrity": "sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg==", + "dev": true, + "license": "MIT" + }, "node_modules/@pushrocks/smarterror": { "version": "2.0.1", "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarterror/-/smarterror-2.0.1.tgz", @@ -2306,24 +2306,24 @@ } }, "node_modules/@pushrocks/smartfile": { - "version": "8.0.10", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile/-/smartfile-8.0.10.tgz", - "integrity": "sha512-/Sca8r6pOKLGFsKAfzsHm+3s9BQZM+1WlEkkcnwv7akI7SbE5EYGGDG6veM3+CYhSLlr/AQaNTz47Hx3bZK4/w==", + "version": "8.0.11", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile/-/smartfile-8.0.11.tgz", + "integrity": "sha512-mujs1mDgorsryQ8OZuL94MZZDYL3+cbdPKaXSchPjyxOOx8iGacUzc5BK4jDsImYeYEo07MpdJ5BjvGkORQR/w==", "license": "MIT", "dependencies": { "@pushrocks/smartfile-interfaces": "^1.0.7", "@pushrocks/smarthash": "^2.1.10", "@pushrocks/smartjson": "^4.0.6", - "@pushrocks/smartmime": "^1.0.3", + "@pushrocks/smartmime": "^1.0.5", "@pushrocks/smartpath": "^4.0.3", - "@pushrocks/smartpromise": "^3.1.3", - "@pushrocks/smartrequest": "^1.1.51", - "@types/fs-extra": "^9.0.10", - "@types/glob": "^7.1.3", - "@types/js-yaml": "^4.0.0", - "fs-extra": "^9.1.0", - "glob": "^7.1.6", - "js-yaml": "^4.0.0" + "@pushrocks/smartpromise": "^3.1.6", + "@pushrocks/smartrequest": "^1.1.52", + "@types/fs-extra": "^9.0.13", + "@types/glob": "^7.2.0", + "@types/js-yaml": "^4.0.5", + "fs-extra": "^10.0.0", + "glob": "^7.2.0", + "js-yaml": "^4.1.0" } }, "node_modules/@pushrocks/smartfile-interfaces": { @@ -3178,9 +3178,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "14.17.34", - "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.17.34.tgz", - "integrity": "sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg==", + "version": "16.11.11", + "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-16.11.11.tgz", + "integrity": "sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw==", "license": "MIT" }, "node_modules/@types/parcel-bundler": { @@ -3738,15 +3738,6 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "license": "MIT" }, - "node_modules/at-least-node": { - "version": "1.0.0", - "resolved": "https://verdaccio.lossless.one/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "license": "ISC", - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/atob": { "version": "2.1.2", "resolved": "https://verdaccio.lossless.one/atob/-/atob-2.1.2.tgz", @@ -7234,18 +7225,17 @@ "license": "MIT" }, "node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://verdaccio.lossless.one/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "version": "10.0.0", + "resolved": "https://verdaccio.lossless.one/fs-extra/-/fs-extra-10.0.0.tgz", + "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", "license": "MIT", "dependencies": { - "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" }, "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/fs.realpath": { @@ -16773,14 +16763,6 @@ "rollup-plugin-sourcemaps": "^0.6.3", "rollup-plugin-terser": "^7.0.2", "typescript": "^4.4.2" - }, - "dependencies": { - "@types/node": { - "version": "16.11.10", - "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-16.11.10.tgz", - "integrity": "sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA==", - "dev": true - } } }, "@gitzone/tsrun": { @@ -17026,6 +17008,14 @@ "requires": { "@pushrocks/smartpromise": "^3.0.6", "@types/node": "^14.11.2" + }, + "dependencies": { + "@types/node": { + "version": "14.17.34", + "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.17.34.tgz", + "integrity": "sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg==", + "dev": true + } } }, "@pushrocks/smarterror": { @@ -17107,23 +17097,23 @@ } }, "@pushrocks/smartfile": { - "version": "8.0.10", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile/-/smartfile-8.0.10.tgz", - "integrity": "sha512-/Sca8r6pOKLGFsKAfzsHm+3s9BQZM+1WlEkkcnwv7akI7SbE5EYGGDG6veM3+CYhSLlr/AQaNTz47Hx3bZK4/w==", + "version": "8.0.11", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile/-/smartfile-8.0.11.tgz", + "integrity": "sha512-mujs1mDgorsryQ8OZuL94MZZDYL3+cbdPKaXSchPjyxOOx8iGacUzc5BK4jDsImYeYEo07MpdJ5BjvGkORQR/w==", "requires": { "@pushrocks/smartfile-interfaces": "^1.0.7", "@pushrocks/smarthash": "^2.1.10", "@pushrocks/smartjson": "^4.0.6", - "@pushrocks/smartmime": "^1.0.3", + "@pushrocks/smartmime": "^1.0.5", "@pushrocks/smartpath": "^4.0.3", - "@pushrocks/smartpromise": "^3.1.3", - "@pushrocks/smartrequest": "^1.1.51", - "@types/fs-extra": "^9.0.10", - "@types/glob": "^7.1.3", - "@types/js-yaml": "^4.0.0", - "fs-extra": "^9.1.0", - "glob": "^7.1.6", - "js-yaml": "^4.0.0" + "@pushrocks/smartpromise": "^3.1.6", + "@pushrocks/smartrequest": "^1.1.52", + "@types/fs-extra": "^9.0.13", + "@types/glob": "^7.2.0", + "@types/js-yaml": "^4.0.5", + "fs-extra": "^10.0.0", + "glob": "^7.2.0", + "js-yaml": "^4.1.0" } }, "@pushrocks/smartfile-interfaces": { @@ -17857,9 +17847,9 @@ "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==" }, "@types/node": { - "version": "14.17.34", - "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.17.34.tgz", - "integrity": "sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg==" + "version": "16.11.11", + "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-16.11.11.tgz", + "integrity": "sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw==" }, "@types/parcel-bundler": { "version": "1.12.3", @@ -18294,11 +18284,6 @@ "resolved": "https://verdaccio.lossless.one/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, - "at-least-node": { - "version": "1.0.0", - "resolved": "https://verdaccio.lossless.one/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==" - }, "atob": { "version": "2.1.2", "resolved": "https://verdaccio.lossless.one/atob/-/atob-2.1.2.tgz", @@ -20932,11 +20917,10 @@ "dev": true }, "fs-extra": { - "version": "9.1.0", - "resolved": "https://verdaccio.lossless.one/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "version": "10.0.0", + "resolved": "https://verdaccio.lossless.one/fs-extra/-/fs-extra-10.0.0.tgz", + "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", "requires": { - "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" diff --git a/package.json b/package.json index a5526fd..de7a0b2 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,12 @@ "@gitzone/tsbundle": "^1.0.78", "@gitzone/tstest": "^1.0.44", "@pushrocks/tapbundle": "^3.2.9", - "@types/node": "^14.11.2", + "@types/node": "^16.11.11", "tslint": "^6.1.3", "tslint-config-prettier": "^1.15.0" }, "dependencies": { - "@pushrocks/smartfile": "^8.0.10", + "@pushrocks/smartfile": "^8.0.11", "@pushrocks/smartpromise": "^3.1.6", "@pushrocks/smartshell": "^2.0.30", "@pushrocks/smartunique": "^3.0.3" diff --git a/ts/smartocr.classes.smartocr.ts b/ts/smartocr.classes.smartocr.ts index 3d1ab13..a43ccb4 100644 --- a/ts/smartocr.classes.smartocr.ts +++ b/ts/smartocr.classes.smartocr.ts @@ -22,8 +22,8 @@ export class SmartOcr { await originalSmartfile.write(); await this.smartshellInstance.exec(`ocrmypdf --rotate-pages ${originalPath} ${processedPath}`); const processedSmartfile = await plugins.smartfile.Smartfile.fromFilePath(processedPath); - await plugins.smartfile.fs.remove(originalPath); - await plugins.smartfile.fs.remove(processedPath); + await originalSmartfile.delete(); + await processedSmartfile.delete(); return processedSmartfile.contentBuffer; }