When an empty file is requested, use page named “index.”

[demoscenemusic.git] / src / main / java / net / pterodactylus / demoscenemusic / core / TemplateServlet.java

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java b/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
index 1b1ce58..cfef6dd 100644 (file)
--- a/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
@@ -38,7 +38,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import net.pterodactylus.demoscenemusic.data.Artist;
+import net.pterodactylus.demoscenemusic.data.Style;
+import net.pterodactylus.demoscenemusic.data.Track;
+import net.pterodactylus.demoscenemusic.data.User;
 import net.pterodactylus.demoscenemusic.page.ServletRequest;
+import net.pterodactylus.demoscenemusic.template.UserAccessor;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.io.StreamCopier;
 import net.pterodactylus.util.template.ClassPathTemplateProvider;
@@ -77,6 +81,7 @@ public class TemplateServlet extends HttpServlet {
                core = (Core) config.getServletContext().getAttribute("core");
 
                templateContextFactory.addAccessor(Object.class, new ReflectionAccessor());
+               templateContextFactory.addAccessor(User.class, new UserAccessor());
 
                templateContextFactory.addFilter("html", new HtmlFilter());
                CollectionSortFilter sortFilter = new CollectionSortFilter();
@@ -84,7 +89,23 @@ public class TemplateServlet extends HttpServlet {
 
                        @Override
                        public int compare(Artist leftArtist, Artist rightArtist) {
-                               return leftArtist.name().compareToIgnoreCase(rightArtist.name());
+                               return leftArtist.getName().compareToIgnoreCase(rightArtist.getName());
+                       }
+
+               });
+               sortFilter.addComparator(Track.class, new Comparator<Track>() {
+
+                       @Override
+                       public int compare(Track leftTrack, Track rightTrack) {
+                               return leftTrack.getName().compareToIgnoreCase(rightTrack.getName());
+                       }
+
+               });
+               sortFilter.addComparator(Style.class, new Comparator<Style>() {
+
+                       @Override
+                       public int compare(Style leftStyle, Style rightStyle) {
+                               return leftStyle.getName().compareToIgnoreCase(rightStyle.getName());
                        }
 
                });
@@ -132,11 +153,14 @@ public class TemplateServlet extends HttpServlet {
                if (path.startsWith("/")) {
                        path = path.substring(1);
                }
+               if ((path.length() == 0) || (path.endsWith("/"))) {
+                       path += "index";
+               }
                Page<ServletRequest> page = pages.get(path);
                if (page != null) {
                        ServletRequest servletRequest;
                        try {
-                               servletRequest = new ServletRequest(request);
+                               servletRequest = new ServletRequest(request, this);
                        } catch (URISyntaxException use1) {
                                throw new IOException("Could not create URI from " + request.getRequestURI(), use1);
                        }
@@ -155,6 +179,14 @@ public class TemplateServlet extends HttpServlet {
                }
        }
 
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected void doPost(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException {
+               doGet(httpServletRequest, httpServletResponse);
+       }
+
        //
        // PRIVATE METHODS
        //