use shell.trashItem instead of trash

closes #537
pull/1401/head
Mikael Finstad 3 years ago
parent 1799547353
commit c4441127d3

@ -114,7 +114,6 @@
"semver": "^7.1.3", "semver": "^7.1.3",
"string-to-stream": "^1.1.1", "string-to-stream": "^1.1.1",
"strtok3": "^6.0.0", "strtok3": "^6.0.0",
"trash": "^7.1.1",
"winston": "^3.8.1", "winston": "^3.8.1",
"yargs-parser": "^21.0.0" "yargs-parser": "^21.0.0"
}, },
@ -150,9 +149,6 @@
"mas", "mas",
"dmg" "dmg"
], ],
"asarUnpack": [
"node_modules/trash/**"
],
"electronLanguages": [ "electronLanguages": [
"en" "en"
], ],
@ -271,8 +267,7 @@
"provisioningProfile": "LosslessCut_Mac_App_Store_provisioning_profile.provisionprofile", "provisioningProfile": "LosslessCut_Mac_App_Store_provisioning_profile.provisionprofile",
"binaries": [ "binaries": [
"Contents/Resources/ffmpeg", "Contents/Resources/ffmpeg",
"Contents/Resources/ffprobe", "Contents/Resources/ffprobe"
"Contents/Resources/app.asar.unpacked/node_modules/trash/lib/macos-trash"
] ]
}, },
"win": { "win": {

@ -7,10 +7,12 @@ const { dirname, parse: parsePath, join, basename, extname, isAbsolute, resolve
const fs = window.require('fs-extra'); const fs = window.require('fs-extra');
const open = window.require('open'); const open = window.require('open');
const os = window.require('os'); const os = window.require('os');
const trash = window.require('trash'); const { shell } = window.require('electron');
const { readdir, unlink } = fs; const { readdir, unlink } = fs;
const trash = async (path) => shell.trashItem(path);
export function getFileDir(filePath) { export function getFileDir(filePath) {
return filePath ? dirname(filePath) : undefined; return filePath ? dirname(filePath) : undefined;
} }

@ -2372,22 +2372,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@sindresorhus/df@npm:^1.0.1":
version: 1.0.1
resolution: "@sindresorhus/df@npm:1.0.1"
checksum: 0cb43b4ed9fc41e28124362dd4735c1f067d3c8963ccc3cf1684da050c5263bb5f5193e510ca8869e13b782fe4eb6f7ee23e4372193afea932cd0535f4c9ee2b
languageName: node
linkType: hard
"@sindresorhus/df@npm:^3.1.1":
version: 3.1.1
resolution: "@sindresorhus/df@npm:3.1.1"
dependencies:
execa: ^2.0.1
checksum: 6378a8c62a9df024571b655a9f83d5e55351769dc581ed58a2a0a7b25683b7e644540edda7095bf38208b84ccf9cbc7c519fa7bef6a1129a2d8f7c6cbc618023
languageName: node
linkType: hard
"@sindresorhus/is@npm:^0.14.0": "@sindresorhus/is@npm:^0.14.0":
version: 0.14.0 version: 0.14.0
resolution: "@sindresorhus/is@npm:0.14.0" resolution: "@sindresorhus/is@npm:0.14.0"
@ -2413,13 +2397,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@stroncium/procfs@npm:^1.2.1":
version: 1.2.1
resolution: "@stroncium/procfs@npm:1.2.1"
checksum: cb09a4a4780f97a4677964930a70597747eb480578a38b63148084d1ab1d6f71e7bd92c8918e12d0ec992ebc48f7761bce1f5e6ac8b4437add0b86b55fde844b
languageName: node
linkType: hard
"@surma/rollup-plugin-off-main-thread@npm:^2.2.3": "@surma/rollup-plugin-off-main-thread@npm:^2.2.3":
version: 2.2.3 version: 2.2.3
resolution: "@surma/rollup-plugin-off-main-thread@npm:2.2.3" resolution: "@surma/rollup-plugin-off-main-thread@npm:2.2.3"
@ -3956,15 +3933,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"array-union@npm:^1.0.1":
version: 1.0.2
resolution: "array-union@npm:1.0.2"
dependencies:
array-uniq: ^1.0.1
checksum: 82cec6421b6e6766556c484835a6d476a873f1b71cace5ab2b4f1b15b1e3162dc4da0d16f7a2b04d4aec18146c6638fe8f661340b31ba8e469fd811a1b45dc8d
languageName: node
linkType: hard
"array-union@npm:^2.1.0": "array-union@npm:^2.1.0":
version: 2.1.0 version: 2.1.0
resolution: "array-union@npm:2.1.0" resolution: "array-union@npm:2.1.0"
@ -3972,13 +3940,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"array-uniq@npm:^1.0.1":
version: 1.0.3
resolution: "array-uniq@npm:1.0.3"
checksum: 1625f06b093d8bf279b81adfec6e72951c0857d65b5e3f65f053fffe9f9dd61c2fc52cff57e38a4700817e7e3f01a4faa433d505ea9e33cdae4514c334e0bf9e
languageName: node
linkType: hard
"array.prototype.flat@npm:^1.2.5": "array.prototype.flat@npm:^1.2.5":
version: 1.2.5 version: 1.2.5
resolution: "array.prototype.flat@npm:1.2.5" resolution: "array.prototype.flat@npm:1.2.5"
@ -5501,7 +5462,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": "cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
version: 7.0.3 version: 7.0.3
resolution: "cross-spawn@npm:7.0.3" resolution: "cross-spawn@npm:7.0.3"
dependencies: dependencies:
@ -6157,15 +6118,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"dir-glob@npm:^2.0.0":
version: 2.2.2
resolution: "dir-glob@npm:2.2.2"
dependencies:
path-type: ^3.0.0
checksum: 3aa48714a9f7845ffc30ab03a5c674fe760477cc55e67b0847333371549227d93953e6627ec160f75140c5bea5c5f88d13c01de79bd1997a588efbcf06980842
languageName: node
linkType: hard
"dir-glob@npm:^3.0.1": "dir-glob@npm:^3.0.1":
version: 3.0.1 version: 3.0.1
resolution: "dir-glob@npm:3.0.1" resolution: "dir-glob@npm:3.0.1"
@ -7301,23 +7253,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"execa@npm:^2.0.1":
version: 2.1.0
resolution: "execa@npm:2.1.0"
dependencies:
cross-spawn: ^7.0.0
get-stream: ^5.0.0
is-stream: ^2.0.0
merge-stream: ^2.0.0
npm-run-path: ^3.0.0
onetime: ^5.1.0
p-finally: ^2.0.0
signal-exit: ^3.0.2
strip-final-newline: ^2.0.0
checksum: 93af9b816a555d0944e0876f4ccd97e0f4593d2049e713518fd5458a7699836449c516c6bb7e6357e11431ec40cce3150625b86d1b1254180faaa0d744265eca
languageName: node
linkType: hard
"execa@npm:^5.0.0": "execa@npm:^5.0.0":
version: 5.1.1 version: 5.1.1
resolution: "execa@npm:5.1.1" resolution: "execa@npm:5.1.1"
@ -8066,7 +8001,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"get-stream@npm:^5.0.0, get-stream@npm:^5.1.0": "get-stream@npm:^5.1.0":
version: 5.2.0 version: 5.2.0
resolution: "get-stream@npm:5.2.0" resolution: "get-stream@npm:5.2.0"
dependencies: dependencies:
@ -8298,20 +8233,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"globby@npm:^7.1.1":
version: 7.1.1
resolution: "globby@npm:7.1.1"
dependencies:
array-union: ^1.0.1
dir-glob: ^2.0.0
glob: ^7.1.2
ignore: ^3.3.5
pify: ^3.0.0
slash: ^1.0.0
checksum: f0eba08a08ae7c98149a4411661c0bf08c4717d81e6f355cf624fb01880b249737eb8e951bf86124cb3af8ea1c793c0a9d363ed5cdec99bb2c6b68f8a323025f
languageName: node
linkType: hard
"got@npm:^9.6.0": "got@npm:^9.6.0":
version: 9.6.0 version: 9.6.0
resolution: "got@npm:9.6.0" resolution: "got@npm:9.6.0"
@ -8868,13 +8789,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"ignore@npm:^3.3.5":
version: 3.3.10
resolution: "ignore@npm:3.3.10"
checksum: 23e8cc776e367b56615ab21b78decf973a35dfca5522b39d9b47643d8168473b0d1f18dd1321a1bab466a12ea11a2411903f3b21644f4d5461ee0711ec8678bd
languageName: node
linkType: hard
"ignore@npm:^4.0.6": "ignore@npm:^4.0.6":
version: 4.0.6 version: 4.0.6
resolution: "ignore@npm:4.0.6" resolution: "ignore@npm:4.0.6"
@ -10804,7 +10718,6 @@ __metadata:
strtok3: ^6.0.0 strtok3: ^6.0.0
sweetalert2: ^11.0.0 sweetalert2: ^11.0.0
sweetalert2-react-content: ^4.0.0 sweetalert2-react-content: ^4.0.0
trash: ^7.1.1
use-debounce: ^5.1.0 use-debounce: ^5.1.0
use-trace-update: ^1.3.0 use-trace-update: ^1.3.0
uuid: ^8.3.2 uuid: ^8.3.2
@ -11277,17 +11190,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"mount-point@npm:^3.0.0":
version: 3.0.0
resolution: "mount-point@npm:3.0.0"
dependencies:
"@sindresorhus/df": ^1.0.1
pify: ^2.3.0
pinkie-promise: ^2.0.1
checksum: edb588e613020271add5a368404af569d8f5cfc48121be3ebb142ffc939f97de0c407fdd03ae972a7eff0cb880584a71e767993f719a6998cd90f1272def4c25
languageName: node
linkType: hard
"mousetrap@npm:^1.6.5": "mousetrap@npm:^1.6.5":
version: 1.6.5 version: 1.6.5
resolution: "mousetrap@npm:1.6.5" resolution: "mousetrap@npm:1.6.5"
@ -11295,15 +11197,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"move-file@npm:^2.0.0":
version: 2.1.0
resolution: "move-file@npm:2.1.0"
dependencies:
path-exists: ^4.0.0
checksum: 2b92bbe047a302b593fcb2c0bf1131bb090ec80b3264569fc80d782c8ff829eecc13573943fa4d804c9747dec612ef2d1e84a5cfcf29cbc64a69ffcbb7ea09b3
languageName: node
linkType: hard
"ms@npm:2.0.0": "ms@npm:2.0.0":
version: 2.0.0 version: 2.0.0
resolution: "ms@npm:2.0.0" resolution: "ms@npm:2.0.0"
@ -11602,15 +11495,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"npm-run-path@npm:^3.0.0":
version: 3.1.0
resolution: "npm-run-path@npm:3.1.0"
dependencies:
path-key: ^3.0.0
checksum: 141e0b8f0e3b137347a2896572c9a84701754dda0670d3ceb8c56a87702ee03c26227e4517ab93f2904acfc836547315e740b8289bb24ca0cd8ba2b198043b0f
languageName: node
linkType: hard
"npm-run-path@npm:^4.0.1": "npm-run-path@npm:^4.0.1":
version: 4.0.1 version: 4.0.1
resolution: "npm-run-path@npm:4.0.1" resolution: "npm-run-path@npm:4.0.1"
@ -11888,13 +11772,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"os-homedir@npm:^1.0.0":
version: 1.0.2
resolution: "os-homedir@npm:1.0.2"
checksum: af609f5a7ab72de2f6ca9be6d6b91a599777afc122ac5cad47e126c1f67c176fe9b52516b9eeca1ff6ca0ab8587fe66208bc85e40a3940125f03cdb91408e9d2
languageName: node
linkType: hard
"os-tmpdir@npm:~1.0.2": "os-tmpdir@npm:~1.0.2":
version: 1.0.2 version: 1.0.2
resolution: "os-tmpdir@npm:1.0.2" resolution: "os-tmpdir@npm:1.0.2"
@ -11909,13 +11786,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"p-finally@npm:^2.0.0":
version: 2.0.1
resolution: "p-finally@npm:2.0.1"
checksum: 6306a2851c3b28f8b603624f395ae84dce76970498fed8aa6aae2d930595053746edf1e4ee0c4b78a97410d84aa4504d63179f5310d555511ecd226f53ed1e8e
languageName: node
linkType: hard
"p-limit@npm:^1.1.0": "p-limit@npm:^1.1.0":
version: 1.3.0 version: 1.3.0
resolution: "p-limit@npm:1.3.0" resolution: "p-limit@npm:1.3.0"
@ -12179,15 +12049,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"path-type@npm:^3.0.0":
version: 3.0.0
resolution: "path-type@npm:3.0.0"
dependencies:
pify: ^3.0.0
checksum: 735b35e256bad181f38fa021033b1c33cfbe62ead42bb2222b56c210e42938eecb272ae1949f3b6db4ac39597a61b44edd8384623ec4d79bfdc9a9c0f12537a6
languageName: node
linkType: hard
"path-type@npm:^4.0.0": "path-type@npm:^4.0.0":
version: 4.0.0 version: 4.0.0
resolution: "path-type@npm:4.0.0" resolution: "path-type@npm:4.0.0"
@ -12244,13 +12105,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"pify@npm:^2.3.0":
version: 2.3.0
resolution: "pify@npm:2.3.0"
checksum: 9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba
languageName: node
linkType: hard
"pify@npm:^3.0.0": "pify@npm:^3.0.0":
version: 3.0.0 version: 3.0.0
resolution: "pify@npm:3.0.0" resolution: "pify@npm:3.0.0"
@ -12265,22 +12119,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"pinkie-promise@npm:^2.0.1":
version: 2.0.1
resolution: "pinkie-promise@npm:2.0.1"
dependencies:
pinkie: ^2.0.0
checksum: b53a4a2e73bf56b6f421eef711e7bdcb693d6abb474d57c5c413b809f654ba5ee750c6a96dd7225052d4b96c4d053cdcb34b708a86fceed4663303abee52fcca
languageName: node
linkType: hard
"pinkie@npm:^2.0.0":
version: 2.0.4
resolution: "pinkie@npm:2.0.4"
checksum: b12b10afea1177595aab036fc220785488f67b4b0fc49e7a27979472592e971614fa1c728e63ad3e7eb748b4ec3c3dbd780819331dad6f7d635c77c10537b9db
languageName: node
linkType: hard
"pirates@npm:^4.0.4": "pirates@npm:^4.0.4":
version: 4.0.4 version: 4.0.4
resolution: "pirates@npm:4.0.4" resolution: "pirates@npm:4.0.4"
@ -14794,13 +14632,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"slash@npm:^1.0.0":
version: 1.0.0
resolution: "slash@npm:1.0.0"
checksum: 4b6e21b1fba6184a7e2efb1dd173f692d8a845584c1bbf9dc818ff86f5a52fc91b413008223d17cc684604ee8bb9263a420b1182027ad9762e35388434918860
languageName: node
linkType: hard
"slash@npm:^2.0.0": "slash@npm:^2.0.0":
version: 2.0.0 version: 2.0.0
resolution: "slash@npm:2.0.0" resolution: "slash@npm:2.0.0"
@ -15982,22 +15813,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"trash@npm:^7.1.1":
version: 7.2.0
resolution: "trash@npm:7.2.0"
dependencies:
"@stroncium/procfs": ^1.2.1
globby: ^7.1.1
is-path-inside: ^3.0.2
make-dir: ^3.1.0
move-file: ^2.0.0
p-map: ^4.0.0
uuid: ^8.3.2
xdg-trashdir: ^3.1.0
checksum: d63310278dde8e4d81934b3ccf06e61b75baa924e1af66bc987503e918aec49cf60ad2ff00c2f692f134bf9dae93e943bb17e19cda4d80e6cd465f7109f98c17
languageName: node
linkType: hard
"tree-kill@npm:^1.2.2": "tree-kill@npm:^1.2.2":
version: 1.2.2 version: 1.2.2
resolution: "tree-kill@npm:1.2.2" resolution: "tree-kill@npm:1.2.2"
@ -16429,15 +16244,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"user-home@npm:^2.0.0":
version: 2.0.0
resolution: "user-home@npm:2.0.0"
dependencies:
os-homedir: ^1.0.0
checksum: a3329faa959fcd9e3e01a03347ca974f7f6b8896e6a634f29c61d8d5b61557d853c6fc5a6dff1a28e2da85b400d0e4490368a28de452ba8c41a2bf3a92cb110a
languageName: node
linkType: hard
"utf8-byte-length@npm:^1.0.1": "utf8-byte-length@npm:^1.0.1":
version: 1.0.4 version: 1.0.4
resolution: "utf8-byte-length@npm:1.0.4" resolution: "utf8-byte-length@npm:1.0.4"
@ -17251,18 +17057,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"xdg-trashdir@npm:^3.1.0":
version: 3.1.0
resolution: "xdg-trashdir@npm:3.1.0"
dependencies:
"@sindresorhus/df": ^3.1.1
mount-point: ^3.0.0
user-home: ^2.0.0
xdg-basedir: ^4.0.0
checksum: 1b8ed9229af43fa17fcc2cbfd7b470459b2286da5eb141046817e25ba78eeee07d3a4ae28d5c32e2106641dd2c23cc18b46a77b813706ff85f6618c1f61b1827
languageName: node
linkType: hard
"xml-name-validator@npm:^3.0.0": "xml-name-validator@npm:^3.0.0":
version: 3.0.0 version: 3.0.0
resolution: "xml-name-validator@npm:3.0.0" resolution: "xml-name-validator@npm:3.0.0"

Loading…
Cancel
Save