From 2d1de103d8956db5aebcc484ba1abab1f0e4df50 Mon Sep 17 00:00:00 2001
From: MrGeorgen <moinl6162@gmail.com>
Date: Thu, 21 Jan 2021 21:38:41 +0100
Subject: [PATCH] modPath utils function

returns modPath from a mod object
---
 src/curse.js |  5 +++--
 src/git.js   | 14 +++++---------
 src/util.js  |  7 +++++++
 3 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 src/util.js

diff --git a/src/curse.js b/src/curse.js
index c007f9d..62918c4 100644
--- a/src/curse.js
+++ b/src/curse.js
@@ -1,6 +1,7 @@
-let mods_lock;
 const { http, https } = require('follow-redirects');
 const fs = require("fs");
+const util = require("./util.js");
+let mods_lock;
 let downloadStarted = false;
 let dep = new Map();
 function main() {
@@ -104,7 +105,7 @@ function downloadFile(url, dest) {
 	});
 
 	file.on('error', (err) => { // Handle errors
-		fs.unlink(dest);
+		fs.unlink(dest, () => {});
 		throw err;
 	});
 }
diff --git a/src/git.js b/src/git.js
index 7a5aadd..a0e2a7b 100644
--- a/src/git.js
+++ b/src/git.js
@@ -2,6 +2,7 @@ const git = require("gift");
 const childProcess = require("child_process");
 const fs = require("fs");
 const g2js = require('gradle-to-js/lib/parser');
+const util = require("./util.js");
 let modsLock;
 let globCallback;
 let loopCounter = 0;
@@ -34,7 +35,7 @@ function main () {
 	});
 	deleteMods.forEach((mod, url) => {
 		modsLock.delete(url);
-		fs.unlink(modPath(mod.filename), (err) => {
+		fs.unlink(util.modPath(mod), (err) => {
 			if(err) throw err;
 		});
 	});
@@ -58,14 +59,13 @@ function build(repo, repoPath, gitRepo) {
 				fs.readFile(`${repoPath}/gradle.properties`, "utf-8", (err, data) => {
 					if(err) throw err;
 					g2js.parseText(data).then((gradleProp) => {
-						let modFile = `${gradleProp.archives_base_name}-${gradleProp.mod_version}.jar`;
-						if(newLock.filename != null) fs.unlink(`mods/${newLock.filename}`, (err) => {
+						if(newLock.filename != null) fs.unlink(util.modPath(newLock) (err) => {
 							if(err) throw err;
 						});
-						fs.copyFile(`${buildPath}/${modFile}`, `mods/${modFile}`, (err) => {
+						newLock.filename = `${gradleProp.archives_base_name}-${gradleProp.mod_version}.jar`;
+						fs.copyFile(`${buildPath}/${newLock.filename}`, util.modPath(newLock) (err) => {
 							if(err) throw err;
 						});
-						newLock.filename = modFile;
 						cbDecrease();
 					});
 				});
@@ -83,10 +83,6 @@ function mayCb() {
 	if(loopCounter <= 0) globCallback("git", Object.fromEntries(modsLock));
 }
 
-function modPath(filename) {
-	return `mods/${filename}`;
-}
-
 module.exports = (mods_lock_p, cb) => {
 	globCallback = cb;
 	modsLock = mods_lock_p;
diff --git a/src/util.js b/src/util.js
new file mode 100644
index 0000000..ccc8db0
--- /dev/null
+++ b/src/util.js
@@ -0,0 +1,7 @@
+function modPath(mod) {
+	return `mods${mod.filename}`;
+}
+
+module.exports = {
+	modPath: modPath
+}