X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=a809e8ec2f964ce215255f188c4a89350e4b70c8;hp=e349ff01c3737df391f54e24653b4b8c6e93f299;hb=02de134dcf3d4500ae02320aab2dae827d499fa1;hpb=16fc808ecfa456487bcb745474b8b777f5dfa829

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index e349ff0..a809e8e 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -18,7 +18,6 @@
 package net.pterodactylus.sone.main;
 
 import java.io.File;
-import java.util.Collections;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
@@ -26,14 +25,13 @@ 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;
 import net.pterodactylus.util.config.ConfigurationException;
 import net.pterodactylus.util.config.MapConfigurationBackend;
-import net.pterodactylus.util.config.XMLConfigurationBackend;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.logging.LoggingListener;
 import net.pterodactylus.util.version.Version;
@@ -46,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
@@ -81,7 +78,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 2);
+	public static final Version VERSION = new Version(0, 3, 6, 3);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -98,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;
 
@@ -147,21 +141,33 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 		this.pluginRespirator = pluginRespirator;
 
 		/* create a configuration. */
-		Configuration configuration;
+		Configuration oldConfiguration;
+		Configuration newConfiguration = null;
+		boolean firstStart = !new File("sone.properties").exists();
+		boolean newConfig = false;
 		try {
-			configuration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
-		} catch (DatabaseDisabledException dde1) {
-			logger.log(Level.WARNING, "Could not load plugin store, using XML files.");
+			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 {
+				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 configuration file, using Plugin Store!", ce2);
+			}
 			try {
-				configuration = new Configuration(new XMLConfigurationBackend(new File("sone.xml"), true));
-			} catch (ConfigurationException ce1) {
-				logger.log(Level.SEVERE, "Could not load or create the “sone.xml” configuration file!");
-				configuration = new Configuration(new MapConfigurationBackend(Collections.<String, String> emptyMap()));
+				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 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);
@@ -169,11 +175,12 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 		identityManager = new IdentityManager(webOfTrustConnector);
 		identityManager.setContext("Sone");
 
+		/* create core. */
+		core = new Core(oldConfiguration, freenetInterface, identityManager);
+
 		/* create the web interface. */
 		webInterface = new WebInterface(this);
-
-		/* create core. */
-		core = new Core(configuration, freenetInterface, identityManager);
+		core.addCoreListener(webInterface);
 
 		/* create the identity manager. */
 		identityManager.addIdentityListener(core);
@@ -182,7 +189,13 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 		boolean startupFailed = true;
 		try {
 			core.start();
+			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 {
@@ -211,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();