Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-16 09:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(dashboard): reprocess or remove every model on a property

Browse Source 
The property page gets a Reprocess all models button (ugc_manage): every
model placed on the property goes back to the UGC server's queue, made
again with the current settings (/api/ugc/reprocess with {property}).
Import models gets Remove all models (properties_import): deletes every
model placed on the property after the property id is typed in, refused
while the property is loaded in a world, as import is.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-28 10:18:07 -05:00
parent 25e223ce19
commit 6c45d4abdb
10 changed files with 74 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dDashboardServer/routes/MaintenanceRoutes.cpp
View File

@@ -281,4 +281,23 @@ void RegisterMaintenanceRoutes() {
BroadcastTableChanged("properties", std::to_string(*propertyId));
JsonSuccess(reply, { {"models", created}, {"message", "Imported " + std::to_string(created.size()) + " model(s)"} });
});
Route(eHTTPMethod::POST, "/api/properties/:id/remove_models", Perm("properties_import"),
"Delete every model placed on a property (they don't go back to the owner). Body: {confirm: the property ID}",
[](HTTPReply& reply, const HTTPContext& context) {
const auto propertyId = PathId<LWOOBJID>(context.path, 2);
const auto body = ParseBody(context);
if (!propertyId) return JsonError(reply, eHTTPStatusCode::BAD_REQUEST, "Invalid ID");
if (!body || body->value("confirm", std::string()) != std::to_string(*propertyId)) return JsonError(reply, eHTTPStatusCode::BAD_REQUEST, "Confirm with the property ID");
const auto property = Database::Get()->GetPropertyInfo(*propertyId);
if (!property) return JsonError(reply, eHTTPStatusCode::NOT_FOUND, "Property not found");
// A loaded property keeps its own list of models and saves it back
if (PropertyInstanceRunning(property->cloneId)) return JsonError(reply, eHTTPStatusCode::CONFLICT, "This property is loaded in a world right now; try again when nobody is on it");
const auto models = Database::Get()->GetPropertyModels(*propertyId);
for (const auto& model : models) Database::Get()->RemoveModel(model.id);
Audit(context, "remove_property_models", std::to_string(models.size()) + " model(s) from property " + std::to_string(*propertyId));
BroadcastTableChanged("properties", std::to_string(*propertyId));
JsonSuccess(reply, { {"removed", models.size()}, {"message", "Removed " + std::to_string(models.size()) + " model(s)"} });
});
}

10
dDashboardServer/routes/UgcRoutes.cpp
View File

@@ -682,11 +682,19 @@ namespace UgcRoutes {
});
Route(eHTTPMethod::POST, "/api/ugc/reprocess", Perm("ugc_manage"),
"Have the UGC server make items again. Body: {kind: model|modular, id} for one, {kind, failedOnly: true} for the failed ones, {kind} for all",
"Have the UGC server make items again. Body: {kind: model|modular, id} for one, {kind: model, property} for every model placed on a property, {kind, failedOnly: true} for the failed ones, {kind} for all",
[](HTTPReply& reply, const HTTPContext& context) {
const auto body = ParseBody(context);
if (!body) return JsonError(reply, eHTTPStatusCode::BAD_REQUEST, "Invalid JSON");
const bool modular = body->value("kind", "model") == "modular";
if (!modular && body->contains("property")) {
const auto property = GeneralUtils::TryParse<LWOOBJID>((*body)["property"].is_string() ? (*body)["property"].get<std::string>() : (*body)["property"].dump());
if (!property) return JsonError(reply, eHTTPStatusCode::BAD_REQUEST, "Invalid property");
const auto changed = Database::Get()->ResetPropertyUgcModelProcessing(*property);
Audit(context, "ugc_reprocess", "Queued " + std::to_string(changed) + " model(s) on property " + std::to_string(*property) + " to be made again");
BroadcastTableChanged("ugc");
return JsonSuccess(reply, { { "message", std::to_string(changed) + " model" + (changed == 1 ? "" : "s") + " will be made again" } });
}
std::optional<LWOOBJID> id;
if (body->contains("id")) {
id = BodyId(*body);

23
dDashboardServer/templates/property-view.jinja2
View File

@@ -20,6 +20,9 @@
<button class="btn btn-outline-danger btn-sm" onclick="rejectProperty()">Reject</button>
{% endif %}
<a class="btn btn-sm btn-primary" href="/properties/{{ property_id }}/3d">Open 3D view</a>
{% if can.ugc_manage %}
<button class="btn btn-sm btn-outline-secondary" id="reprocessModelsBtn" title="Have the UGC server make every model on this property again (mesh and icon), with the current settings">Reprocess all models</button>
{% endif %}
{% if can.reports_view %}
<a class="btn btn-sm btn-outline-secondary d-none" id="propEconomy" href="#">Economy &amp; map</a>
{% endif %}
@@ -88,6 +91,11 @@
</div>
<div class="col-md-2"><button class="btn btn-sm btn-primary w-100" id="importBtn">Import</button></div>
</div>
<hr>
<div class="d-flex align-items-center gap-2 flex-wrap">
<button class="btn btn-sm btn-outline-danger" id="removeModelsBtn">Remove all models</button>
<span class="small text-body-secondary">Deletes every model placed on this property; they don't go back to the owner. Not possible while the property is loaded in a world.</span>
</div>
</div>
</div>
{% endif %}
@@ -264,6 +272,21 @@ $('#modelsTable').DataTable({
language: { emptyTable: 'Nothing placed on this property' }
});
const reprocessModelsBtn = document.getElementById('reprocessModelsBtn');
if (reprocessModelsBtn) reprocessModelsBtn.addEventListener('click', () => {
reprocessModelsBtn.disabled = true;
api.action('/api/ugc/reprocess', { kind: 'model', property: propertyId }).then((d) => { toast(d.message, 'success'); load(); })
.catch(() => {}).finally(() => { reprocessModelsBtn.disabled = false; });
});
const removeModelsBtn = document.getElementById('removeModelsBtn');
if (removeModelsBtn) removeModelsBtn.addEventListener('click', () => {
if (window.prompt('This deletes every model on the property. Type the property ID (' + propertyId + ') to confirm:') !== propertyId) return;
removeModelsBtn.disabled = true;
api.action('/api/properties/' + propertyId + '/remove_models', { confirm: propertyId }).then((d) => { toast(d.message, 'success'); load(); })
.catch(() => {}).finally(() => { removeModelsBtn.disabled = false; });
});
const importBtn = document.getElementById('importBtn');
if (importBtn) importBtn.addEventListener('click', async () => {
const file = document.getElementById('importFile').files[0];