crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Added "BLACKLISTED" status for arbitrary data resources.

Browse Source
This commit is contained in:
CalDescent 2021-11-19 20:18:00 +00:00
parent 3860c5d8ec
commit 7f41c7ab0e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/qortal/api/model/ArbitraryResourceSummary.java
View File

@ -14,7 +14,8 @@ public class ArbitraryResourceSummary {
READY, READY,
DOWNLOAD_FAILED, DOWNLOAD_FAILED,
BUILD_FAILED, BUILD_FAILED,
UNSUPPORTED UNSUPPORTED,
BLACKLISTED
} }
public ArbitraryResourceStatus status; public ArbitraryResourceStatus status;

7
src/main/java/org/qortal/arbitrary/ArbitraryDataResource.java
View File

@ -6,6 +6,7 @@ import org.qortal.arbitrary.ArbitraryDataFile.ResourceIdType;
import org.qortal.arbitrary.exception.MissingDataException; import org.qortal.arbitrary.exception.MissingDataException;
import org.qortal.arbitrary.misc.Service; import org.qortal.arbitrary.misc.Service;
import org.qortal.controller.arbitrary.ArbitraryDataBuildManager; import org.qortal.controller.arbitrary.ArbitraryDataBuildManager;
import org.qortal.list.ResourceListManager;
import org.qortal.repository.DataException; import org.qortal.repository.DataException;
import java.io.IOException; import java.io.IOException;
@ -49,6 +50,12 @@ public class ArbitraryDataResource {
return new ArbitraryResourceSummary(ArbitraryResourceStatus.BUILD_FAILED); 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 // Check if we have all data locally for this resource
ArbitraryDataBuilder builder = new ArbitraryDataBuilder(resourceId, service, identifier); ArbitraryDataBuilder builder = new ArbitraryDataBuilder(resourceId, service, identifier);
builder.setCanRequestMissingFiles(false); builder.setCanRequestMissingFiles(false);