Switch to adm-zip

Author: PotatoParser

lib/download.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const request = require('request');
 const tar = require('tar');
-const extract = require('extract-zip');
+const AdmZip = require('adm-zip');
 const lzma = require('lzma-native');
 const system = require('./system');
 const console = require('./console');
@@ -28,12 +28,9 @@ function decompressXZ(file) {
 	});
 }
 function decompressZip(file) {
-	return new Promise(resolve=>{
-		let dir = file.substring(0, file.lastIndexOf('.'));
-		extract(file, {dir: `${system.rootDir}/ffmpeg`}, e=>{
-			if (!e) resolve(dir);
-		});
-	});
+	let zip = AdmZip(file);
+	zip.extractAllTo(`${system.rootDir}/ffmpeg`, true);
+	return file.substring(0, file.lastIndexOf('.'));
 }
 
 function rimraf(dir){
@@ -47,16 +44,6 @@ function rimraf(dir){
 	fs.rmdirSync(dir);
 }
 
-function forceRename(oldPath, newPath, max = 0) {
-	try {
-		Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, max*100);
-		fs.renameSync(oldPath, newPath);
-	} catch(e) {
-		if (max < 10) forceRename(oldPath, newPath, ++max);
-		else throw console.error('Unable to rename FFmpeg folder');
-	}
-}
-
 async function getPackage(){
 	if (fs.existsSync(system.typePath)) rimraf(system.typePath);	
 	if (!fs.existsSync(`${system.rootDir}/ffmpeg`)) fs.mkdirSync(`${system.rootDir}/ffmpeg`);
@@ -71,11 +58,13 @@ async function getPackage(){
 	});
 	if (!downloaded) console.error('Unable to download files');
 	console.log('Unzipping files...');
-	var temp = (system.zipPath.indexOf('.xz') !== -1) ? await decompressXZ(system.zipPath) : await decompressZip(system.zipPath);
+	var temp = (system.zipPath.indexOf('.xz') !== -1) ? await decompressXZ(system.zipPath) : decompressZip(system.zipPath);
 
 	console.log('Unzipped files');
 	fs.unlinkSync(system.zipPath);
-	forceRename(temp, system.typePath);
+
+	console.log('Renaming files');
+	fs.renameSync(temp, system.typePath);
 
 	console.log('FFmpeg downloaded!');
 }

package-lock.json

@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/PotatoParser/ffmpeg-cli#readme",
   "dependencies": {
-    "extract-zip": "^1.7.0",
+    "adm-zip": "^0.4.14",
     "lzma-native": "^5.0.1",
     "progress": "^2.0.3",
     "request": "^2.88.2",