X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=ceb336be0c44805e1e13f9a92d5c993089867be5;hb=b4d2d68b5ea4f4edc7337f380cfe078756678126;hp=17340b8dde6312ad9fbaf159bdd644fc4ae65fe0;hpb=32998f6979928e57b9b7a4eac4dabe668a821471;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 17340b8..ceb336b 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â2013 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
@@ -26,12 +26,19 @@ import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
+import javax.inject.Singleton;
+
import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.database.Database;
+import net.pterodactylus.sone.database.PostProvider;
+import net.pterodactylus.sone.database.SoneProvider;
+import net.pterodactylus.sone.database.memory.MemoryDatabase;
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.sone.web.WebInterfaceModule;
import net.pterodactylus.util.config.Configuration;
import net.pterodactylus.util.config.ConfigurationException;
import net.pterodactylus.util.config.MapConfigurationBackend;
@@ -45,7 +52,7 @@ 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.Singleton;
+import com.google.inject.Module;
import com.google.inject.TypeLiteral;
import com.google.inject.matcher.Matchers;
import com.google.inject.spi.InjectionListener;
@@ -53,9 +60,9 @@ import com.google.inject.spi.TypeEncounter;
import com.google.inject.spi.TypeListener;
import freenet.client.async.PersistenceDisabledException;
+import freenet.l10n.BaseL10n;
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;
@@ -70,14 +77,13 @@ import freenet.support.api.Bucket;
/**
* 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 {
+ private static final Logger soneLogger = getLogger("net.pterodactylus.sone");
+
static {
/* initialize logging. */
- Logger soneLogger = getLogger("net.pterodactylus.sone");
soneLogger.setUseParentHandlers(false);
soneLogger.addHandler(new Handler() {
private final LoadingCache> classCache = CacheBuilder.newBuilder()
@@ -87,7 +93,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
return Class.forName(key);
}
});
-
+
@Override
public void publish(LogRecord logRecord) {
int recordLevel = logRecord.getLevel().intValue();
@@ -115,13 +121,10 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
});
}
- /** The version. */
- public static final Version VERSION = new Version(0, 9, 2);
-
/** The current year at time of release. */
- private static final int YEAR = 2015;
+ 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 = 69;
+ private static final int LATEST_EDITION = 79;
/** The logger. */
private static final Logger logger = getLogger(SonePlugin.class.getName());
@@ -175,14 +178,23 @@ 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;
}
+ public static long getLatestEdition() {
+ return LATEST_EDITION;
+ }
+
//
// FREDPLUGIN METHODS
//
@@ -230,15 +242,8 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
final EventBus eventBus = new EventBus();
/* Freenet injector configuration. */
- AbstractModule freenetModule = new AbstractModule() {
+ FreenetModule freenetModule = new FreenetModule(pluginRespirator);
- @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() {
@@ -250,6 +255,20 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
bind(Context.class).toInstance(context);
bind(getOptionalContextTypeLiteral()).toInstance(of(context));
bind(SonePlugin.class).toInstance(SonePlugin.this);
+ bind(Version.class).toInstance(Version.parse(getVersion().substring(1)));
+ bind(PluginVersion.class).toInstance(new PluginVersion(getVersion()));
+ bind(PluginYear.class).toInstance(new PluginYear(getYear()));
+ bind(PluginHomepage.class).toInstance(new PluginHomepage(getHomepage()));
+ bind(Database.class).to(MemoryDatabase.class).in(Singleton.class);
+ bind(BaseL10n.class).toInstance(l10n.getBase());
+ bind(SoneProvider.class).to(Core.class).in(Singleton.class);
+ bind(PostProvider.class).to(Core.class).in(Singleton.class);
+ 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
@@ -271,7 +290,8 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
}
};
- Injector injector = Guice.createInjector(freenetModule, soneModule);
+ Module webInterfaceModule = new WebInterfaceModule();
+ Injector injector = Guice.createInjector(freenetModule, soneModule, webInterfaceModule);
core = injector.getInstance(Core.class);
/* create web of trust connector. */
@@ -306,6 +326,14 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
webOfTrustConnector.stop();
} catch (Throwable t1) {
logger.log(Level.SEVERE, "Error while shutting down!", t1);
+ } finally {
+ deregisterLoggerHandlers();
+ }
+ }
+
+ private void deregisterLoggerHandlers() {
+ for (Handler handler : soneLogger.getHandlers()) {
+ soneLogger.removeHandler(handler);
}
}
@@ -386,7 +414,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
*/
@Override
public String getVersion() {
- return VERSION.toString();
+ return getPluginVersion();
}
}