mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 23:33:13 +09:00
Changed inventory storage to use Map
This commit is contained in:
1 parent
98f801e244
commit
37052e1f68
3 files changed
+15
-24
No files matched your search
@@ -9,12 +9,12 @@ async function loadDatabase(config, logger) {
|
||||
logger.verbose(`Loading ${itemsPath}`);
|
||||
try {
|
||||
let content = await fs.readFile(itemsPath);
|
||||
return JSON.parse(content);
|
||||
return new Map(JSON.parse(content));
|
||||
|
||||
} catch (err) {
|
||||
if (err.code === "ENOENT") {
|
||||
logger.verbose("Creating new inventory database");
|
||||
return {};
|
||||
return new Map();
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
@@ -24,7 +24,7 @@ async function saveDatabase(masterConfig, inventories, logger) {
|
||||
if (inventories) {
|
||||
let file = path.resolve(masterConfig.get("master.database_directory"), "inventories.json");
|
||||
logger.verbose(`writing ${file}`);
|
||||
let content = JSON.stringify(inventories);
|
||||
let content = JSON.stringify(Array.from(inventories));
|
||||
await fs.outputFile(file, content);
|
||||
}
|
||||
}
|
||||
@@ -41,17 +41,16 @@ class MasterPlugin extends libPlugin.BaseMasterPlugin {
|
||||
|
||||
async uploadRequestHandler(message) {
|
||||
this.logger.verbose(`Saving inventory for ${message.data.player_name}`);
|
||||
this.inventories[message.data.player_name] = message.data.inventory;
|
||||
|
||||
return { success: true };
|
||||
this.inventories.set(message.data.player_name, message.data.inventory);
|
||||
}
|
||||
|
||||
async downloadRequestHandler(message) {
|
||||
this.logger.verbose(`Downloading inventory for ${message.data.player_name}`);
|
||||
let inventory = this.inventories.get(message.data.player_name);
|
||||
return {
|
||||
player_name: message.data.player_name,
|
||||
inventory: this.inventories[message.data.player_name] || {},
|
||||
new_player: !this.inventories[message.data.player_name],
|
||||
inventory: inventory || {},
|
||||
new_player: !inventory,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -61,18 +60,18 @@ class MasterPlugin extends libPlugin.BaseMasterPlugin {
|
||||
}
|
||||
|
||||
async databaseStatsRequestHandler(message) {
|
||||
let inventories = Object.keys(this.inventories)
|
||||
let inventories = Array.from(this.inventories.keys())
|
||||
.map(name => ({
|
||||
name,
|
||||
length: JSON.stringify(this.inventories[name]).length,
|
||||
length: JSON.stringify(this.inventories.get(name)).length,
|
||||
}))
|
||||
.sort((a, b) => a.stringified.length - b.stringified.length);
|
||||
return {
|
||||
database_size: inventories.map(x => x.length).reduce((a, b) => b - a, 0),
|
||||
database_entries: inventories.length,
|
||||
largest_entry: {
|
||||
name: inventories[0].name,
|
||||
size: inventories[0].length,
|
||||
name: inventories[0]?.name || "-",
|
||||
size: inventories[0]?.length || 0,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user