From 7f41c7ab0e5b7cc81a0f0e8cea9a71ffeb93f565 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Fri, 19 Nov 2021 20:18:00 +0000 Subject: [PATCH] Added "BLACKLISTED" status for arbitrary data resources. --- .../org/qortal/api/model/ArbitraryResourceSummary.java | 3 ++- .../java/org/qortal/arbitrary/ArbitraryDataResource.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/qortal/api/model/ArbitraryResourceSummary.java b/src/main/java/org/qortal/api/model/ArbitraryResourceSummary.java index 2ad69933..ad0da4e5 100644 --- a/src/main/java/org/qortal/api/model/ArbitraryResourceSummary.java +++ b/src/main/java/org/qortal/api/model/ArbitraryResourceSummary.java @@ -14,7 +14,8 @@ public class ArbitraryResourceSummary { READY, DOWNLOAD_FAILED, BUILD_FAILED, - UNSUPPORTED + UNSUPPORTED, + BLACKLISTED } public ArbitraryResourceStatus status; diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataResource.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataResource.java index e3f4eff8..afd93b9b 100644 --- a/src/main/java/org/qortal/arbitrary/ArbitraryDataResource.java +++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataResource.java @@ -6,6 +6,7 @@ import org.qortal.arbitrary.ArbitraryDataFile.ResourceIdType; import org.qortal.arbitrary.exception.MissingDataException; import org.qortal.arbitrary.misc.Service; import org.qortal.controller.arbitrary.ArbitraryDataBuildManager; +import org.qortal.list.ResourceListManager; import org.qortal.repository.DataException; import java.io.IOException; @@ -49,6 +50,12 @@ public class ArbitraryDataResource { return new ArbitraryResourceSummary(ArbitraryResourceStatus.BUILD_FAILED); } + // Check if the name is blacklisted + if (ResourceListManager.getInstance() + .listContains("blacklist", "names", this.resourceId, false)) { + return new ArbitraryResourceSummary(ArbitraryResourceStatus.BLACKLISTED); + } + // Check if we have all data locally for this resource ArbitraryDataBuilder builder = new ArbitraryDataBuilder(resourceId, service, identifier); builder.setCanRequestMissingFiles(false);