Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-28 05:35:26 +01:00
Code Issues Projects Releases Wiki Activity

Don't store attributes for permissions with only 'value: true' in YAML/JSON storage files

Browse Source
This commit is contained in:
Luck 2017-06-07 21:04:14 +01:00
parent b9fc8f4b5f
commit ff0c988a1d
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
4 changed files with 87 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/main/java/me/lucko/luckperms/common/core/NodeModel.java
View File

@ -28,6 +28,7 @@ package me.lucko.luckperms.common.core;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NonNull;
import lombok.ToString;
import com.google.common.base.Preconditions;
@ -76,11 +77,17 @@ public final class NodeModel {
return of(permission, value, server, world, expiry, deserializeContextSet(context).makeImmutable());
}
@NonNull
private final String permission;
@NonNull
private final boolean value;
@NonNull
private final String server;
@NonNull
private final String world;
@NonNull
private final long expiry;
@NonNull
private final ImmutableContextSet contexts;
public String serializeContext() {

8
common/src/main/java/me/lucko/luckperms/common/metastacking/definition/StandardStackElements.java
View File

@ -195,7 +195,7 @@ public class StandardStackElements {
}
}
@ToString
@ToString(of = "trackName")
@RequiredArgsConstructor
@EqualsAndHashCode(of = "trackName")
private static final class HighestPriorityTrack implements MetaStackElement {
@ -213,7 +213,7 @@ public class StandardStackElements {
}
}
@ToString
@ToString(of = "trackName")
@RequiredArgsConstructor
@EqualsAndHashCode(of = "trackName")
private static final class HighestPriorityNotOnTrack implements MetaStackElement {
@ -261,7 +261,7 @@ public class StandardStackElements {
}
}
@ToString
@ToString(of = "trackName")
@RequiredArgsConstructor
@EqualsAndHashCode(of = "trackName")
private static final class LowestPriorityTrack implements MetaStackElement {
@ -279,7 +279,7 @@ public class StandardStackElements {
}
}
@ToString
@ToString(of = "trackName")
@RequiredArgsConstructor
@EqualsAndHashCode(of = "trackName")
private static final class LowestPriorityNotOnTrack implements MetaStackElement {

19
common/src/main/java/me/lucko/luckperms/common/storage/backing/JSONBacking.java
View File

@ -504,6 +504,12 @@ public class JSONBacking extends FlatfileBacking {
Set<NodeModel> nodes = new HashSet<>();
for (JsonElement ent : permissionsSection) {
if (ent.isJsonPrimitive() && ent.getAsJsonPrimitive().isString()) {
String permission = ent.getAsJsonPrimitive().getAsString();
nodes.add(NodeModel.of(permission, true, "global", "global", 0L, ImmutableContextSet.empty()));
continue;
}
if (!ent.isJsonObject()) {
continue;
}
@ -552,6 +558,19 @@ public class JSONBacking extends FlatfileBacking {
JsonArray arr = new JsonArray();
for (NodeModel node : nodes) {
// just a raw, default node.
boolean single = node.isValue() &&
node.getServer().equalsIgnoreCase("global") &&
node.getWorld().equalsIgnoreCase("global") &&
node.getExpiry() == 0L &&
node.getContexts().isEmpty();
// just add a string to the list.
if (single) {
arr.add(new JsonPrimitive(node.getPermission()));
continue;
}
JsonObject attributes = new JsonObject();
attributes.addProperty("value", node.isValue());

63
common/src/main/java/me/lucko/luckperms/common/storage/backing/YAMLBacking.java
View File

@ -487,18 +487,30 @@ public class YAMLBacking extends FlatfileBacking {
Set<NodeModel> nodes = new HashSet<>();
for (Object perm : permissionsSection) {
// each object in the permission list is either a String or Map.
// just a permission with no extra context.
if (perm instanceof String) {
String permission = (String) perm;
nodes.add(NodeModel.of(permission, true, "global", "global", 0L, ImmutableContextSet.empty()));
continue;
}
// it must be a map at this point.
if (!(perm instanceof Map)) {
continue;
}
Map<String, Object> data = (Map<String, Object>) perm;
Map.Entry<String, Object> entry = Iterables.getFirst(data.entrySet(), null);
if (entry == null) {
if (((Map) perm).isEmpty()) {
continue;
}
// the permission object, should only contain one entry.
Map<String, Object> data = (Map<String, Object>) perm;
// get the only entry in the map. the key is the permission, the object is the attributes associated with it.
Map.Entry<String, Object> entry = Iterables.getFirst(data.entrySet(), null);
String permission = entry.getKey();
if (entry.getValue() != null && entry.getValue() instanceof Map) {
@ -551,10 +563,43 @@ public class YAMLBacking extends FlatfileBacking {
return nodes;
}
public static List<Map<String, Object>> serializePermissions(Set<NodeModel> nodes) {
List<Map<String, Object>> data = new ArrayList<>();
/**
* Serializes a set of nodes to a format which can be serialised by SnakeYAML.
* (Maps, Lists and raw types)
*
* Returns a list of objects.
*
* Each object is either instanceof String, just a raw permission node with value=true and default context
*
* OR
*
* Is a Map of String to Map. The map contains only one entry, where the key is the permission string, and the value
* is a map containing the attributes of the node.
*
* @param nodes the nodes to serialize
* @return a SnakeYAML friendly representation of the map
*/
public static List<Object> serializePermissions(Set<NodeModel> nodes) {
List<Object> data = new ArrayList<>();
for (NodeModel node : nodes) {
// just a raw, default node.
boolean single = node.isValue() &&
node.getServer().equalsIgnoreCase("global") &&
node.getWorld().equalsIgnoreCase("global") &&
node.getExpiry() == 0L &&
node.getContexts().isEmpty();
// just add a string to the list.
if (single) {
data.add(node.getPermission());
continue;
}
// otherwise, this node has some other special context which needs to be saved.
// we serialise this way so it gets represented nicely in YAML.
// create a map of node attributes
Map<String, Object> attributes = new LinkedHashMap<>();
attributes.put("value", node.isValue());
@ -588,8 +633,14 @@ public class YAMLBacking extends FlatfileBacking {
attributes.put("context", context);
}
// create a new map to represent this entry in the list
// the map will only contain one entry. (the permission --> attributes)
Map<String, Object> perm = new HashMap<>();
// add the node to the map
perm.put(node.getPermission(), attributes);
// add the map to the object list, and continue
data.add(perm);
}