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;
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;
}
/** The version. */
- public static final Version VERSION = new Version(0, 2, 3);
+ public static final Version VERSION = new Version(0, 3, 4);
/** The logger. */
private static final Logger logger = Logging.getLogger(SonePlugin.class);
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 {
- 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()));
+ 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 {
+ 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());
}
}
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);
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 {