aperx/factorio-clusterio
1
0 Fork 0
mirror of https://github.com/clusterio/clusterio.git synced 2026-11-15 15:24:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

Address review on findVersion and the export graphics lookup

Browse Source 
findVersion takes headless as a plain optional argument, the helper is
checkInstallType, the warning is checkMissingBuiltinIcons and the full
install lookup is inlined into exportData.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
bbassieandClaude Opus 5.5 committed 2026-11-01 22:44:43 +00:00
1 parent 37d74ca2a6
commit f8aafe9265
4 files changed
+36 -71
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/host/export.js
+5 -33
View File
@@ -3,8 +3,7 @@ import path from "node:path";
import { FactorioServer } from "@clusterio/host/dist/node/src/server.js";
import {
_createSheetState, _exportIcons, _exportLocale, _findGraphicsDataDir, _loadLayeredIcon, _loadSimpleIcon,
_warnMissingBuiltinIcons,
_checkMissingBuiltinIcons, _createSheetState, _exportIcons, _exportLocale, _loadLayeredIcon, _loadSimpleIcon,
} from "@clusterio/host/dist/node/src/export.js";
@@ -122,36 +121,9 @@ describe("host/src/export", function() {
assert.equal(icon, null);
});
});
describe("findGraphicsDataDir()", function() {
const installs = path.join("test", "file", "factorio");
const withInstalls = (factorioDir, version = testServer.version) => Object.create(testServer, {
_factorioDir: { value: factorioDir }, version: { value: version },
});
it("finds a full install matching the major and minor version of the server", async function() {
const files = { zipCache: new Map() };
await _findGraphicsDataDir(withInstalls(path.join("test", "file", "factorio"), "0.1.1"), files);
assert.deepEqual(files, { zipCache: new Map(), graphicsDataDir: path.join(installs, "0.1.2", "data") });
});
it("skips headless installs of the same version", async function() {
const files = { zipCache: new Map() };
await _findGraphicsDataDir(withInstalls(path.join("test", "file", "factorio-mixed")), files);
assert.equal(files.graphicsDataDir, graphicsDataDir);
});
it("records why when there is no full install", async function() {
const files = { zipCache: new Map() };
await _findGraphicsDataDir(withInstalls(installs, "0.2.5"), files);
assert.equal(files.graphicsDataDir, undefined);
assert.equal(files.graphicsError, "Unable to find full Factorio version 0.2");
});
it("records why when the directory does not exist", async function() {
const files = { zipCache: new Map() };
await _findGraphicsDataDir(withInstalls(path.join("test", "file", "missing")), files);
assert.match(files.graphicsError, /ENOENT/);
});
});
describe("warnMissingBuiltinIcons()", function() {
describe("checkMissingBuiltinIcons()", function() {
it("warns once with the number of missing builtin files", function() {
_warnMissingBuiltinIcons(testServer, { zipCache: new Map() }, new Map([
_checkMissingBuiltinIcons(testServer, { zipCache: new Map() }, new Map([
["__base__/graphics/icons/a.png", null],
["__core__/graphics/icons/b.png", null],
["__base__/graphics/icons/c.png", {}],
@@ -162,7 +134,7 @@ describe("host/src/export", function() {
assert.doesNotMatch(warnings[0], /headless/);
});
it("explains the headless build when no full install was found", function() {
_warnMissingBuiltinIcons(testServer, { zipCache: new Map(), graphicsError: "Not found" }, new Map([
_checkMissingBuiltinIcons(testServer, { zipCache: new Map(), graphicsError: "Not found" }, new Map([
["__base__/graphics/icons/a.png", null],
]));
assert.equal(warnings.length, 1);
@@ -170,7 +142,7 @@ describe("host/src/export", function() {
assert.match(warnings[0], /Add a full install of Factorio 0\.1 to host\.factorio_directory/);
});
it("does not warn when no builtin files are missing", function() {
_warnMissingBuiltinIcons(testServer, { zipCache: new Map() }, new Map([
_checkMissingBuiltinIcons(testServer, { zipCache: new Map() }, new Map([
["__base__/graphics/icons/c.png", {}],
["__some_mod__/graphics/icons/d.png", null],
]));
test/host/server.js
+10 -5
View File
@@ -105,20 +105,25 @@ describe("host/server", function() {
);
});
});
describe("headless option", function() {
describe("headless argument", function() {
const mixedDir = path.join("test", "file", "factorio-mixed");
it("should find only full installs when false", async function() {
const [dir] = await hostServer.findVersion(mixedDir, "0.1.2", { headless: false });
const [dir] = await hostServer.findVersion(mixedDir, "0.1.2", false);
assert.equal(dir, path.join(mixedDir, "full", "data"));
});
it("should find only headless installs when true", async function() {
const [dir] = await hostServer.findVersion(mixedDir, "0.1.2", { headless: true });
const [dir] = await hostServer.findVersion(mixedDir, "0.1.2", true);
assert.equal(dir, path.join(mixedDir, "headless", "data"));
});
it("should skip installs of the other build when matching a partial version", async function() {
const installDir = path.join("test", "file", "factorio");
const [dir, version] = await hostServer.findVersion(installDir, "0.1", false);
assert.deepEqual([dir, version], [path.join(installDir, "0.1.2", "data"), "0.1.2"]);
});
it("should reject a direct install of the other build", async function() {
const installDir = path.join(mixedDir, "headless");
await assert.rejects(
hostServer.findVersion(installDir, "0.1.2", { headless: false }),
hostServer.findVersion(installDir, "0.1.2", false),
new Error(
`Unable to find a full install of Factorio 0.1.2: ${installDir} is a direct ` +
"(single-version) install of the headless build."
@@ -127,7 +132,7 @@ describe("host/server", function() {
});
it("should reject if no install of that build has the version", async function() {
await assert.rejects(
hostServer.findVersion(path.join("test", "file", "factorio"), "0.1.2", { headless: true }),
hostServer.findVersion(path.join("test", "file", "factorio"), "0.1.2", true),
new Error("Unable to find headless Factorio version 0.1.2")
);
});