X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityLoader.kt;h=f6e1d5905af71b8fe44656ea94921a1a608fab1d;hp=b40484e0188d6b2beeec99d18da06e4c39ca95a2;hb=HEAD;hpb=fe5a065f7f84ab92937b5cb5a7978dec16677e09

diff --git a/src/main/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoader.kt b/src/main/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoader.kt
index b40484e..f6e1d59 100644
--- a/src/main/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoader.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoader.kt
@@ -1,5 +1,5 @@
 /*
- * Sone - IdentityLoader.java - Copyright © 2013–2019 David Roden
+ * Sone - IdentityLoader.kt - Copyright © 2013–2020 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
@@ -31,27 +31,53 @@ class IdentityLoader @Inject constructor(private val webOfTrustConnector: WebOfT
 	private val logger: Logger = Logger.getLogger(IdentityLoader::class.java.name)
 
 	@Throws(WebOfTrustException::class)
-	fun loadIdentities(): Map<OwnIdentity, Collection<Identity>> =
+	fun loadTrustedIdentities() =
 			time({ stopwatch, identities -> "Loaded ${identities.size} own identities in ${stopwatch.elapsed(MILLISECONDS) / 1000.0}s." }) {
 				webOfTrustConnector.loadAllOwnIdentities()
 			}.let(this::loadTrustedIdentitiesForOwnIdentities)
 
+	fun loadAllIdentities() =
+			time({ stopwatch, identities -> "Loaded ${identities.size} own identities in ${stopwatch.elapsed(MILLISECONDS) / 1000.0}s." }) {
+				webOfTrustConnector.loadAllOwnIdentities()
+			}.let(this::loadAllIdentitiesForOwnIdentities)
+
 	@Throws(PluginException::class)
 	private fun loadTrustedIdentitiesForOwnIdentities(ownIdentities: Collection<OwnIdentity>) =
-			ownIdentities.associateWith { ownIdentity ->
-				if (ownIdentity.doesNotHaveCorrectContext()) {
-					emptySet<Identity>()
-				} else {
-					time({ stopwatch, identities -> "Loaded ${identities.size} identities for ${ownIdentity.nickname} in ${stopwatch.elapsed(MILLISECONDS) / 1000.0}s." }) {
-						webOfTrustConnector.loadTrustedIdentities(ownIdentity, context?.context)
+			ownIdentities
+					.also { logger.fine { "Getting trusted identities for ${it.size} own identities..." } }
+					.associateWith { ownIdentity ->
+						logger.fine { "Getting trusted identities for $ownIdentity..." }
+						if (ownIdentity.doesNotHaveCorrectContext()) {
+							logger.fine { "Skipping $ownIdentity because of incorrect context." }
+							emptySet()
+						} else {
+							logger.fine { "Loading trusted identities for $ownIdentity from WoT..." }
+							time({ stopwatch, identities -> "Loaded ${identities.size} identities for ${ownIdentity.nickname} in ${stopwatch.elapsed(MILLISECONDS) / 1000.0}s." }) {
+								webOfTrustConnector.loadTrustedIdentities(ownIdentity, context?.context)
+							}
+						}
+					}
+
+	private fun loadAllIdentitiesForOwnIdentities(ownIdentities: Collection<OwnIdentity>) =
+			ownIdentities
+					.also { logger.fine { "Getting trusted identities for ${it.size} own identities..." } }
+					.associateWith { ownIdentity ->
+						logger.fine { "Getting trusted identities for $ownIdentity..." }
+						if (ownIdentity.doesNotHaveCorrectContext()) {
+							logger.fine { "Skipping $ownIdentity because of incorrect context." }
+							emptySet()
+						} else {
+							logger.fine { "Loading trusted identities for $ownIdentity from WoT..." }
+							time({ stopwatch, identities -> "Loaded ${identities.size} identities for ${ownIdentity.nickname} in ${stopwatch.elapsed(MILLISECONDS) / 1000.0}s." }) {
+								webOfTrustConnector.loadAllIdentities(ownIdentity, context?.context)
+							}
+						}
 					}
-				}
-			}
 
 	private fun OwnIdentity.doesNotHaveCorrectContext() =
 			context?.let { it.context !in contexts } ?: false
 
-	private fun <R> time(logMessage: (Stopwatch, Collection<R>) -> String, loader: () -> Collection<R>): Collection<R> =
+	private fun <R> time(logMessage: (Stopwatch, R) -> String, loader: () -> R) =
 			Stopwatch.createStarted().let { stopwatch ->
 				loader().also { logger.fine(logMessage(stopwatch, it)) }
 			}