From: David ‘Bombe’ Roden Date: Wed, 13 Oct 2010 04:30:24 +0000 (+0200) Subject: Implement a bit more of the Fred interaction stuff. X-Git-Tag: 0.1-RC1~522 X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=93ea75542313445d34da309e81384a123c361fab;p=Sone.git Implement a bit more of the Fred interaction stuff. --- diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java index 9df7b67..5bc32e8 100644 --- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java +++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java @@ -25,13 +25,18 @@ import java.util.logging.Logger; import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.core.FreenetInterface; import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend; +import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.util.config.Configuration; import net.pterodactylus.util.config.ConfigurationException; import net.pterodactylus.util.config.MapConfigurationBackend; import net.pterodactylus.util.config.XMLConfigurationBackend; import net.pterodactylus.util.logging.Logging; import freenet.client.async.DatabaseDisabledException; +import freenet.l10n.BaseL10n.LANGUAGE; +import freenet.l10n.PluginL10n; import freenet.pluginmanager.FredPlugin; +import freenet.pluginmanager.FredPluginBaseL10n; +import freenet.pluginmanager.FredPluginL10n; import freenet.pluginmanager.PluginRespirator; /** @@ -40,7 +45,7 @@ import freenet.pluginmanager.PluginRespirator; * * @author David ‘Bombe’ Roden */ -public class SonePlugin implements FredPlugin { +public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10n { static { /* initialize logging. */ @@ -50,9 +55,46 @@ public class SonePlugin implements FredPlugin { /** The logger. */ private static final Logger logger = Logging.getLogger(SonePlugin.class); + /** The plugin respirator. */ + private PluginRespirator pluginRespirator; + /** The core. */ private Core core; + /** The l10n helper. */ + private PluginL10n l10n; + + // + // ACCESSORS + // + + /** + * Returns the plugin respirator for this plugin. + * + * @return The plugin respirator + */ + public PluginRespirator pluginRespirator() { + return pluginRespirator; + } + + /** + * Returns the core started by this plugin. + * + * @return The core + */ + public Core core() { + return core; + } + + /** + * Returns the plugin’s l10n helper. + * + * @return The plugin’s l10n helper + */ + public PluginL10n l10n() { + return l10n; + } + // // FREDPLUGIN METHODS // @@ -62,6 +104,7 @@ public class SonePlugin implements FredPlugin { */ @Override public void runPlugin(PluginRespirator pluginRespirator) { + this.pluginRespirator = pluginRespirator; /* create a configuration. */ Configuration configuration; @@ -80,6 +123,9 @@ public class SonePlugin implements FredPlugin { /* create freenet interface. */ FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode(), pluginRespirator.getHLSimpleClient()); + /* create the web interface. */ + WebInterface webInterface = new WebInterface(this); + /* create core. */ core = new Core(); core.configuration(configuration); @@ -87,6 +133,7 @@ public class SonePlugin implements FredPlugin { /* start core! */ core.start(); + webInterface.start(); } /** @@ -100,4 +147,60 @@ public class SonePlugin implements FredPlugin { /* TODO wait for core to stop? */ } + // + // INTERFACE FredPluginL10n + // + + /** + * {@inheritDoc} + */ + @Override + public String getString(String key) { + return l10n.getBase().getString(key); + } + + /** + * {@inheritDoc} + */ + @Override + public void setLanguage(LANGUAGE newLanguage) { + l10n = new PluginL10n(this, newLanguage); + } + + // + // INTERFACE FredPluginBaseL10n + // + + /** + * {@inheritDoc} + */ + @Override + public String getL10nFilesBasePath() { + return "i18n"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getL10nFilesMask() { + return "sone.${lang}.properties"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getL10nOverrideFilesMask() { + return "sone.${lang}.override.properties"; + } + + /** + * {@inheritDoc} + */ + @Override + public ClassLoader getPluginClassLoader() { + return SonePlugin.class.getClassLoader(); + } + } diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java index 33e04d6..774fe7a 100644 --- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java +++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java @@ -17,7 +17,29 @@ package net.pterodactylus.sone.web; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import net.pterodactylus.sone.main.SonePlugin; +import net.pterodactylus.sone.web.page.CSSPage; +import net.pterodactylus.sone.web.page.PageToadlet; +import net.pterodactylus.sone.web.page.PageToadletFactory; +import net.pterodactylus.util.logging.Logging; +import net.pterodactylus.util.service.AbstractService; +import net.pterodactylus.util.template.Template; +import net.pterodactylus.util.template.TemplateFactory; +import freenet.clients.http.LinkEnabledCallback; import freenet.clients.http.SessionManager; +import freenet.clients.http.ToadletContainer; +import freenet.clients.http.ToadletContext; import freenet.l10n.BaseL10n; /** @@ -26,25 +48,25 @@ import freenet.l10n.BaseL10n; * * @author David ‘Bombe’ Roden */ -public class WebInterface { +public class WebInterface extends AbstractService { + + /** The logger. */ + private static final Logger logger = Logging.getLogger(WebInterface.class); - /** The node’s l10n helper. */ - private final BaseL10n l10n; + /** The Sone plugin. */ + private final SonePlugin sonePlugin; - /** The node’s session manager. */ - private final SessionManager sessionManager; + /** The registered toadlets. */ + private final List pageToadlets = new ArrayList(); /** * Creates a new web interface. * - * @param l10n - * The node’s l10n helper - * @param sessionManager - * The node’s session manager + * @param sonePlugin + * The Sone plugin */ - public WebInterface(BaseL10n l10n, SessionManager sessionManager) { - this.l10n = l10n; - this.sessionManager = sessionManager; + public WebInterface(SonePlugin sonePlugin) { + this.sonePlugin = sonePlugin; } // @@ -57,7 +79,7 @@ public class WebInterface { * @return The node’s l10n helper */ public BaseL10n l10n() { - return l10n; + return sonePlugin.l10n().getBase(); } /** @@ -66,7 +88,106 @@ public class WebInterface { * @return The node’s session manager */ public SessionManager sessionManager() { - return sessionManager; + try { + return sonePlugin.pluginRespirator().getSessionManager(new URI("/")); + } catch (URISyntaxException use1) { + logger.log(Level.SEVERE, "Could not get Session Manager!", use1); + return null; + } + } + + // + // SERVICE METHODS + // + + /** + * {@inheritDoc} + */ + @Override + protected void serviceStart() { + registerToadlets(); + } + + /** + * {@inheritDoc} + */ + @Override + protected void serviceStop() { + unregisterToadlets(); + } + + // + // PRIVATE METHODS + // + + /** + * Register all toadlets. + */ + private void registerToadlets() { + TemplateFactory templateFactory = new SoneTemplateFactory(l10n()); + + Template loginTemplate = templateFactory.createTemplate(createReader("/templates/login.html")); + loginTemplate.set("formPassword", sonePlugin.pluginRespirator().getToadletContainer().getFormPassword()); + + PageToadletFactory pageToadletFactory = new PageToadletFactory(sonePlugin.pluginRespirator().getHLSimpleClient(), "/Sone/"); + pageToadlets.add(pageToadletFactory.createPageToadlet(new LoginPage(loginTemplate, this), "Login")); + pageToadlets.add(pageToadletFactory.createPageToadlet(new CSSPage("css/", "/static/css/"))); + + ToadletContainer toadletContainer = sonePlugin.pluginRespirator().getToadletContainer(); + toadletContainer.getPageMaker().addNavigationCategory("/Sone/", "Navigation.Menu.Name", "Navigation.Menu.Tooltip", sonePlugin); + for (PageToadlet toadlet : pageToadlets) { + String menuName = toadlet.getMenuName(); + if (menuName != null) { + toadletContainer.register(toadlet, "Navigation.Menu.Name", toadlet.path(), true, "Navigation.Menu.Item." + menuName + ".Name", "Navigation.Menu.Item." + menuName + ".Tooltip", false, new AlwaysEnabledCallback()); + } else { + toadletContainer.register(toadlet, null, toadlet.path(), true, false); + } + } + } + + /** + * Unregisters all toadlets. + */ + private void unregisterToadlets() { + ToadletContainer toadletContainer = sonePlugin.pluginRespirator().getToadletContainer(); + for (PageToadlet pageToadlet : pageToadlets) { + toadletContainer.unregister(pageToadlet); + } + toadletContainer.getPageMaker().removeNavigationCategory("Navigation.Menu.Name"); + } + + /** + * Creates a {@link Reader} from the {@link InputStream} for the resource + * with the given name. + * + * @param resourceName + * The name of the resource + * @return A {@link Reader} for the resource + */ + private Reader createReader(String resourceName) { + try { + return new InputStreamReader(getClass().getResourceAsStream(resourceName), "UTF-8"); + } catch (UnsupportedEncodingException uee1) { + return null; + } + } + + /** + * {@link LinkEnabledCallback} implementation that always returns + * {@code true} when {@link LinkEnabledCallback#isEnabled(ToadletContext)} + * is called. + * + * @author David ‘Bombe’ Roden + */ + public class AlwaysEnabledCallback implements LinkEnabledCallback { + + /** + * {@inheritDoc} + */ + @Override + public boolean isEnabled(ToadletContext toadletContext) { + return true; + } } }