Permission profile loading and saving

Innectic · Innectic · commit 3a0773082a2e · 2017-08-26T02:49:37.000-07:00
diff --git a/API/src/main/java/me/innectic/permissify/api/PermissifyAPI.java b/API/src/main/java/me/innectic/permissify/api/PermissifyAPI.java
@@ -28,6 +28,7 @@
 import me.innectic.permissify.api.database.ConnectionInformation;
 import me.innectic.permissify.api.database.DatabaseHandler;
 import me.innectic.permissify.api.database.handlers.HandlerType;
+import me.innectic.permissify.api.profile.ProfileSerializer;
 import me.innectic.permissify.api.util.DisplayUtil;
 
 import java.lang.reflect.InvocationTargetException;
@@ -44,13 +45,15 @@ public class PermissifyAPI {
 
     @Getter private Optional<DatabaseHandler> databaseHandler;
     @Getter private DisplayUtil displayUtil;
+    @Getter private ProfileSerializer serializer;
 
     /**
      * Initialize Permissify's API
      */
     public void initialize(HandlerType type, Optional<ConnectionInformation> connectionInformation, DisplayUtil displayUtil) throws Exception {
         instance = Optional.of(this);
         this.displayUtil = displayUtil;
+        serializer = new ProfileSerializer();
 
         try {
             databaseHandler = Optional.of(type.getHandler().getConstructor(ConnectionInformation.class).newInstance(connectionInformation.orElse(null)));
@@ -60,7 +63,7 @@ public void initialize(HandlerType type, Optional<ConnectionInformation> connect
         if (!databaseHandler.isPresent()) throw new Exception("No data handler present.");
         databaseHandler.ifPresent(handler -> {
             handler.initialize();
-            handler.clear(new ArrayList<>());
+            handler.reload(new ArrayList<>());
             boolean connected = handler.connect();
             if (connected) System.out.println("Connected to the database.");
             else System.out.println("Unable to connect to the database.");
diff --git a/API/src/main/java/me/innectic/permissify/api/PermissifyConstants.java b/API/src/main/java/me/innectic/permissify/api/PermissifyConstants.java
@@ -59,6 +59,7 @@ public class PermissifyConstants {
     public static final String PERMISSIFY_FORMAT = "permissify.format";
     public static final String PERMISSIFY_CACHE = "permissify.cache";
     public static final String PERMISSIFY_ADMIN = "permissify.admin";
+    public static final String PERMISSIFY_PROFILE = "permissify.profile";
 
     public static final String INSUFFICIENT_PERMISSIONS = PERMISSIFY_PREFIX + "&c&lInsufficient permissions!";
 
@@ -99,10 +100,17 @@ public class PermissifyConstants {
     public static final String NOT_ENOUGH_ARGUMENTS_PLAYER_LIST_GROUP = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player listgroup [player]";
     public static final String NOT_ENOUGH_ARGUMENTS_SET_FORMAT = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify format [whisper|chat|disable|enable] [format?...]";
     public static final String NOT_ENOUGH_ARGUMENTS_SET_MAIN_GROUP = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify player setmain [player] [group]";
+    public static final String NOT_ENOUGH_ARGUMENTS_PROFILE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile [save|load] [profile]";
+    public static final String NOT_ENOUGH_ARGUMENTS_PROFILE_SAVE = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile save [fileName]";
+    public static final String NOT_ENOUGH_ARGUMENTS_PROFILE_LOAD = PERMISSIFY_PREFIX + "&c&lNot enough arguments! &e&l/permissify profile load [source]";
+
+    public static final String PROFILE_SAVED = PERMISSIFY_PREFIX + "&e&lSaved profile '<PROFILE>'.";
+    public static final String PROFILE_NOT_SAVED = PERMISSIFY_PREFIX + "&c&lUnable to save profile '<PROFILE>'";
+    public static final String PROFILE_LOADED = PERMISSIFY_PREFIX + "&e&lLoaded profile '<PROFILE>' in <TIME> ms.";
+    public static final String PROFILE_NOT_LOADED = PERMISSIFY_PREFIX + "&c&lUnable to load profile '<PROFILE>'";
 
     public static final String INVALID_CHATCOLOR = PERMISSIFY_PREFIX + "&c&lInvalid chat color <COLOR>";
     public static final String INVALID_GROUP = PERMISSIFY_PREFIX + "&c&lInvalid group '<GROUP>'!";
-    public static final String CONSOLE_INVALID_COMMAND = PERMISSIFY_PREFIX + "&c&lOnly one console command available: /permissify superadmin [username]";
     public static final String INVALID_PLAYER = PERMISSIFY_PREFIX + "&c&lInvalid player!";
     public static final String INVALID_ARGUMENT = PERMISSIFY_PREFIX + "&c&lInvalid argument: <ARGUMENT>";
 
diff --git a/API/src/main/java/me/innectic/permissify/api/database/DatabaseHandler.java b/API/src/main/java/me/innectic/permissify/api/database/DatabaseHandler.java
@@ -28,6 +28,7 @@
 import lombok.Setter;
 import me.innectic.permissify.api.permission.Permission;
 import me.innectic.permissify.api.permission.PermissionGroup;
+import me.innectic.permissify.api.profile.PermissifyProfile;
 
 import java.util.*;
 
@@ -43,7 +44,7 @@ public abstract class DatabaseHandler {
     @Getter protected List<PermissionGroup> cachedGroups = new ArrayList<>();
     @Getter protected Optional<PermissionGroup> defaultGroup = Optional.empty();
     @Getter protected final Optional<ConnectionInformation> connectionInformation;
-    protected List<UUID> superAdmins = new ArrayList<>();
+    @Getter protected List<UUID> superAdmins = new ArrayList<>();
     protected String chatFormat = "{group} {username}: {message}";
     protected String whisperFormat = "{senderGroup} {username} > {receiverGroup} {to}: {message}";
 
@@ -68,7 +69,19 @@ public DatabaseHandler(ConnectionInformation connectionInformation) {
      *
      * @param onlinePlayers the current players online who will need permissions.
      */
-    public abstract void clear(List<UUID> onlinePlayers);
+    public abstract void reload(List<UUID> onlinePlayers);
+
+    /**
+     * Drop all values from the handler.
+     */
+    public abstract void drop();
+
+    /**
+     * Load a profile into the handler.
+     *
+     * @param profile the profile to load
+     */
+    public abstract void loadProfile(PermissifyProfile profile);
 
     /**
      * Add a permission to a player
diff --git a/API/src/main/java/me/innectic/permissify/api/database/handlers/SQLHandler.java b/API/src/main/java/me/innectic/permissify/api/database/handlers/SQLHandler.java
@@ -30,6 +30,7 @@
 import me.innectic.permissify.api.permission.Permission;
 import me.innectic.permissify.api.database.ConnectionInformation;
 import me.innectic.permissify.api.permission.PermissionGroup;
+import me.innectic.permissify.api.profile.PermissifyProfile;
 import me.innectic.permissify.api.util.FormatterType;
 
 import java.sql.*;
@@ -156,7 +157,7 @@ public boolean connect() {
     }
 
     @Override
-    public void clear(List<UUID> onlinePlayers) {
+    public void reload(List<UUID> onlinePlayers) {
         cachedGroups = new ArrayList<>();
         cachedPermissions = new HashMap<>();
         superAdmins = new ArrayList<>();
@@ -214,6 +215,45 @@ public void clear(List<UUID> onlinePlayers) {
         onlinePlayers.forEach(this::getPermissions);
     }
 
+    @Override
+    public void drop() {
+        cachedGroups = new ArrayList<>();
+        cachedPermissions = new HashMap<>();
+        superAdmins = new ArrayList<>();
+        chatFormat = "";
+        whisperFormat = "";
+    }
+
+    @Override
+    public void loadProfile(PermissifyProfile profile) {
+        // Load player permissions
+        profile.getPlayerPermissions().forEach((uuid, permissions) -> permissions.forEach(permission -> {
+            if (!permission.isGranted()) addPermission(uuid, permission.getPermission());
+            else removePermission(uuid, permission.getPermission());
+        }));
+        // Create groups
+        profile.getGroups().forEach(group -> {
+            createGroup(group.getName(), group.getPrefix(), group.getSuffix(), group.getChatColor());
+            Optional<PermissionGroup> created = getGroup(group.getName());
+            if (!created.isPresent()) {
+                System.out.println("Profile group was never created?");
+                return;
+            }
+            // Add permissions to the group
+            group.getPermissions().forEach(permission -> {
+                if (permission.isGranted()) created.get().addPermission(permission.getPermission());
+                else created.get().removePermission(permission.getPermission());
+            });
+            // Add the players to the group
+            group.getPlayers().forEach(created.get()::addPlayer);
+        });
+        // Set the other misc things.
+        chatFormat = profile.getChatFormat();
+        whisperFormat = profile.getWhisperFormat();
+        superAdmins = profile.getSuperAdmins();
+        defaultGroup = Optional.ofNullable(profile.getDefaultGroup());
+    }
+
     @Override
     public void addPermission(UUID uuid, String... permissions) {
         // Put the permissions into the cache
diff --git a/API/src/main/java/me/innectic/permissify/api/permission/Permission.java b/API/src/main/java/me/innectic/permissify/api/permission/Permission.java
@@ -28,12 +28,14 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+
 /**
  * @author Innectic
  * @since 6/8/2017
  */
 @AllArgsConstructor
-public class Permission {
+public class Permission implements Serializable {
     @Getter private String permission;
     @Getter @Setter private boolean granted;
 }
diff --git a/API/src/main/java/me/innectic/permissify/api/permission/PermissionGroup.java b/API/src/main/java/me/innectic/permissify/api/permission/PermissionGroup.java
@@ -36,7 +36,7 @@
  * @since 6/14/2017
  */
 @RequiredArgsConstructor
-public class PermissionGroup {
+public class PermissionGroup implements Serializable {
     @Getter private final String name;
     @Getter private final String chatColor;
     @Getter private final String prefix;
diff --git a/API/src/main/java/me/innectic/permissify/api/profile/PermissifyProfile.java b/API/src/main/java/me/innectic/permissify/api/profile/PermissifyProfile.java
@@ -1,3 +1,27 @@
+/*
+*
+* This file is part of Permissify, licensed under the MIT License (MIT).
+* Copyright (c) Innectic
+* Copyright (c) contributors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+ */
 package me.innectic.permissify.api.profile;
 
 import lombok.AllArgsConstructor;
@@ -8,7 +32,6 @@
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 
 /**
@@ -19,7 +42,7 @@
 public class PermissifyProfile implements Serializable {
     @Getter private final List<PermissionGroup> groups;
     @Getter private Map<UUID, List<Permission>> playerPermissions;
-    @Getter private Optional<PermissionGroup> defaultGroup;
+    @Getter private PermissionGroup defaultGroup;
     @Getter private String chatFormat;
     @Getter private String whisperFormat;
     @Getter private List<UUID> superAdmins;
diff --git a/API/src/main/java/me/innectic/permissify/api/profile/ProfileSerializer.java b/API/src/main/java/me/innectic/permissify/api/profile/ProfileSerializer.java
@@ -1,7 +1,29 @@
+/*
+*
+* This file is part of Permissify, licensed under the MIT License (MIT).
+* Copyright (c) Innectic
+* Copyright (c) contributors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+ */
 package me.innectic.permissify.api.profile;
 
-import lombok.AllArgsConstructor;
-
 import java.io.*;
 import java.util.Optional;
 
@@ -36,17 +58,16 @@ public boolean serialize(PermissifyProfile profile, String baseDirectory, String
     /**
      * Deserialize a permissify profile file into a real permissify profile
      *
-     * @param profile the profile file
-     * @return        the profile, fulfilled if done, empty otherwise.
+     * @param profile       the profile file
+     * @param baseDirectory the base directory that files are located in
+     * @return              the profile, fulfilled if done, empty otherwise.
      */
-    public Optional<PermissifyProfile> deserialize(String profile) {
+    public Optional<PermissifyProfile> deserialize(String profile, String baseDirectory) {
         Optional<PermissifyProfile> deserialized = Optional.empty();
         try {
-            long start = System.currentTimeMillis();
-            FileInputStream inputStream = new FileInputStream(profile);
+            FileInputStream inputStream = new FileInputStream(baseDirectory + "/profiles/" + profile + ".permissify");
             ObjectInputStream input = new ObjectInputStream(inputStream);
             deserialized = Optional.of((PermissifyProfile) input.readObject());
-            long end = System.currentTimeMillis();
         } catch (IOException | ClassNotFoundException e) {
             e.printStackTrace();
         }
diff --git a/Spigot/src/main/java/me/innectic/permissify/spigot/PermissifyMain.java b/Spigot/src/main/java/me/innectic/permissify/spigot/PermissifyMain.java
@@ -27,14 +27,11 @@
 import lombok.Getter;
 import lombok.Setter;
 import me.innectic.permissify.spigot.commands.PermissifyCommand;
-import me.innectic.permissify.spigot.commands.permissify.CacheCommand;
-import me.innectic.permissify.spigot.commands.permissify.FormatCommand;
+import me.innectic.permissify.spigot.commands.permissify.*;
 import me.innectic.permissify.spigot.events.PlayerChat;
 import me.innectic.permissify.spigot.events.PlayerJoin;
 import me.innectic.permissify.api.PermissifyAPI;
 import me.innectic.permissify.api.database.handlers.FullHandler;
-import me.innectic.permissify.spigot.commands.permissify.GroupCommand;
-import me.innectic.permissify.spigot.commands.permissify.PlayerCommand;
 import me.innectic.permissify.spigot.events.PreProcess;
 import me.innectic.permissify.spigot.utils.ConfigVerifier;
 import me.innectic.permissify.spigot.utils.DisplayUtil;
@@ -59,6 +56,7 @@ public class PermissifyMain extends JavaPlugin {
     @Getter private PlayerCommand playerCommand;
     @Getter private FormatCommand formatCommand;
     @Getter private CacheCommand cacheCommand;
+    @Getter private ProfileCommand profileCommand;
 
     @Getter @Setter private boolean handleChat = false;
 
@@ -121,6 +119,7 @@ private void registerCommands() {
         playerCommand = new PlayerCommand();
         formatCommand = new FormatCommand();
         cacheCommand = new CacheCommand();
+        profileCommand = new ProfileCommand();
 
         getCommand("permissify").setExecutor(new PermissifyCommand());
     }
diff --git a/Spigot/src/main/java/me/innectic/permissify/spigot/commands/PermissifyCommand.java b/Spigot/src/main/java/me/innectic/permissify/spigot/commands/PermissifyCommand.java
@@ -133,7 +133,10 @@ else if (args[1].equalsIgnoreCase("listgroups"))
             } else if (args[0].equalsIgnoreCase("format")) {
                 CommandResponse response = plugin.getFormatCommand().handleSetFormat(sender, ArgumentUtil.getRemainingArgs(1, args));
                 sender.sendMessage(ColorUtil.makeReadable(response.getResponse()));
-            }
+            } else if (args[0].equalsIgnoreCase("profile")) {
+                CommandResponse response = plugin.getProfileCommand().handleProfile(sender, ArgumentUtil.getRemainingArgs(1, args));
+                sender.sendMessage(ColorUtil.makeReadable(response.getResponse()));
+            } else sendHelp(sender);
         });
         return false;
     }
diff --git a/Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/CacheCommand.java b/Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/CacheCommand.java
@@ -32,7 +32,6 @@
 import me.innectic.permissify.spigot.commands.CommandResponse;
 import me.innectic.permissify.spigot.utils.PermissionUtil;
 import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -61,7 +60,7 @@ public CommandResponse handleCache(CommandSender sender, String[] args) {
     private CommandResponse handleCachePurge(CommandSender sender, String[] args) {
         if (!PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().isPresent())
             return new CommandResponse(PermissifyConstants.UNABLE_OTHER.replace("<REASON>", "No database handler"), false);
-        PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().get().clear(Bukkit.getOnlinePlayers().stream().map(Player::getUniqueId).collect(Collectors.toList()));
+        PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().get().reload(Bukkit.getOnlinePlayers().stream().map(Player::getUniqueId).collect(Collectors.toList()));
         Bukkit.getScheduler().runTaskAsynchronously(PermissifyMain.getInstance(), () -> Bukkit.getOnlinePlayers().forEach(PermissionUtil::applyPermissions));
         return new CommandResponse(PermissifyConstants.CACHE_PURGED, true);
     }
diff --git a/Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/ProfileCommand.java b/Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/ProfileCommand.java
