Fixed autosave

hazae41 · Jun 2, 2019 · d5c67b0 · d5c67b0
1 parent 1421cea
commit d5c67b0
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 164 deletions.
diff --git a/src/main/kotlin/bukkit/Config.kt b/src/main/kotlin/bukkit/Config.kt
@@ -35,195 +35,149 @@ fun BukkitPlugin.init(vararg configs: PluginConfigFile) {
 
 abstract class Config(open var autoSave: Boolean = true) {
 
-    abstract val config: ConfigurationSection
-    abstract fun save()
+    abstract var config: ConfigurationSection
 
     open val sections get() = config.sections
 
     open operator fun contains(key: String) = config.contains(key)
+
     open operator fun get(key: String) = config[key]
-    open operator fun set(key: String, value: Any){
+
+    open operator fun set(key: String, value: Any?){
+        val config = config
         config.set(key, value)
-        if(autoSave) save()
+        if(autoSave) this.config = config
     }
 
     open inner class any(val path: String, val def: Any? = null) {
         operator fun getValue(ref: Any?, prop: KProperty<*>) = config.get(path, def)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Any?) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Any?) = set(path, value)
     }
 
     open inner class list(val path: String, val def: List<Any> = emptyList()) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): List<*> = config.getList(path)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Any>) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Any>) = set(path, value)
     }
 
     open inner class boolean(val path: String, val def: Boolean = false) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): Boolean = config.getBoolean(path, def)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Boolean) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Boolean) = set(path, value)
     }
 
     open inner class booleanList(val path: String) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): List<Boolean> = config.getBooleanList(path)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Boolean>) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Boolean>) = set(path, value)
     }
 
     open inner class string(val path: String, val def: String = "") {
         operator fun getValue(ref: Any?, prop: KProperty<*>): String = config.getString(path, def)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: String) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: String) = set(path, value)
     }
 
     open inner class stringList(val path: String) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): List<String> = config.getStringList(path)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<String>) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<String>) = set(path, value)
     }
 
     open inner class int(val path: String, val def: Int = 0) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): Int = config.getInt(path, def)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Int) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Int) = set(path, value)
     }
 
     open inner class intList(val path: String) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): List<Int> = config.getIntegerList(path)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Int>) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Int>) = set(path, value)
     }
 
     open inner class long(val path: String, val def: Long = 0L) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): Long = config.getLong(path, def)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Long) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Long) = set(path, value)
     }
 
     open inner class longList(val path: String) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): List<Long> = config.getLongList(path)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Long>) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Long>) = set(path, value)
     }
 
     open inner class double(val path: String, val def: Double = 0.0) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): Double = config.getDouble(path, def)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Double) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Double) = set(path, value)
     }
 
     open inner class doubleList(val path: String) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): List<Double> = config.getDoubleList(path)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Double>) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Double>) = set(path, value)
     }
 
     open inner class byteList(val path: String) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): List<Byte> = config.getByteList(path)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Byte>) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Byte>) = set(path, value)
     }
 
     open inner class floatList(val path: String) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): List<Float> = config.getFloatList(path)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Float>) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Float>) = set(path, value)
     }
 
     open inner class shortList(val path: String) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): List<Short> = config.getShortList(path)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Short>) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Short>) = set(path, value)
     }
 
     open inner class charList(val path: String) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): List<Char> = config.getCharacterList(path)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Char>) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Char>) = set(path, value)
     }
 
     open inner class color(val path: String, val def: Color? = null) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): Color? = config.getColor(path, def)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Color?) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Color?) = set(path, value)
     }
 
     open inner class item(val path: String, val def: ItemStack? = null) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): ItemStack? = config.getItemStack(path, def)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: ItemStack?) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: ItemStack?) = set(path, value)
     }
 
     open inner class offlinePlayer(val path: String, val def: OfflinePlayer? = null) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): OfflinePlayer? = config.getOfflinePlayer(path, def)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: OfflinePlayer?) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: OfflinePlayer?) = set(path, value)
     }
 
     open inner class vector(val path: String, val def: Vector? = null) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): Vector? = config.getVector(path, def)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Vector?) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: Vector?) = set(path, value)
     }
 
     open inner class serializable<T : ConfigurationSerializable>(val path: String, val clazz: Class<T>, val def: T? = null) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): T? = config.getSerializable(path, clazz, def)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: T?) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: T?) = set(path, value)
     }
 
     open inner class mapList(val path: String) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): List<Map<*, *>> = config.getMapList(path)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Map<*, *>>) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: List<Map<*, *>>) = set(path, value)
     }
 
     open inner class section(val path: String) {
         operator fun getValue(ref: Any?, prop: KProperty<*>): ConfigurationSection? = config.getConfigurationSection(path)
-        operator fun setValue(ref: Any?, prop: KProperty<*>, value: ConfigurationSection?) {
-            config.set(path, value); if (autoSave) save()
-        }
+        operator fun setValue(ref: Any?, prop: KProperty<*>, value: ConfigurationSection?) = set(path, value)
     }
 }
 
 open class ConfigFile(var file: File?, autoSave: Boolean = true) : Config(autoSave) {
-
-    override val config: ConfigurationSection
+    override var config: ConfigurationSection
         get() {
             val file = file ?: throw ex("Config is not initialized")
             val config = BukkitConfiguration.loadConfiguration(file)
             return config ?: throw ex("Could not load ${file.name}")
         }
-
-    override fun save() {
-        val file = file ?: throw ex("Config is not initialized")
-        val config = config as? FileConfiguration
-        ?: throw ex("Could not save ${config.name} to ${file.name}")
-        config.save(file)
-    }
+        set(value) {
+            val file = file ?: throw ex("Config is not initialized")
+            val config = value as? FileConfiguration
+            ?: throw ex("Could not save ${config.name} to ${file.name}")
+            config.save(file)
+        }
 }
 
 open class PluginConfigFile(var path: String, autoSave: Boolean = true): ConfigFile(null, autoSave)
@@ -232,14 +186,12 @@ open class ConfigSection(
     var parent: Config, var path: String, autoSave: Boolean = true
 ) : Config(autoSave) {
 
-    override val config: ConfigurationSection
+    override var config: ConfigurationSection
         get() {
             val config = parent.config.getConfigurationSection(path)
             return config ?: throw ex("Could not load $path from ${parent.config.name}")
         }
-
-    override fun save() {
-        parent.config.set(path, config)
-        if(parent.autoSave) parent.save()
-    }
+        set(value) {
+            parent[path] = value
+        }
 }