X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=3f010f642a1f93cb467ebfcf5a14fcd3407aa2c2;hb=8bd33b61d226641aad09285e97c156d4d6e25aed;hp=bff0a491070bd09f016bf94bb710ab6bdf4e1a54;hpb=c4ae226ec5052116cefc542ae2017036a7bc6332;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index bff0a49..3f010f6 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -1,5 +1,5 @@
/*
- * Sone - SonePlugin.java - Copyright © 2010â2016 David Roden
+ * Sone - SonePlugin.java - Copyright © 2010â2019 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,60 +17,36 @@
package net.pterodactylus.sone.main;
-import static com.google.common.base.Optional.of;
-import static java.util.logging.Logger.getLogger;
+import static java.util.logging.Logger.*;
-import java.io.File;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
import java.util.logging.Logger;
-
-import net.pterodactylus.sone.core.Core;
-import net.pterodactylus.sone.fcp.FcpInterface;
-import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
-import net.pterodactylus.sone.freenet.wot.Context;
-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.version.Version;
-
-import com.google.common.base.Optional;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.eventbus.EventBus;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.TypeLiteral;
-import com.google.inject.matcher.Matchers;
-import com.google.inject.spi.InjectionListener;
-import com.google.inject.spi.TypeEncounter;
-import com.google.inject.spi.TypeListener;
-
-import freenet.client.async.PersistenceDisabledException;
-import freenet.l10n.BaseL10n.LANGUAGE;
-import freenet.l10n.PluginL10n;
-import freenet.node.Node;
-import freenet.pluginmanager.FredPlugin;
-import freenet.pluginmanager.FredPluginBaseL10n;
-import freenet.pluginmanager.FredPluginFCP;
-import freenet.pluginmanager.FredPluginL10n;
-import freenet.pluginmanager.FredPluginThreadless;
-import freenet.pluginmanager.FredPluginVersioned;
-import freenet.pluginmanager.PluginReplySender;
-import freenet.pluginmanager.PluginRespirator;
-import freenet.support.SimpleFieldSet;
-import freenet.support.api.Bucket;
+import java.util.logging.*;
+
+import net.pterodactylus.sone.core.*;
+import net.pterodactylus.sone.core.event.*;
+import net.pterodactylus.sone.fcp.*;
+import net.pterodactylus.sone.freenet.wot.*;
+import net.pterodactylus.sone.web.*;
+import net.pterodactylus.sone.web.notification.NotificationHandler;
+import net.pterodactylus.sone.web.notification.NotificationHandlerModule;
+
+import freenet.l10n.BaseL10n.*;
+import freenet.l10n.*;
+import freenet.pluginmanager.*;
+import freenet.support.*;
+import freenet.support.api.*;
+
+import com.google.common.annotations.*;
+import com.google.common.eventbus.*;
+import com.google.common.cache.*;
+import com.google.inject.*;
+import com.google.inject.Module;
+import com.google.inject.name.*;
+import kotlin.jvm.functions.*;
/**
* This class interfaces with Freenet. It is the class that is loaded by the
* node and starts up the whole Sone system.
- *
- * @author David âBombeâ Roden
*/
public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, FredPluginBaseL10n, FredPluginThreadless, FredPluginVersioned {
@@ -79,12 +55,13 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
static {
/* initialize logging. */
soneLogger.setUseParentHandlers(false);
+ soneLogger.setLevel(Level.ALL);
soneLogger.addHandler(new Handler() {
private final LoadingCache> classCache = CacheBuilder.newBuilder()
.build(new CacheLoader>() {
@Override
public Class> load(String key) throws Exception {
- return Class.forName(key);
+ return SonePlugin.class.getClassLoader().loadClass(key);
}
});
@@ -115,17 +92,16 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
});
}
- /** The version. */
- public static final Version VERSION = new Version(0, 9, 5);
-
/** The current year at time of release. */
- private static final int YEAR = 2016;
+ private static final int YEAR = 2019;
private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
- private static final int LATEST_EDITION = 72;
+ private static final int LATEST_EDITION = 79;
/** The logger. */
private static final Logger logger = getLogger(SonePlugin.class.getName());
+ private final Function1 injectorCreator;
+
/** The plugin respirator. */
private PluginRespirator pluginRespirator;
@@ -144,6 +120,15 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
/** The web of trust connector. */
private WebOfTrustConnector webOfTrustConnector;
+ public SonePlugin() {
+ this(Guice::createInjector);
+ }
+
+ @VisibleForTesting
+ public SonePlugin(Function1 injectorCreator) {
+ this.injectorCreator = injectorCreator;
+ }
+
//
// ACCESSORS
//
@@ -175,11 +160,16 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
return l10n;
}
- public static int getYear() {
+ public static String getPluginVersion() {
+ net.pterodactylus.sone.main.Version version = VersionParserKt.getParsedVersion();
+ return (version == null) ? "unknown" : version.getNice();
+ }
+
+ public int getYear() {
return YEAR;
}
- public static String getHomepage() {
+ public String getHomepage() {
return SONE_HOMEPAGE + LATEST_EDITION;
}
@@ -198,91 +188,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
public void runPlugin(PluginRespirator pluginRespirator) {
this.pluginRespirator = pluginRespirator;
- /* create a configuration. */
- Configuration oldConfiguration;
- Configuration newConfiguration = null;
- boolean firstStart = !new File("sone.properties").exists();
- boolean newConfig = false;
- try {
- 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 {
- oldConfiguration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
- logger.log(Level.INFO, "Plugin store loaded.");
- } catch (PersistenceDisabledException pde1) {
- logger.log(Level.SEVERE, "Could not load any configuration, using empty configuration!");
- oldConfiguration = new Configuration(new MapConfigurationBackend());
- }
- }
-
- final Configuration startConfiguration;
- if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
- logger.log(Level.INFO, "Setting configuration to file-based configuration.");
- startConfiguration = newConfiguration;
- } else {
- startConfiguration = oldConfiguration;
- }
- final EventBus eventBus = new EventBus();
-
- /* Freenet injector configuration. */
- AbstractModule freenetModule = new AbstractModule() {
-
- @Override
- @SuppressWarnings("synthetic-access")
- protected void configure() {
- bind(PluginRespirator.class).toInstance(SonePlugin.this.pluginRespirator);
- bind(Node.class).toInstance(SonePlugin.this.pluginRespirator.getNode());
- }
- };
- /* Sone injector configuration. */
- AbstractModule soneModule = new AbstractModule() {
-
- @Override
- protected void configure() {
- bind(EventBus.class).toInstance(eventBus);
- bind(Configuration.class).toInstance(startConfiguration);
- Context context = new Context("Sone");
- bind(Context.class).toInstance(context);
- bind(getOptionalContextTypeLiteral()).toInstance(of(context));
- bind(SonePlugin.class).toInstance(SonePlugin.this);
- bind(Version.class).toInstance(VERSION);
- if (startConfiguration.getBooleanValue("Developer.LoadFromFilesystem").getValue(false)) {
- String path = startConfiguration.getStringValue("Developer.FilesystemPath").getValue(null);
- if (path != null) {
- bind(Loaders.class).toInstance(new DebugLoaders(path));
- }
- }
- bindListener(Matchers.any(), new TypeListener() {
-
- @Override
- public void hear(TypeLiteral typeLiteral, TypeEncounter typeEncounter) {
- typeEncounter.register(new InjectionListener() {
-
- @Override
- public void afterInjection(I injectee) {
- eventBus.register(injectee);
- }
- });
- }
- });
- }
-
- private TypeLiteral> getOptionalContextTypeLiteral() {
- return new TypeLiteral>() {
- };
- }
-
- };
- Injector injector = Guice.createInjector(freenetModule, soneModule);
+ Injector injector = createInjector();
core = injector.getInstance(Core.class);
/* create web of trust connector. */
@@ -294,11 +200,35 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
/* create the web interface. */
webInterface = injector.getInstance(WebInterface.class);
+ /* we need to request this to install all notification handlers. */
+ injector.getInstance(NotificationHandler.class);
+
/* start core! */
core.start();
+
+ /* start the web interface! */
webInterface.start();
- webInterface.setFirstStart(firstStart);
- webInterface.setNewConfig(newConfig);
+ webInterface.setNewConfig(injector.getInstance(Key.get(Boolean.class, Names.named("NewConfig"))));
+
+ /* first start? */
+ if (injector.getInstance(Key.get(Boolean.class, Names.named("FirstStart")))) {
+ injector.getInstance(EventBus.class).post(new FirstStart());
+ }
+ }
+
+ @VisibleForTesting
+ protected Injector createInjector() {
+ FreenetModule freenetModule = new FreenetModule(pluginRespirator);
+ AbstractModule soneModule = new SoneModule(this, new EventBus());
+ Module webInterfaceModule = new WebInterfaceModule();
+ Module notificationHandlerModule = new NotificationHandlerModule();
+
+ return createInjector(freenetModule, soneModule, webInterfaceModule, notificationHandlerModule);
+ }
+
+ @VisibleForTesting
+ protected Injector createInjector(Module... modules) {
+ return injectorCreator.invoke(modules);
}
/**
@@ -405,7 +335,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
*/
@Override
public String getVersion() {
- return VERSION.toString();
+ return getPluginVersion();
}
}