Skip to content

feat: add FactionsX data importer #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
derrickmehaffy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add FactionsX data importer #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions src/main/java/com/hyperfactions/command/admin/handler/AdminImportHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.hyperfactions.HyperFactions;
import com.hyperfactions.command.util.CommandUtil;
import com.hyperfactions.importer.ElbaphFactionsImporter;
import com.hyperfactions.importer.FactionsXImporter;
import com.hyperfactions.importer.HyFactionsImporter;
import com.hyperfactions.importer.ImportResult;
import com.hyperfactions.util.CommandHelp;
Expand Down Expand Up @@ -59,6 +60,7 @@ public void handleAdminImport(CommandContext ctx, String[] args) {
switch (subCmd) {
case "hyfactions" -> handleImportHyFactions(ctx, subArgs);
case "elbaphfactions" -> handleImportElbaphFactions(ctx, subArgs);
case "factionsx" -> handleImportFactionsX(ctx, subArgs);
case "help", "?" -> showImportHelp(ctx);
default -> {
ctx.sendMessage(prefix().insert(msg("Unknown import source: " + subCmd, COLOR_RED)));
Expand All @@ -73,6 +75,8 @@ private void showImportHelp(CommandContext ctx) {
commands.add(new CommandHelp(" Default path: mods/Kaws_Hyfaction", ""));
commands.add(new CommandHelp("/f admin import elbaphfactions [path] [flags]", "Import from ElbaphFactions mod"));
commands.add(new CommandHelp(" Default path: mods/ElbaphFactions", ""));
commands.add(new CommandHelp("/f admin import factionsx [path] [flags]", "Import from FactionsX mod"));
commands.add(new CommandHelp(" Default path: mods/FactionsX", ""));
commands.add(new CommandHelp(" Flags:", ""));
commands.add(new CommandHelp(" --dry-run / -n", "Simulate without changes"));
commands.add(new CommandHelp(" --overwrite", "Replace existing factions"));
Expand Down Expand Up @@ -187,6 +191,59 @@ public void handleImportElbaphFactions(CommandContext ctx, String[] args) {
.thenAccept(result -> reportImportResult(ctx, result, finalDryRun, "ElbaphFactions"));
}

/** Handles import factions x. */
public void handleImportFactionsX(CommandContext ctx, String[] args) {
// Parse path (optional - default to mods/FactionsX)
String pathStr = "mods/FactionsX";
int flagStartIndex = 0;

if (args.length > 0 && !args[0].startsWith("-")) {
pathStr = args[0];
flagStartIndex = 1;
}

Path dataPath = Paths.get(pathStr);

boolean dryRun = false;
boolean overwrite = false;
boolean skipZones = false;
boolean skipPower = false;

for (int i = flagStartIndex; i < args.length; i++) {
String flag = args[i].toLowerCase();
switch (flag) {
case "--dry-run", "-n" -> dryRun = true;
case "--overwrite" -> overwrite = true;
case "--no-zones" -> skipZones = true;
case "--no-power" -> skipPower = true;
default -> throw new IllegalStateException("Unexpected value");
}
}

ctx.sendMessage(prefix().insert(msg("Importing from FactionsX...", COLOR_YELLOW)));
ctx.sendMessage(msg(" Path: " + dataPath, COLOR_GRAY));
if (dryRun) {
ctx.sendMessage(msg(" (Dry run - no changes will be made)", COLOR_GRAY));
}

FactionsXImporter importer = new FactionsXImporter(
hyperFactions.getFactionManager(),
hyperFactions.getClaimManager(),
hyperFactions.getZoneManager(),
hyperFactions.getPowerManager(),
hyperFactions.getBackupManager()
);

importer.setDryRun(dryRun);
importer.setOverwrite(overwrite);
importer.setSkipZones(skipZones);
importer.setSkipPower(skipPower);

final boolean finalDryRun = dryRun;
CompletableFuture.supplyAsync(() -> importer.importFrom(dataPath))
.thenAccept(result -> reportImportResult(ctx, result, finalDryRun, "FactionsX"));
}

private void reportImportResult(CommandContext ctx, ImportResult result, boolean dryRun, String sourceName) {
if (!result.hasErrors()) {
ctx.sendMessage(prefix().insert(msg(sourceName + " import " + (dryRun ? "simulation " : "") + "complete!", COLOR_GREEN)));
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/hyperfactions/importer/ElbaphFactionsImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,11 +419,15 @@ private ElbaphZones loadZonesForValidation(File sourceDir, ImportValidationRepor
public ImportResult importFrom(@NotNull Path sourcePath) {
ImportResult.Builder result = ImportResult.builder().dryRun(dryRun);

// Check HyFactions importer isn't running
// Check other importers aren't running
if (HyFactionsImporter.isImportInProgress()) {
result.error("A HyFactions import is already in progress. Please wait for it to complete.");
return result.build();
}
if (FactionsXImporter.isImportInProgress()) {
result.error("A FactionsX import is already in progress. Please wait for it to complete.");
return result.build();
}

// Thread safety: prevent concurrent imports
if (!importLock.tryLock()) {
Expand Down
Loading