X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=393697585c8b73d62023f5296978c1f3413abe46;hb=25ca7aaaa3b481e1d22d907427d53c83387b1a55;hp=c31be8a001dc8d02a23079066e39766966f646a2;hpb=977406b376374680eb2dae63dc17d8aea1a780dd;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java index c31be8a..3936975 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java @@ -1,5 +1,5 @@ /* - * FreenetSone - SoneInserter.java - Copyright © 2010 David Roden + * Sone - SoneInserter.java - Copyright © 2010 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 @@ -160,7 +160,7 @@ public class SoneInserter extends AbstractService { protected void serviceRun() { long lastModificationTime = 0; String lastFingerprint = ""; - while (!shouldStop()) { + while (!shouldStop()) { try { /* check every seconds. */ sleep(1000); @@ -204,7 +204,7 @@ public class SoneInserter extends AbstractService { core.setSoneStatus(sone, SoneStatus.inserting); long insertTime = System.currentTimeMillis(); insertInformation.setTime(insertTime); - FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri().setKeyType("USK").setSuggestedEdition(0), insertInformation.generateManifestEntries(), "index.html"); + FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri(), insertInformation.generateManifestEntries(), "index.html"); /* at this point we might already be stopped. */ if (shouldStop()) { /* if so, bail out, don’t change anything. */ @@ -212,6 +212,7 @@ public class SoneInserter extends AbstractService { } sone.setTime(insertTime); sone.setLatestEdition(finalUri.getEdition()); + core.saveSone(sone); success = true; logger.log(Level.INFO, "Inserted Sone “%s” at %s.", new Object[] { sone.getName(), finalUri }); } catch (SoneException se1) { @@ -235,7 +236,9 @@ public class SoneInserter extends AbstractService { } } } - } + } catch (Throwable t1) { + logger.log(Level.SEVERE, "SoneInserter threw an Exception!", t1); + }} } /** @@ -245,7 +248,7 @@ public class SoneInserter extends AbstractService { * * @author David ‘Bombe’ Roden */ - private class InsertInformation { + private static class InsertInformation { /** All properties of the Sone, copied for thread safety. */ private final Map soneProperties = new HashMap();