Arma3_Exile/arma-server-web-admin
1
0
Fork 0
mirror of https://github.com/Dahlgren/arma-server-web-admin.git synced 2024-08-30 17:22:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don’t resolve mods when saving servers

Browse Source
This commit is contained in:
Björn Dahlgren 2017-04-01 11:30:29 +02:00
parent 8c3cf2abbe
commit 1e0b7bddbb
3 changed files with 2 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/mods.js
View File

@ -14,13 +14,6 @@ var Mods = function (config) {
var self = this; var self = this;
}; };
Mods.removeDuplicates = function (mods) {
return mods.reduce(function(a,b){
if (a.indexOf(b) < 0 ) a.push(b);
return a;
},[]);
};
Mods.prototype = new events.EventEmitter(); Mods.prototype = new events.EventEmitter();
Mods.prototype.delete = function (mod, cb) { Mods.prototype.delete = function (mod, cb) {
@ -122,17 +115,6 @@ Mods.prototype.isPlayWithSixMod = function (modPath, cb) {
}); });
}; };
Mods.prototype.resolveMods = function (modsToResolve, cb) {
var self = this;
playwithsix.resolveDependencies(modsToResolve, {lite: this.liteMods}, function (err, mods) {
if (!err && mods) {
cb(null, Mods.removeDuplicates(modsToResolve.concat(mods)));
} else {
cb(err);
}
});
};
Mods.prototype.search = function (query, cb) { Mods.prototype.search = function (query, cb) {
playwithsix.search(query, function (err, mods) { playwithsix.search(query, function (err, mods) {
if (err) { if (err) {

23
routes/servers.js
View File

@ -1,14 +1,4 @@
module.exports = function (manager, mods) { module.exports = function (manager, mods) {
var resolveMods = function(server, cb) {
mods.resolveMods(server.mods, function(err, resolvedMods) {
if (!err) {
server.mods = resolvedMods;
manager.save();
}
cb();
});
};
return { return {
index: function (req, res){ index: function (req, res){
res.send(manager.getServers()); res.send(manager.getServers());
@ -16,13 +6,7 @@ module.exports = function (manager, mods) {
create: function (req, res) { create: function (req, res) {
var server = manager.addServer(req.body); var server = manager.addServer(req.body);
if (server.mods.length > 0) {
resolveMods(server, function() {
res.send(server); res.send(server);
});
} else {
res.send(server);
}
}, },
show: function (req, res){ show: function (req, res){
@ -34,14 +18,7 @@ module.exports = function (manager, mods) {
var server = manager.getServer(req.params.server); var server = manager.getServer(req.params.server);
server.update(req.body); server.update(req.body);
manager.save(); manager.save();
if (server.mods.length > 0) {
resolveMods(server, function() {
res.send(server); res.send(server);
});
} else {
res.send(server);
}
}, },
destroy: function(req, res){ destroy: function(req, res){

6
test/lib/mods.js
View File

@ -3,12 +3,6 @@ var should = require('should');
var Mods = require('../../lib/mods.js'); var Mods = require('../../lib/mods.js');
describe('Mods', function() { describe('Mods', function() {
describe('removeDuplicates()', function() {
it('should remove duplicate mods', function() {
Mods.removeDuplicates(['mod1', 'mod1']).should.eql(['mod1']);
});
});
describe('search()', function() { describe('search()', function() {
it('should find mods', function(done) { it('should find mods', function(done) {
var mods = new Mods(); var mods = new Mods();