Only read the value from the configuration after not resetting.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / Core.java

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 1c282d8..4fe969d 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -31,6 +31,9 @@ import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.core.Options.DefaultOption;
+import net.pterodactylus.sone.core.Options.Option;
+import net.pterodactylus.sone.core.Options.OptionWatcher;
 import net.pterodactylus.sone.core.SoneException.Type;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Profile;
@@ -75,6 +78,9 @@ public class Core extends AbstractService {
        /** The logger. */
        private static final Logger logger = Logging.getLogger(Core.class);
 
+       /** The options. */
+       private final Options options = new Options();
+
        /** The configuration. */
        private Configuration configuration;
 
@@ -116,6 +122,15 @@ public class Core extends AbstractService {
        //
 
        /**
+        * Returns the options of the Sone plugin.
+        *
+        * @return The options of the Sone plugin
+        */
+       public Options getOptions() {
+               return options;
+       }
+
+       /**
         * Sets the configuration of the core.
         *
         * @param configuration
@@ -600,9 +615,32 @@ public class Core extends AbstractService {
        /**
         * Loads the configuration.
         */
+       @SuppressWarnings("unchecked")
        private void loadConfiguration() {
                logger.entering(Core.class.getName(), "loadConfiguration()");
 
+               options.addIntegerOption("InsertionDelay", new DefaultOption<Integer>(60, new OptionWatcher<Integer>() {
+
+                       @Override
+                       public void optionChanged(Option<Integer> option, Integer oldValue, Integer newValue) {
+                               SoneInserter.setInsertionDelay(newValue);
+                       }
+
+               }));
+
+               options.addBooleanOption("ClearOnNextRestart", new DefaultOption<Boolean>(false)).set(configuration.getBooleanValue("Option/ClearOnNextRestart").getValue(null));
+               options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption<Boolean>(false)).set(configuration.getBooleanValue("Option/ReallyClearOnNextRestart").getValue(null));
+
+               boolean clearConfiguration = options.getBooleanOption("ClearOnNextRestart").get() && options.getBooleanOption("ReallyClearOnNextRestart").get();
+               options.getBooleanOption("ClearOnNextRestart").set(null);
+               options.getBooleanOption("ReallyClearOnNextRestart").set(null);
+               if (clearConfiguration) {
+                       /* stop loading the configuration. */
+                       return;
+               }
+
+               options.getIntegerOption("InsertionDelay").set(configuration.getIntValue("Option/InsertionDelay").getValue(null));
+
                /* parse local Sones. */
                logger.log(Level.INFO, "Loading Sones…");
                int soneId = 0;
@@ -744,7 +782,13 @@ public class Core extends AbstractService {
        private void saveConfiguration() {
                Set<Sone> sones = getSones();
                logger.log(Level.INFO, "Storing %d Sones…", sones.size());
+
                try {
+                       /* store the options first. */
+                       configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
+                       configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal());
+                       configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal());
+
                        /* store all Sones. */
                        int soneId = 0;
                        for (Sone sone : localSones) {