mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 23:33:13 +09:00
Derive mod filename from name and version
Enforce the filename of uploaded mods match {name}_{version}.zip with
name and version taken from the zip file's info.json entry. This allows
it to be used as a unique key for the mod and solves part of the issues
with mods having different number of leading zeros in their version.
This commit is contained in:
1 parent
7d34c60dd1
commit
7072b94355
7 files changed
+39
-28
No files matched your search
@@ -531,10 +531,10 @@ class ControlConnection extends BaseConnection {
|
||||
|
||||
async getModRequestHandler(message) {
|
||||
let { name, version } = message.data;
|
||||
let key = `${name}_${version}`;
|
||||
let mod = this._master.mods.get(key);
|
||||
let filename = `${name}_${version}.zip`;
|
||||
let mod = this._master.mods.get(filename);
|
||||
if (!mod) {
|
||||
throw new libErrors.RequestError(`Mod ${key} does not exist`);
|
||||
throw new libErrors.RequestError(`Mod ${filename} does not exist`);
|
||||
}
|
||||
return {
|
||||
mod: mod.toJSON(),
|
||||
@@ -639,10 +639,10 @@ class ControlConnection extends BaseConnection {
|
||||
|
||||
async downloadModRequestHandler(message) {
|
||||
let { name, version } = message.data;
|
||||
let key = `${name}_${version}`;
|
||||
let mod = this._master.mods.get(key);
|
||||
let filename = `${name}_${version}.zip`;
|
||||
let mod = this._master.mods.get(filename);
|
||||
if (!mod) {
|
||||
throw new libErrors.RequestError(`Mod ${key} does not exist`);
|
||||
throw new libErrors.RequestError(`Mod ${filename} does not exist`);
|
||||
}
|
||||
let modPath = path.join(this._master.config.get("master.mods_directory"), mod.filename);
|
||||
|
||||
|
||||
@@ -420,15 +420,15 @@ class Master {
|
||||
continue;
|
||||
}
|
||||
|
||||
let key = `${modInfo.name}_${modInfo.version}`;
|
||||
if (mods.has(key)) {
|
||||
if (modInfo.filename !== entry.name) {
|
||||
logger.error(
|
||||
`Ignoring Mod ${entry.name} as it contains the same name and ` +
|
||||
`version as ${mods.get(key).filename}`
|
||||
`Mod ${entry.name}'s filename does not match the expected ` +
|
||||
`name ${modInfo.filename}, it will be ignored.`
|
||||
);
|
||||
continue;
|
||||
}
|
||||
mods.set(key, modInfo);
|
||||
|
||||
mods.set(modInfo.filename, modInfo);
|
||||
}
|
||||
return mods;
|
||||
}
|
||||
@@ -454,15 +454,15 @@ class Master {
|
||||
}
|
||||
|
||||
async deleteMod(name, version) {
|
||||
let key = `${name}_${version}`;
|
||||
let mod = this.mods.get(key);
|
||||
let filename = `${name}_${version}.zip`;
|
||||
let mod = this.mods.get(filename);
|
||||
if (!mod) {
|
||||
throw new Error(`Mod ${key} does not exist`);
|
||||
throw new Error(`Mod ${filename} does not exist`);
|
||||
}
|
||||
|
||||
let modsDirectory = this.config.get("master.mods_directory");
|
||||
await fs.unlink(path.join(modsDirectory, mod.filename));
|
||||
this.mods.delete(key);
|
||||
await fs.unlink(path.join(modsDirectory, filename));
|
||||
this.mods.delete(filename);
|
||||
mod.isDeleted = true;
|
||||
this.modUpdated(mod);
|
||||
}
|
||||
|
||||
@@ -507,9 +507,8 @@ async function uploadMod(req, res) {
|
||||
await finished(writeStream);
|
||||
|
||||
const modInfo = await libData.ModInfo.fromModFile(path.join(modsDirectory, tempFilename));
|
||||
modInfo.filename = filename;
|
||||
await fs.rename(path.join(modsDirectory, tempFilename), path.join(modsDirectory, filename));
|
||||
req.app.locals.master.mods.set(`${modInfo.name}_${modInfo.version}`, modInfo);
|
||||
await fs.rename(path.join(modsDirectory, tempFilename), path.join(modsDirectory, modInfo.filename));
|
||||
req.app.locals.master.mods.set(modInfo.filename, modInfo);
|
||||
req.app.locals.master.modUpdated(modInfo);
|
||||
mods.push(modInfo.toJSON());
|
||||
|
||||
|
||||
Reference in new issue
Block a user