X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSoneModule.kt;h=8f018f5390af5a402cef2a925e19b971980570a1;hb=a8050b466202bb6ddec8430129f728749cdfec1a;hp=a3fe9be9abd52c4dc65e41bbf7b9caa6a0e9f331;hpb=04709e23f38e9d447337682ba27201da5dc19bd9;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
index a3fe9be..8f018f5 100644
--- a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
@@ -1,11 +1,14 @@
 package net.pterodactylus.sone.main
 
+import com.codahale.metrics.*
 import com.google.common.base.*
 import com.google.common.eventbus.*
 import com.google.inject.*
 import com.google.inject.matcher.*
 import com.google.inject.name.Names.*
 import com.google.inject.spi.*
+import freenet.l10n.*
+import net.pterodactylus.sone.core.*
 import net.pterodactylus.sone.database.*
 import net.pterodactylus.sone.database.memory.*
 import net.pterodactylus.sone.freenet.wot.*
@@ -14,7 +17,7 @@ import net.pterodactylus.util.config.ConfigurationException
 import net.pterodactylus.util.version.Version
 import java.io.*
 
-class SoneModule(private val sonePlugin: SonePlugin) : AbstractModule() {
+open class SoneModule(private val sonePlugin: SonePlugin, private val eventBus: EventBus) : AbstractModule() {
 
 	override fun configure() {
 		val sonePropertiesFile = File("sone.properties")
@@ -35,7 +38,6 @@ class SoneModule(private val sonePlugin: SonePlugin) : AbstractModule() {
 							.getValue(null)
 							?.let { DebugLoaders(it) }
 				}
-		val eventBus = EventBus()
 
 		bind(Configuration::class.java).toInstance(configuration)
 		bind(EventBus::class.java).toInstance(eventBus)
@@ -44,12 +46,14 @@ class SoneModule(private val sonePlugin: SonePlugin) : AbstractModule() {
 		bind(Context::class.java).toInstance(context)
 		bind(object : TypeLiteral<Optional<Context>>() {}).toInstance(Optional.of(context))
 		bind(SonePlugin::class.java).toInstance(sonePlugin)
-		bind(Version::class.java).toInstance(sonePlugin.version.parseVersion())
+		bind(Version::class.java).toInstance(sonePlugin.version.drop(1).parseVersion())
 		bind(PluginVersion::class.java).toInstance(PluginVersion(sonePlugin.version))
 		bind(PluginYear::class.java).toInstance(PluginYear(sonePlugin.year))
 		bind(PluginHomepage::class.java).toInstance(PluginHomepage(sonePlugin.homepage))
 		bind(Database::class.java).to(MemoryDatabase::class.java).`in`(Singleton::class.java)
+		bind(BaseL10n::class.java).toInstance(sonePlugin.l10n().base)
 		loaders?.let { bind(Loaders::class.java).toInstance(it) }
+		bind(MetricRegistry::class.java).`in`(Singleton::class.java)
 
 		bindListener(Matchers.any(), object : TypeListener {
 			override fun <I> hear(typeLiteral: TypeLiteral<I>, typeEncounter: TypeEncounter<I>) {
@@ -58,6 +62,13 @@ class SoneModule(private val sonePlugin: SonePlugin) : AbstractModule() {
 		})
 	}
 
+	@Provides
+	@Singleton
+	fun getCore(configuration: Configuration, freenetInterface: FreenetInterface, identityManager: IdentityManager, soneDownloader: SoneDownloader, imageInserter: ImageInserter, updateChecker: UpdateChecker, webOfTrustUpdater: WebOfTrustUpdater, eventBus: EventBus, database: Database) =
+			Core(configuration, freenetInterface, identityManager, soneDownloader, imageInserter, updateChecker, webOfTrustUpdater, eventBus, database).apply {
+				debugInformation.showVersionInformation = configuration.getBooleanValue("Debug/ShowVersionInformation").getValue(false)
+			}.also(eventBus::register)
+
 }
 
 private fun String.parseVersion(): Version = Version.parse(this)