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

diff --git a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
index a3fe9be..a95cf78 100644
--- a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
@@ -1,20 +1,31 @@
 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 net.pterodactylus.sone.core.SoneUriCreator
 import net.pterodactylus.sone.database.*
 import net.pterodactylus.sone.database.memory.*
+import net.pterodactylus.sone.freenet.*
 import net.pterodactylus.sone.freenet.wot.*
+import net.pterodactylus.sone.web.FreenetSessionProvider
+import net.pterodactylus.sone.web.SessionProvider
 import net.pterodactylus.util.config.*
 import net.pterodactylus.util.config.ConfigurationException
+import net.pterodactylus.util.logging.*
 import net.pterodactylus.util.version.Version
 import java.io.*
+import java.util.concurrent.*
+import java.util.concurrent.Executors.*
+import java.util.logging.*
+import javax.inject.*
+import javax.inject.Singleton
 
-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 +46,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,20 +54,37 @@ 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(Translation::class.java).toInstance(BaseL10nTranslation(sonePlugin.l10n().base))
 		loaders?.let { bind(Loaders::class.java).toInstance(it) }
+		bind(MetricRegistry::class.java).`in`(Singleton::class.java)
+		bind(WebOfTrustConnector::class.java).to(PluginWebOfTrustConnector::class.java).`in`(Singleton::class.java)
+		bind(TickerShutdown::class.java).`in`(Singleton::class.java)
+		bind(SoneUriCreator::class.java).`in`(Singleton::class.java)
+		bind(SessionProvider::class.java).to(FreenetSessionProvider::class.java).`in`(Singleton::class.java)
 
 		bindListener(Matchers.any(), object : TypeListener {
 			override fun <I> hear(typeLiteral: TypeLiteral<I>, typeEncounter: TypeEncounter<I>) {
-				typeEncounter.register(InjectionListener { injectee -> eventBus.register(injectee) })
+				typeEncounter.register(InjectionListener { injectee ->
+					logger.fine { "Injecting $injectee..." }
+					eventBus.register(injectee)
+				})
 			}
 		})
 	}
 
+	@Provides
+	@Singleton
+	@Named("notification")
+	fun getNotificationTicker(): ScheduledExecutorService =
+			newSingleThreadScheduledExecutor()
+
+	private val logger: Logger = Logging.getLogger(javaClass)
+
 }
 
 private fun String.parseVersion(): Version = Version.parse(this)