Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-23 21:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(control) GUI for atags export

Browse Source
This commit is contained in:
Viktor Lofgren 2023-10-31 17:55:47 +01:00
parent 23f2068e33
commit c77a5b7cb6
7 changed files with 98 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/api/executor-api/src/main/java/nu/marginalia/executor/client/ExecutorClient.java
View File

@ -86,6 +86,13 @@ public class ExecutorClient extends AbstractDynamicClient {
.blockingSubscribe();
}
public void exportAtags(Context ctx, int node, String fid) {
post(ctx, node, "/export/atags?fid="+fid, "").blockingSubscribe();
}
public void exportData(Context ctx, int node) {
post(ctx, node, "/export/data", "").blockingSubscribe();
}
public void restoreBackup(Context context, int node, String fid) {
post(context, node, "/backup/" + fid + "/restore", "").blockingSubscribe();
}

3
code/services-core/control-service/src/main/java/nu/marginalia/control/node/model/FileStorageWithActions.java
View File

@ -12,6 +12,9 @@ public record FileStorageWithActions(FileStorage storage) {
public boolean isCrawlable() {
return storage.type() == FileStorageType.CRAWL_SPEC;
}
public boolean isAtagsExportable() {
return storage.type() == FileStorageType.CRAWL_DATA;
}
public boolean isRecrawlable() {
return storage.type() == FileStorageType.CRAWL_DATA;
}

17
code/services-core/control-service/src/main/java/nu/marginalia/control/node/svc/ControlNodeService.java
View File

@ -111,11 +111,26 @@ public class ControlNodeService {
Spark.post("/public/nodes/:id/storage/backup-restore/:fid", this::triggerRestoreBackup,
redirectControl.renderRedirectAcknowledgement("Restoring", "..")
);
Spark.post("/public/nodes/:id/actions/export-data", this::exportData,
redirectControl.renderRedirectAcknowledgement("Exporting", "../storage/exports")
);
Spark.post("/public/nodes/:id/storage/:fid/export-atags", this::exportAtags,
redirectControl.renderRedirectAcknowledgement("Exporting", "../../storage/exports")
);
Spark.post("/public/nodes/:id/fsms/:fsm/start", this::startFsm);
Spark.post("/public/nodes/:id/fsms/:fsm/stop", this::stopFsm);
}
private Object exportData(Request req, Response rsp) {
executorClient.exportData(Context.fromRequest(req), Integer.parseInt(req.params("id")));
return "";
}
private Object exportAtags(Request req, Response rsp) {
executorClient.exportAtags(Context.fromRequest(req), Integer.parseInt(req.params("id")), req.params("fid"));
return "";
}
public Object startFsm(Request req, Response rsp) throws Exception {
executorClient.startFsm(Context.fromRequest(req), Integer.parseInt(req.params("id")), req.params("fsm").toUpperCase());

28
code/services-core/control-service/src/main/resources/templates/control/node/node-actions.hdb
View File

@ -288,6 +288,34 @@
</form>
</div>
</div>
<div class="accordion-item">
<h2 class="accordion-header">
<button class="accordion-button collapsed"
type="button"
data-bs-toggle="collapse"
data-bs-target="#collapseExportData"
aria-expanded="false"
aria-controls="collapseExportData">
Export Database Data
</button>
</h2>
<div id="collapseExportData" class="accordion-collapse collapse p-3" data-bs-parent="#accordionActions">
This will export database data: Domains, blacklist and domain links.
<form method="post" action="actions/export-data" onsubmit="return confirm('Confirm export')">
<div class="my-3 py-3">
<div class="row">
<div class="col">
<button type="submit" class="btn btn-primary">Export</button>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</div>

8
code/services-core/control-service/src/main/resources/templates/control/node/node-storage-details.hdb
View File

@ -67,6 +67,14 @@
</tr>
</form>
{{/if}}
{{#if isAtagsExportable}}
<form method="post" action="/nodes/{{node.id}}/storage/{{storage.id}}/export-atags" onsubmit="return confirm('Confirm export of anchor tags from {{storage.path}}')">
<tr>
<td>Export anchor tags from this crawl data</td>
<td><button class="btn btn-secondary" type="submit">Export</button></td>
</tr>
</form>
{{/if}}
{{#if isRestorable}}
<form method="post" action="/nodes/{{node.id}}/storage/backup-restore/{{storage.id}}" onsubmit="return confirm('Confirm restoring backup {{storage.path}}')">
<tr>

9
code/services-core/executor-service/src/main/java/nu/marginalia/executor/ExecutorSvc.java
View File

@ -8,10 +8,7 @@ import nu.marginalia.actor.ExecutorActorControlService;
import nu.marginalia.actor.state.ActorStateInstance;
import nu.marginalia.executor.model.ActorRunState;
import nu.marginalia.executor.model.ActorRunStates;
import nu.marginalia.executor.svc.BackupService;
import nu.marginalia.executor.svc.ProcessingService;
import nu.marginalia.executor.svc.SideloadService;
import nu.marginalia.executor.svc.TransferService;
import nu.marginalia.executor.svc.*;
import nu.marginalia.service.server.BaseServiceParams;
import nu.marginalia.service.server.Service;
import nu.marginalia.service.server.mq.MqNotification;
@ -44,6 +41,7 @@ public class ExecutorSvc extends Service {
ProcessingService processingService,
SideloadService sideloadService,
BackupService backupService,
ExportService exportService,
FileStorageService fileStorageService,
Gson gson,
TransferService transferService,
@ -72,6 +70,9 @@ public class ExecutorSvc extends Service {
Spark.post("/sideload/stackexchange", sideloadService::sideloadStackexchange);
Spark.post("/sideload/encyclopedia", sideloadService::sideloadEncyclopedia);
Spark.post("/export/atags", exportService::exportAtags);
Spark.post("/export/data", exportService::exportData);
Spark.post("/backup/:fid/restore", backupService::restore);
Spark.get("/storage/:fid", transferService::listFiles, gson::toJson);

31
code/services-core/executor-service/src/main/java/nu/marginalia/executor/svc/ExportService.java Normal file
View File

@ -0,0 +1,31 @@
package nu.marginalia.executor.svc;
import com.google.inject.Inject;
import nu.marginalia.actor.ExecutorActor;
import nu.marginalia.actor.ExecutorActorControlService;
import nu.marginalia.actor.task.ConvertActor;
import nu.marginalia.actor.task.ExportAtagsActor;
import nu.marginalia.actor.task.ExportDataActor;
import nu.marginalia.storage.model.FileStorageId;
import spark.Request;
import spark.Response;
public class ExportService {
private final ExecutorActorControlService actorControlService;
@Inject
public ExportService(ExecutorActorControlService actorControlService) {
this.actorControlService = actorControlService;
}
public Object exportData(Request request, Response response) throws Exception {
actorControlService.startFrom(ExecutorActor.EXPORT_DATA, new ExportDataActor.Export());
return "";
}
public Object exportAtags(Request request, Response response) throws Exception {
actorControlService.startFrom(ExecutorActor.EXPORT_ATAGS, new ExportAtagsActor.Export(FileStorageId.parse(request.queryParams("fid"))));
return "";
}
}