X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=439c73226015d7b43ae5c38cf969c4317da781d8;hb=baf3fd619b3f87c95111e522fb5cfc043a5d2881;hp=ad7e51001ff3a776e01bac95e84fdd9613d56c03;hpb=ac137128a3ac11736882d7bb2a9ea2bcb12576f0;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index ad7e510..439c732 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -24,28 +24,51 @@ import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.freenet.L10nFilter;
+import net.pterodactylus.sone.freenet.wot.Identity;
import net.pterodactylus.sone.main.SonePlugin;
+import net.pterodactylus.sone.template.CollectionAccessor;
+import net.pterodactylus.sone.template.GetPagePlugin;
+import net.pterodactylus.sone.template.IdentityAccessor;
+import net.pterodactylus.sone.template.PostAccessor;
+import net.pterodactylus.sone.template.ReplyAccessor;
+import net.pterodactylus.sone.template.RequestChangeFilter;
import net.pterodactylus.sone.template.SoneAccessor;
+import net.pterodactylus.sone.template.SubstringFilter;
+import net.pterodactylus.sone.web.ajax.DeletePostAjaxPage;
+import net.pterodactylus.sone.web.ajax.DeleteReplyAjaxPage;
+import net.pterodactylus.sone.web.ajax.FollowSoneAjaxPage;
+import net.pterodactylus.sone.web.ajax.GetLikesAjaxPage;
+import net.pterodactylus.sone.web.ajax.GetSoneStatusPage;
+import net.pterodactylus.sone.web.ajax.GetTranslationPage;
+import net.pterodactylus.sone.web.ajax.LikeAjaxPage;
+import net.pterodactylus.sone.web.ajax.UnfollowSoneAjaxPage;
+import net.pterodactylus.sone.web.ajax.UnlikeAjaxPage;
import net.pterodactylus.sone.web.page.PageToadlet;
import net.pterodactylus.sone.web.page.PageToadletFactory;
import net.pterodactylus.sone.web.page.StaticPage;
import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.service.AbstractService;
import net.pterodactylus.util.template.DateFilter;
import net.pterodactylus.util.template.DefaultTemplateFactory;
+import net.pterodactylus.util.template.MatchFilter;
+import net.pterodactylus.util.template.PaginationPlugin;
import net.pterodactylus.util.template.ReflectionAccessor;
import net.pterodactylus.util.template.Template;
-import freenet.clients.http.LinkEnabledCallback;
+import net.pterodactylus.util.template.TemplateException;
+import net.pterodactylus.util.template.TemplateFactory;
+import net.pterodactylus.util.template.TemplateProvider;
+import net.pterodactylus.util.template.XmlFilter;
import freenet.clients.http.SessionManager;
import freenet.clients.http.ToadletContainer;
-import freenet.clients.http.ToadletContext;
import freenet.l10n.BaseL10n;
/**
@@ -54,7 +77,7 @@ import freenet.l10n.BaseL10n;
*
* @author David âBombeâ Roden
*/
-public class WebInterface extends AbstractService {
+public class WebInterface {
/** The logger. */
private static final Logger logger = Logging.getLogger(WebInterface.class);
@@ -65,6 +88,9 @@ public class WebInterface extends AbstractService {
/** The registered toadlets. */
private final List pageToadlets = new ArrayList();
+ /** The form password. */
+ private final String formPassword;
+
/**
* Creates a new web interface.
*
@@ -72,8 +98,8 @@ public class WebInterface extends AbstractService {
* The Sone plugin
*/
public WebInterface(SonePlugin sonePlugin) {
- super("Sone Web Interface");
this.sonePlugin = sonePlugin;
+ formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
}
//
@@ -112,23 +138,30 @@ public class WebInterface extends AbstractService {
}
}
+ /**
+ * Returns the nodeâs form password.
+ *
+ * @return The form password
+ */
+ public String formPassword() {
+ return formPassword;
+ }
+
//
- // SERVICE METHODS
+ // ACTIONS
//
/**
- * {@inheritDoc}
+ * Starts the web interface and registers all toadlets.
*/
- @Override
- protected void serviceStart() {
+ public void start() {
registerToadlets();
}
/**
- * {@inheritDoc}
+ * Stops the web interface and unregisters all toadlets.
*/
- @Override
- protected void serviceStop() {
+ public void stop() {
unregisterToadlets();
}
@@ -142,50 +175,82 @@ public class WebInterface extends AbstractService {
private void registerToadlets() {
DefaultTemplateFactory templateFactory = new DefaultTemplateFactory();
templateFactory.addAccessor(Object.class, new ReflectionAccessor());
- templateFactory.addAccessor(Sone.class, new SoneAccessor());
+ templateFactory.addAccessor(Collection.class, new CollectionAccessor());
+ templateFactory.addAccessor(Sone.class, new SoneAccessor(core()));
+ templateFactory.addAccessor(Post.class, new PostAccessor(core()));
+ templateFactory.addAccessor(Reply.class, new ReplyAccessor(core()));
+ templateFactory.addAccessor(Identity.class, new IdentityAccessor(core()));
templateFactory.addFilter("date", new DateFilter());
templateFactory.addFilter("l10n", new L10nFilter(l10n()));
-
- String formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
+ templateFactory.addFilter("substring", new SubstringFilter());
+ templateFactory.addFilter("xml", new XmlFilter());
+ templateFactory.addFilter("change", new RequestChangeFilter());
+ templateFactory.addFilter("match", new MatchFilter());
+ templateFactory.addPlugin("getpage", new GetPagePlugin());
+ templateFactory.addPlugin("paginate", new PaginationPlugin());
+ templateFactory.setTemplateProvider(new ClassPathTemplateProvider(templateFactory));
+ templateFactory.addTemplateObject("formPassword", formPassword);
Template loginTemplate = templateFactory.createTemplate(createReader("/templates/login.html"));
- loginTemplate.set("formPassword", formPassword);
-
Template indexTemplate = templateFactory.createTemplate(createReader("/templates/index.html"));
- indexTemplate.set("formPassword", formPassword);
-
+ Template knownSonesTemplate = templateFactory.createTemplate(createReader("/templates/knownSones.html"));
Template createSoneTemplate = templateFactory.createTemplate(createReader("/templates/createSone.html"));
- createSoneTemplate.set("formPassword", formPassword);
-
Template createPostTemplate = templateFactory.createTemplate(createReader("/templates/createPost.html"));
- createPostTemplate.set("formPassword", formPassword);
-
+ Template createReplyTemplate = templateFactory.createTemplate(createReader("/templates/createReply.html"));
Template editProfileTemplate = templateFactory.createTemplate(createReader("/templates/editProfile.html"));
- editProfileTemplate.set("formPassword", formPassword);
-
+ Template backupProfileTemplate = templateFactory.createTemplate(createReader("/templates/backup.xml"));
Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html"));
- viewSoneTemplate.set("formPassword", formPassword);
-
+ Template viewPostTemplate = templateFactory.createTemplate(createReader("/templates/viewPost.html"));
+ Template likePostTemplate = templateFactory.createTemplate(createReader("/templates/like.html"));
+ Template unlikePostTemplate = templateFactory.createTemplate(createReader("/templates/unlike.html"));
+ Template deletePostTemplate = templateFactory.createTemplate(createReader("/templates/deletePost.html"));
+ Template deleteReplyTemplate = templateFactory.createTemplate(createReader("/templates/deleteReply.html"));
Template followSoneTemplate = templateFactory.createTemplate(createReader("/templates/followSone.html"));
- followSoneTemplate.set("formPassword", formPassword);
-
+ Template unfollowSoneTemplate = templateFactory.createTemplate(createReader("/templates/unfollowSone.html"));
Template deleteSoneTemplate = templateFactory.createTemplate(createReader("/templates/deleteSone.html"));
- deleteSoneTemplate.set("formPassword", formPassword);
-
+ Template noPermissionTemplate = templateFactory.createTemplate(createReader("/templates/noPermission.html"));
+ Template wotPluginMissingTemplate = templateFactory.createTemplate(createReader("/templates/wotPluginMissing.html"));
Template logoutTemplate = templateFactory.createTemplate(createReader("/templates/logout.html"));
+ Template optionsTemplate = templateFactory.createTemplate(createReader("/templates/options.html"));
+ Template aboutTemplate = templateFactory.createTemplate(createReader("/templates/about.html"));
+ Template helpTemplate = templateFactory.createTemplate(createReader("/templates/help.html"));
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 KnownSonesPage(knownSonesTemplate, this), "KnownSones"));
pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfilePage(editProfileTemplate, this), "EditProfile"));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new BackupProfilePage(backupProfileTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new CreatePostPage(createPostTemplate, this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateReplyPage(createReplyTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewSonePage(viewSoneTemplate, this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewPostPage(viewPostTemplate, this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new LikePage(likePostTemplate, this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlikePage(unlikePostTemplate, this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new DeletePostPage(deletePostTemplate, this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteReplyPage(deleteReplyTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new FollowSonePage(followSoneTemplate, this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new UnfollowSonePage(unfollowSoneTemplate, this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteSonePage(deleteSoneTemplate, this), "DeleteSone"));
pageToadlets.add(pageToadletFactory.createPageToadlet(new LoginPage(loginTemplate, this), "Login"));
pageToadlets.add(pageToadletFactory.createPageToadlet(new LogoutPage(logoutTemplate, this), "Logout"));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new OptionsPage(optionsTemplate, this), "Options"));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new AboutPage(aboutTemplate, this, SonePlugin.VERSION), "About"));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("help.html", helpTemplate, "Page.Help.Title", this), "Help"));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("noPermission.html", noPermissionTemplate, "Page.NoPermission.Title", this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("wotPluginMissing.html", wotPluginMissingTemplate, "Page.WotPluginMissing.Title", this)));
pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("css/", "/static/css/", "text/css")));
pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("javascript/", "/static/javascript/", "text/javascript")));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("images/", "/static/images/", "image/png")));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new GetTranslationPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new GetSoneStatusPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new DeletePostAjaxPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteReplyAjaxPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new FollowSoneAjaxPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new UnfollowSoneAjaxPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new LikeAjaxPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new UnlikeAjaxPage(this)));
+ pageToadlets.add(pageToadletFactory.createPageToadlet(new GetLikesAjaxPage(this)));
ToadletContainer toadletContainer = sonePlugin.pluginRespirator().getToadletContainer();
toadletContainer.getPageMaker().addNavigationCategory("/Sone/index.html", "Navigation.Menu.Name", "Navigation.Menu.Tooltip", sonePlugin);
@@ -227,21 +292,46 @@ public class WebInterface extends AbstractService {
}
/**
- * {@link LinkEnabledCallback} implementation that always returns
- * {@code true} when {@link LinkEnabledCallback#isEnabled(ToadletContext)}
- * is called.
+ * Template provider implementation that uses
+ * {@link WebInterface#createReader(String)} to load templates for
+ * inclusion.
*
* @author David âBombeâ Roden
*/
- public class AlwaysEnabledCallback implements LinkEnabledCallback {
+ private class ClassPathTemplateProvider implements TemplateProvider {
+
+ /** The template factory. */
+ private final TemplateFactory templateFactory;
+
+ /**
+ * Creates a new template provider that locates templates on the
+ * classpath.
+ *
+ * @param templateFactory
+ * The template factory to create the templates
+ */
+ public ClassPathTemplateProvider(TemplateFactory templateFactory) {
+ this.templateFactory = templateFactory;
+ }
/**
* {@inheritDoc}
*/
@Override
- public boolean isEnabled(ToadletContext toadletContext) {
- return true;
+ @SuppressWarnings("synthetic-access")
+ public Template getTemplate(String templateName) {
+ Reader templateReader = createReader("/templates/" + templateName);
+ if (templateReader == null) {
+ return null;
+ }
+ Template template = templateFactory.createTemplate(templateReader);
+ try {
+ template.parse();
+ } catch (TemplateException te1) {
+ logger.log(Level.WARNING, "Could not parse template â" + templateName + "â for inclusion!", te1);
+ }
+ return template;
}
- }
+ }
}