import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
-import java.net.MalformedURLException;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.HashSet;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Sone.SoneStatus;
-import net.pterodactylus.sone.freenet.wot.OwnIdentity;
import net.pterodactylus.sone.main.SonePlugin;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.service.AbstractService;
private final FreenetInterface freenetInterface;
private final SoneModificationDetector soneModificationDetector;
+ private final SoneUriCreator soneUriCreator;
private final long delay;
private final String soneId;
private final Histogram soneInsertDurationHistogram;
* @param soneId
* The ID of the Sone to insert
*/
- public SoneInserter(final Core core, EventBus eventBus, FreenetInterface freenetInterface, MetricRegistry metricRegistry, final String soneId) {
- this(core, eventBus, freenetInterface, metricRegistry, soneId, new SoneModificationDetector(new LockableFingerprintProvider() {
+ public SoneInserter(final Core core, EventBus eventBus, FreenetInterface freenetInterface, MetricRegistry metricRegistry, SoneUriCreator soneUriCreator, final String soneId) {
+ this(core, eventBus, freenetInterface, metricRegistry, soneUriCreator, soneId, new SoneModificationDetector(new LockableFingerprintProvider() {
@Override
public boolean isLocked() {
Sone sone = core.getSone(soneId);
}
@VisibleForTesting
- SoneInserter(Core core, EventBus eventBus, FreenetInterface freenetInterface, MetricRegistry metricRegistry, String soneId, SoneModificationDetector soneModificationDetector, long delay) {
+ SoneInserter(Core core, EventBus eventBus, FreenetInterface freenetInterface, MetricRegistry metricRegistry, SoneUriCreator soneUriCreator, String soneId, SoneModificationDetector soneModificationDetector, long delay) {
super("Sone Inserter for “" + soneId + "”", false);
this.core = core;
this.eventBus = eventBus;
this.freenetInterface = freenetInterface;
this.soneInsertDurationHistogram = metricRegistry.histogram("sone.insert.duration", () -> new Histogram(new ExponentiallyDecayingReservoir(3000, 0)));
this.soneInsertErrorMeter = metricRegistry.meter("sone.insert.errors");
+ this.soneUriCreator = soneUriCreator;
this.soneId = soneId;
this.soneModificationDetector = soneModificationDetector;
this.delay = delay;
long insertTime = currentTimeMillis();
eventBus.post(new SoneInsertingEvent(sone));
Stopwatch stopwatch = Stopwatch.createStarted();
- FreenetURI finalUri = freenetInterface.insertDirectory(getSoneInsertUri(sone), insertInformation.generateManifestEntries(), "index.html");
+ FreenetURI finalUri = freenetInterface.insertDirectory(soneUriCreator.getInsertUri(sone), insertInformation.generateManifestEntries(), "index.html");
stopwatch.stop();
soneInsertDurationHistogram.update(stopwatch.elapsed(MICROSECONDS));
eventBus.post(new SoneInsertedEvent(sone, stopwatch.elapsed(MILLISECONDS), insertInformation.getFingerprint()));
setInsertionDelay(insertionDelayChangedEvent.getInsertionDelay());
}
- private FreenetURI getSoneInsertUri(Sone sone) throws MalformedURLException {
- return new FreenetURI(((OwnIdentity) sone.getIdentity()).getInsertUri())
- .setKeyType("USK")
- .setDocName("Sone")
- .setMetaString(new String[0])
- .setSuggestedEdition(sone.getLatestEdition());
- }
-
/**
* Container for information that are required to insert a Sone. This
* container merely exists to copy all relevant data without holding a lock