From e8bbc4f14961c9cc4d066dac2d527c8d08fb6e72 Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Wed, 30 Mar 2022 23:43:05 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=B4=20Using=20my=20own=20fork=20of=20n?= =?UTF-8?q?ode-7z-forall?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 105 ++++++++++++++++++++++++++++++++--- package.json | 2 +- utils/uncompression.utils.ts | 2 +- yarn.lock | 44 +++++++++++++-- 4 files changed, 137 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index e79efb5..5678d41 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "mongoose": "^5.12.7", "mongoose-paginate-v2": "^1.3.18", "nats": "^1.3.2", - "node-7z-forall": "github:rishighan/node-7z-forall", + "node-7z-threetwo": "^2.1.8", "node-calibre": "^2.1.1", "node-unrar-js": "^1.0.5", "sharp": "^0.30.3", @@ -9302,6 +9302,45 @@ "node-gyp-build": "^4.2.3" } }, + "node_modules/mv": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", + "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=", + "dependencies": { + "mkdirp": "~0.5.1", + "ncp": "~2.0.0", + "rimraf": "~2.4.0" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/mv/node_modules/glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "dependencies": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/mv/node_modules/rimraf": { + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", + "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=", + "dependencies": { + "glob": "^6.0.1" + }, + "bin": { + "rimraf": "bin.js" + } + }, "node_modules/nan": { "version": "2.15.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", @@ -9342,6 +9381,14 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "node_modules/ncp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", + "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=", + "bin": { + "ncp": "bin/ncp" + } + }, "node_modules/negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", @@ -9356,16 +9403,17 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, - "node_modules/node-7z-forall": { - "version": "2.1.5", - "resolved": "git+ssh://git@github.com/rishighan/node-7z-forall.git#43e7db0ad72439262b59aff4d887ea6fbaeb0352", + "node_modules/node-7z-threetwo": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/node-7z-threetwo/-/node-7z-threetwo-2.1.8.tgz", + "integrity": "sha512-iUut/cJb2C70fdb2swq9PeOSnv5gU8fesOUovndlz7eNmLx+bsH30+5U75z1Q3FXS35BzUwhgq1osja3NiQ4lw==", "hasInstallScript": true, - "license": "ISC", "dependencies": { "all-unpacker": "^0.1.14", "cross-spawn": "^7.0.3", "fs-extra": "^9.1.0", "macos-release": "^2.5.0", + "mv": "^2.1.1", "node-wget-fetch": "1.0.5", "system-installer": "^1.1.6", "when": "^3.7.8" @@ -9374,7 +9422,7 @@ "node": ">=10.0.0" } }, - "node_modules/node-7z-forall/node_modules/fs-extra": { + "node_modules/node-7z-threetwo/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", @@ -22107,6 +22155,38 @@ "node-gyp-build": "^4.2.3" } }, + "mv": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", + "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=", + "requires": { + "mkdirp": "~0.5.1", + "ncp": "~2.0.0", + "rimraf": "~2.4.0" + }, + "dependencies": { + "glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "rimraf": { + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", + "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=", + "requires": { + "glob": "^6.0.1" + } + } + } + }, "nan": { "version": "2.15.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", @@ -22138,6 +22218,11 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "ncp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", + "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=" + }, "negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", @@ -22149,14 +22234,16 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, - "node-7z-forall": { - "version": "git+ssh://git@github.com/rishighan/node-7z-forall.git#43e7db0ad72439262b59aff4d887ea6fbaeb0352", - "from": "node-7z-forall@github:rishighan/node-7z-forall", + "node-7z-threetwo": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/node-7z-threetwo/-/node-7z-threetwo-2.1.8.tgz", + "integrity": "sha512-iUut/cJb2C70fdb2swq9PeOSnv5gU8fesOUovndlz7eNmLx+bsH30+5U75z1Q3FXS35BzUwhgq1osja3NiQ4lw==", "requires": { "all-unpacker": "^0.1.14", "cross-spawn": "^7.0.3", "fs-extra": "^9.1.0", "macos-release": "^2.5.0", + "mv": "^2.1.1", "node-wget-fetch": "1.0.5", "system-installer": "^1.1.6", "when": "^3.7.8" diff --git a/package.json b/package.json index c6f6dd7..e606451 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "mongoose": "^5.12.7", "mongoose-paginate-v2": "^1.3.18", "nats": "^1.3.2", - "node-7z-forall": "github:rishighan/node-7z-forall", + "node-7z-threetwo": "^2.1.8", "node-calibre": "^2.1.1", "node-unrar-js": "^1.0.5", "sharp": "^0.30.3", diff --git a/utils/uncompression.utils.ts b/utils/uncompression.utils.ts index 4ceb4f8..092a28c 100644 --- a/utils/uncompression.utils.ts +++ b/utils/uncompression.utils.ts @@ -41,7 +41,7 @@ import { const fse = require("fs-extra"); const Unrar = require("unrar"); import path, { parse } from "path"; -import { list, extract, onlyArchive } from "node-7z-forall"; +import { list, extract, onlyArchive } from "node-7z-threetwo"; import { IExtractedComicBookCoverFile } from "threetwo-ui-typings"; import sharp from "sharp"; import { getFileConstituents } from "../utils/file.utils"; diff --git a/yarn.lock b/yarn.lock index 9c2dfad..648690f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3202,6 +3202,17 @@ "once" "^1.3.0" "path-is-absolute" "^1.0.0" +"glob@^6.0.1": + "integrity" "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=" + "resolved" "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz" + "version" "6.0.4" + dependencies: + "inflight" "^1.0.4" + "inherits" "2" + "minimatch" "2 || 3" + "once" "^1.3.0" + "path-is-absolute" "^1.0.0" + "globals@^11.1.0": "integrity" "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" "resolved" "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz" @@ -4825,7 +4836,7 @@ "resolved" "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz" "version" "3.1.0" -"minimatch@^3.0.4": +"minimatch@^3.0.4", "minimatch@2 || 3": "integrity" "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==" "resolved" "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" "version" "3.0.4" @@ -4898,7 +4909,7 @@ "mkdirp@*", "mkdirp@^1.0.3", "mkdirp@^1.0.4": "version" "1.0.4" -"mkdirp@^0.5.5", "mkdirp@0.x": +"mkdirp@^0.5.5", "mkdirp@~0.5.1", "mkdirp@0.x": "integrity" "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==" "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz" "version" "0.5.5" @@ -5094,6 +5105,15 @@ "mute-stream@~0.0.4": "version" "0.0.8" +"mv@^2.1.1": + "integrity" "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=" + "resolved" "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz" + "version" "2.1.1" + dependencies: + "mkdirp" "~0.5.1" + "ncp" "~2.0.0" + "rimraf" "~2.4.0" + "nan@^2.14.2": "integrity" "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" "resolved" "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz" @@ -5122,6 +5142,11 @@ "resolved" "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" "version" "1.4.0" +"ncp@~2.0.0": + "integrity" "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=" + "resolved" "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz" + "version" "2.0.0" + "negotiator@^0.6.2", "negotiator@^0.6.3": "version" "0.6.3" @@ -5140,14 +5165,16 @@ "resolved" "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz" "version" "1.0.0" -"node-7z-forall@github:rishighan/node-7z-forall": - "resolved" "git+ssh://git@github.com/rishighan/node-7z-forall.git#43e7db0ad72439262b59aff4d887ea6fbaeb0352" - "version" "2.1.5" +"node-7z-threetwo@^2.1.8": + "integrity" "sha512-iUut/cJb2C70fdb2swq9PeOSnv5gU8fesOUovndlz7eNmLx+bsH30+5U75z1Q3FXS35BzUwhgq1osja3NiQ4lw==" + "resolved" "https://registry.npmjs.org/node-7z-threetwo/-/node-7z-threetwo-2.1.8.tgz" + "version" "2.1.8" dependencies: "all-unpacker" "^0.1.14" "cross-spawn" "^7.0.3" "fs-extra" "^9.1.0" "macos-release" "^2.5.0" + "mv" "^2.1.1" "node-wget-fetch" "1.0.5" "system-installer" "^1.1.6" "when" "^3.7.8" @@ -6123,6 +6150,13 @@ dependencies: "glob" "^7.1.3" +"rimraf@~2.4.0": + "integrity" "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=" + "resolved" "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz" + "version" "2.4.5" + dependencies: + "glob" "^6.0.1" + "run-parallel@^1.1.9": "integrity" "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==" "resolved" "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"