Move instance directory to Instance class

Replace the instancedirectory variable with an Instance class that holds
the directory and has a .path() to get paths relative to the instance
directory.
This commit is contained in:
Hornwitser committed 2019-09-15 13:43:14 +02:00
1 parent ec223e9d9e
commit 1ba9e68603
4 files changed
+148 -97

No files matched your search

+15 -14
View File
@@ -11,6 +11,7 @@ const https = require('follow-redirects').https;
const factorioAPI = require("node-factorio-api");
const sLog = require("single-line-log").stdout;
const query = require('cli-interact').getYesNo;
const path = require("path");
const fileOps = require("lib/fileOps");
// const config = require("./../../config");
@@ -29,19 +30,19 @@ module.exports = function(config){
return {
/**
Lists mods for an instance as a table. Warning, handles printing internally.
@param {string} instance - Name of the instance or "shared"
@param {Instance} instance - Instance object, see client.js
@example
var modManager = require("modManager")(config);
modManager.listMods("testInstance");
modManager.listMods(instance);
// console.logs table of mods installed on instance
modManager.listMods("shared");
// if instance.name is shared:
// console.logs mods located in /sharedMods as a nice table
*/
listMods: function(instance){
return new Promise((resolve, reject) => {
if(instance && instances.includes(instance)){
factorioAPI.init(false, config.instanceDirectory+'/'+instance+'/instanceMods', config.instanceDirectory+'/'+instance+'/saves', config.factorio_version);
if (instances.includes(instance.name)) {
factorioAPI.init(false, instance.path("instanceMods"), instance.path("saves"), config.factorio_version);
factorioAPI.authenticate({
username: config.username,
token: config.token,
@@ -133,10 +134,10 @@ module.exports = function(config){
},
addMod: function(term, instance){
return new Promise((resolve, reject) => {
if(instance == "shared"){ // modDirectory has to end in /
var modDirectory = "sharedMods/";
if(instance.name == "shared") {
var modDirectory = "sharedMods";
} else {
var modDirectory = config.instanceDirectory+"/"+instance+"/instanceMods/";
var modDirectory = instance.path("instanceMods");
}
if(term && term.length > 0){
if(term.includes("mods.factorio.com/mods/")){ // https://mods.factorio.com/mods/Danielv123/ChooChoo
@@ -164,7 +165,7 @@ module.exports = function(config){
let name = JSON.parse(res.getBody())[0].assets[0].name;
if(url) {
console.log("Downloading " + url);
let file = fs.createWriteStream(modDirectory + name);
let file = fs.createWriteStream(path.join(modDirectory, name));
let bytesDownloaded = 0;
let downloadStartTime = Date.now();
https.get(url, function(response) {
@@ -209,10 +210,10 @@ module.exports = function(config){
},
removeMod: function removeMod(term, instance, force = false){
return new Promise((resolve, reject) => {
if(instance == "shared"){ // modDirectory has to end in /
var modDirectory = "sharedMods/";
if(instance.name == "shared"){
var modDirectory = "sharedMods";
} else {
var modDirectory = config.instanceDirectory+"/"+instance+"/instanceMods/";
var modDirectory = instance.path("instanceMods");
}
if(term && typeof term == "string" && term.length > 0){
let mods = fs.readdirSync(modDirectory);
@@ -221,7 +222,7 @@ module.exports = function(config){
console.log("No mods found matching search");
} else if(modsMatchingFilter.length == 1){
console.log("Deleting "+modsMatchingFilter[0]);
fs.unlinkSync(modDirectory+modsMatchingFilter[0]);
fs.unlinkSync(path.join(modDirectory, modsMatchingFilter[0]));
console.log("Deleted.");
} else if(modsMatchingFilter.length > 1){
console.log("Found multiple mods");
@@ -229,7 +230,7 @@ module.exports = function(config){
if(query("Delete all mods matching filter?")){
let modsToDelete = modsMatchingFilter.length;
for(let i = 0; i < modsToDelete; i++){
fs.unlinkSync(modDirectory+modsMatchingFilter[i]);
fs.unlinkSync(path.join(modDirectory, modsMatchingFilter[i]));
console.log("Deleted "+modsMatchingFilter[i]);
}
} else console.log("Did not delete mods.")
-3
View File
@@ -3,9 +3,6 @@ var http = require('http');
var https = require('https');
var fs = require('fs');
var modManager = require("./manager/modManager.js");
// modManager.addMod("clusterio", "shared");
function makeDirectory(path){
return new Promise((resolve, reject) => {