Add Sone import.

diff --git a/src/main/java/net/pterodactylus/sone/web/ImportSonePage.java b/src/main/java/net/pterodactylus/sone/web/ImportSonePage.java
new file mode 100644 (file)
index 0000000..05bf045
--- /dev/null
+++ b/src/main/java/net/pterodactylus/sone/web/ImportSonePage.java
@@ -0,0 +1,83 @@
+/*
+ * Sone - ImportSonePage.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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.pterodactylus.sone.web;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.web.page.Page.Request.Method;
+import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.template.Template;
+import freenet.support.api.Bucket;
+import freenet.support.io.Closer;
+
+/**
+ * The “import Sone” page lets the user import a Sone from a previous backup.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class ImportSonePage extends SoneTemplatePage {
+
+       /** The logger. */
+       private static final Logger logger = Logging.getLogger(ImportSonePage.class);
+
+       /**
+        * Creates a new “import Sone” page.
+        *
+        * @param template
+        *            The template to render
+        * @param webInterface
+        *            The Sone web interface
+        */
+       public ImportSonePage(Template template, WebInterface webInterface) {
+               super("importSone.html", template, "Page.ImportSone.Title", webInterface);
+       }
+
+       //
+       // TEMPLATEPAGE METHODS
+       //
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected void processTemplate(net.pterodactylus.sone.web.page.Page.Request request, Template template) throws RedirectException {
+               template.set("errorParsingSone", false);
+               if (request.getMethod() == Method.POST) {
+                       Bucket soneBucket = request.getHttpRequest().getPart("sone-file");
+                       InputStream soneInputStream = null;
+                       try {
+                               soneInputStream = soneBucket.getInputStream();
+                               Sone sone = webInterface.core().loadSone(soneInputStream);
+                               if (sone != null) {
+                                       throw new RedirectException("viewSone.html?sone=" + sone.getId());
+                               }
+                       } catch (IOException ioe1) {
+                               logger.log(Level.INFO, "Could not load sone from posted XML file.", ioe1);
+                       } finally {
+                               Closer.close(soneInputStream);
+                               soneBucket.free();
+                       }
+                       template.set("errorParsingSone", true);
+               }
+       }
+
+}

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 96959da..2339fb3 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -197,6 +197,7 @@ public class WebInterface extends AbstractService {
                Template loadSoneTemplate = templateFactory.createTemplate(createReader("/templates/loadSone.html"));
                Template knownSonesTemplate = templateFactory.createTemplate(createReader("/templates/knownSones.html"));
                Template createSoneTemplate = templateFactory.createTemplate(createReader("/templates/createSone.html"));
+               Template importSoneTemplate = templateFactory.createTemplate(createReader("/templates/importSone.html"));
                Template createPostTemplate = templateFactory.createTemplate(createReader("/templates/createPost.html"));
                Template createReplyTemplate = templateFactory.createTemplate(createReader("/templates/createReply.html"));
                Template editProfileTemplate = templateFactory.createTemplate(createReader("/templates/editProfile.html"));
@@ -220,6 +221,7 @@ public class WebInterface extends AbstractService {
                PageToadletFactory pageToadletFactory = new PageToadletFactory(sonePlugin.pluginRespirator().getHLSimpleClient(), "/Sone/");
                pageToadlets.add(pageToadletFactory.createPageToadlet(new IndexPage(indexTemplate, this), "Index"));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateSonePage(createSoneTemplate, this), "CreateSone"));
+               pageToadlets.add(pageToadletFactory.createPageToadlet(new ImportSonePage(importSoneTemplate, this), "ImportSone"));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new LoadSonePage(loadSoneTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new AddSonePage(addSoneTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new KnownSonesPage(knownSonesTemplate, this), "KnownSones"));

diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index 507d67c..7d9d401 100644 (file)
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -6,6 +6,8 @@ Navigation.Menu.Item.Index.Name=Your Sone
 Navigation.Menu.Item.Index.Tooltip=Show your Sone
 Navigation.Menu.Item.CreateSone.Name=Create Sone
 Navigation.Menu.Item.CreateSone.Tooltip=Create a new Sone
+Navigation.Menu.Item.ImportSone.Name=Import Sone
+Navigation.Menu.Item.ImportSone.Tooltip=Import a Sone from a backup
 Navigation.Menu.Item.KnownSones.Name=Known Sones
 Navigation.Menu.Item.KnownSones.Tooltip=Shows all known Sones
 Navigation.Menu.Item.EditProfile.Name=Edit Profile
@@ -50,6 +52,10 @@ Page.Login.CreateSone.Label.DocumentName=Name in key:
 Page.Login.CreateSone.Button.CreateFromURI=Create at given URI
 Page.Login.CreateSone.Button.CreateRandom=Create new Sone
 
+Page.ImportSone.Title=Import Sone - Sone
+Page.ImportSone.Page.Title=Import Sone
+Page.ImportSone.Button.Import=Import
+
 Page.CreateSone.Title=Create Sone - Sone
 
 Page.DeleteSone.Title=Delete Sone - Sone

diff --git a/src/main/resources/templates/importSone.html b/src/main/resources/templates/importSone.html
new file mode 100644 (file)
index 0000000..78ca8e1
--- /dev/null
+++ b/src/main/resources/templates/importSone.html
@@ -0,0 +1,5 @@
+<%include include/head.html>
+
+       <%include include/importSone.html>
+
+<%include include/tail.html>

diff --git a/src/main/resources/templates/include/importSone.html b/src/main/resources/templates/include/importSone.html
new file mode 100644 (file)
index 0000000..910afc3
--- /dev/null
+++ b/src/main/resources/templates/include/importSone.html
@@ -0,0 +1,10 @@
+<h1><%= Page.ImportSone.Page.Title|l10n|html></h1>
+
+<form id="import-sone" action="importSone.html" method="post" enctype="mulitpart/form-data">
+       <input type="hidden" name="formPassword" value="<% formPassword|html>" />
+
+       <input type="file" name="sone-file" />
+
+       <button type="submit"><%= Page.ImportSone.Button.Import|l10n|html></button>
+
+</form>