Merge branch 'next' into edit-wot-trust

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

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 18a9a52..a809e8e 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -25,8 +25,8 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.FreenetInterface;
 import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
+import net.pterodactylus.sone.freenet.plugin.PluginConnector;
 import net.pterodactylus.sone.freenet.wot.IdentityManager;
-import net.pterodactylus.sone.freenet.wot.PluginConnector;
 import net.pterodactylus.sone.freenet.wot.WebOfTrustConnector;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.config.Configuration;
@@ -44,7 +44,6 @@ import freenet.pluginmanager.FredPluginL10n;
 import freenet.pluginmanager.FredPluginThreadless;
 import freenet.pluginmanager.FredPluginVersioned;
 import freenet.pluginmanager.PluginRespirator;
-import freenet.pluginmanager.PluginStore;
 
 /**
  * This class interfaces with Freenet. It is the class that is loaded by the
@@ -79,7 +78,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
        }
 
        /** The version. */
-       public static final Version VERSION = new Version(0, 3);
+       public static final Version VERSION = new Version(0, 3, 6, 3);
 
        /** The logger. */
        private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -96,9 +95,6 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
        /** The l10n helper. */
        private PluginL10n l10n;
 
-       /** The plugin store. */
-       private PluginStore pluginStore;
-
        /** The identity manager. */
        private IdentityManager identityManager;
 
@@ -145,27 +141,33 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
                this.pluginRespirator = pluginRespirator;
 
                /* create a configuration. */
-               Configuration configuration;
-               Configuration xmlConfiguration = null;
+               Configuration oldConfiguration;
+               Configuration newConfiguration = null;
+               boolean firstStart = !new File("sone.properties").exists();
+               boolean newConfig = false;
                try {
-                       configuration = new Configuration(new MapConfigurationBackend(new File("sone.xml"), false));
-                       xmlConfiguration = configuration;
+                       oldConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), false));
+                       newConfiguration = oldConfiguration;
                } catch (ConfigurationException ce1) {
+                       newConfig = true;
+                       logger.log(Level.INFO, "Could not load configuration file, trying plugin store…", ce1);
                        try {
-                               xmlConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.xml"), true));
+                               newConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), true));
+                               logger.log(Level.INFO, "Created new configuration file.");
                        } catch (ConfigurationException ce2) {
-                               logger.log(Level.SEVERE, "Could not create XML file, using Plugin Store!");
+                               logger.log(Level.SEVERE, "Could not create configuration file, using Plugin Store!", ce2);
                        }
                        try {
-                               configuration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
+                               oldConfiguration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
+                               logger.log(Level.INFO, "Plugin store loaded.");
                        } catch (DatabaseDisabledException dde1) {
-                               logger.log(Level.SEVERE, "Could not load any configuration, using in-memory configuration!");
-                               configuration = new Configuration(new MapConfigurationBackend());
+                               logger.log(Level.SEVERE, "Could not load any configuration, using empty configuration!");
+                               oldConfiguration = new Configuration(new MapConfigurationBackend());
                        }
                }
 
                /* create freenet interface. */
-               FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode(), pluginRespirator.getHLSimpleClient());
+               FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode());
 
                /* create web of trust connector. */
                PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
@@ -174,7 +176,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
                identityManager.setContext("Sone");
 
                /* create core. */
-               core = new Core(configuration, freenetInterface, identityManager);
+               core = new Core(oldConfiguration, freenetInterface, identityManager);
 
                /* create the web interface. */
                webInterface = new WebInterface(this);
@@ -187,10 +189,13 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
                boolean startupFailed = true;
                try {
                        core.start();
-                       if ((xmlConfiguration != null) && (configuration != xmlConfiguration)) {
-                               core.setConfiguration(xmlConfiguration);
+                       if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
+                               logger.log(Level.INFO, "Setting configuration to file-based configuration.");
+                               core.setConfiguration(newConfiguration);
                        }
                        webInterface.start();
+                       webInterface.setFirstStart(firstStart);
+                       webInterface.setNewConfig(newConfig);
                        identityManager.start();
                        startupFailed = false;
                } finally {
@@ -219,14 +224,8 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 
                        /* stop the identity manager. */
                        identityManager.stop();
-
-                       /* TODO wait for core to stop? */
-                       try {
-                               pluginRespirator.putStore(pluginStore);
-                       } catch (DatabaseDisabledException dde1) {
-                               logger.log(Level.WARNING, "Could not store plugin store, database is disabled.", dde1);
-                       }
-
+               } catch (Throwable t1) {
+                       logger.log(Level.SEVERE, "Error while shutting down!", t1);
                } finally {
                        /* shutdown logger. */
                        Logging.shutdown();