X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fdemoscenemusic%2Fcore%2FTemplateServlet.java;h=cfc3fdbab5a628a2d671c26e85c65b6791a04da8;hb=fb73cc41eb8f9ef9bf2181f4295dc74581b25b53;hp=cfef6ddd18f4758e66b2d7cefa28162e8775f06f;hpb=e1c691c0f78473f4023f4e9dc71d34d4c7199e13;p=demoscenemusic.git

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java b/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
index cfef6dd..cfc3fdb 100644
--- a/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
@@ -38,17 +38,29 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import net.pterodactylus.demoscenemusic.data.Artist;
+import net.pterodactylus.demoscenemusic.data.DefaultGroup;
+import net.pterodactylus.demoscenemusic.data.DefaultParty;
+import net.pterodactylus.demoscenemusic.data.Group;
+import net.pterodactylus.demoscenemusic.data.Party;
+import net.pterodactylus.demoscenemusic.data.Properties;
 import net.pterodactylus.demoscenemusic.data.Style;
 import net.pterodactylus.demoscenemusic.data.Track;
+import net.pterodactylus.demoscenemusic.data.TrackDerivative;
 import net.pterodactylus.demoscenemusic.data.User;
 import net.pterodactylus.demoscenemusic.page.ServletRequest;
+import net.pterodactylus.demoscenemusic.template.ConciseNumberFilter;
+import net.pterodactylus.demoscenemusic.template.DurationFilter;
+import net.pterodactylus.demoscenemusic.template.PropertiesAccessor;
+import net.pterodactylus.demoscenemusic.template.TrackDerivativeAccessor;
 import net.pterodactylus.demoscenemusic.template.UserAccessor;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.io.StreamCopier;
 import net.pterodactylus.util.template.ClassPathTemplateProvider;
 import net.pterodactylus.util.template.CollectionSortFilter;
 import net.pterodactylus.util.template.HtmlFilter;
+import net.pterodactylus.util.template.MatchFilter;
 import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.RemoveFilter;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContextFactory;
 import net.pterodactylus.util.template.TemplateParser;
@@ -64,6 +76,7 @@ import net.pterodactylus.util.web.Response;
 public class TemplateServlet extends HttpServlet {
 
 	private Core core;
+
 	private final TemplateContextFactory templateContextFactory = new TemplateContextFactory();
 
 	private final Map<String, Page<ServletRequest>> pages = new HashMap<String, Page<ServletRequest>>();
@@ -82,6 +95,8 @@ public class TemplateServlet extends HttpServlet {
 
 		templateContextFactory.addAccessor(Object.class, new ReflectionAccessor());
 		templateContextFactory.addAccessor(User.class, new UserAccessor());
+		templateContextFactory.addAccessor(Properties.class, new PropertiesAccessor());
+		templateContextFactory.addAccessor(TrackDerivative.class, new TrackDerivativeAccessor());
 
 		templateContextFactory.addFilter("html", new HtmlFilter());
 		CollectionSortFilter sortFilter = new CollectionSortFilter();
@@ -109,7 +124,13 @@ public class TemplateServlet extends HttpServlet {
 			}
 
 		});
+		sortFilter.addComparator(Party.class, DefaultParty.NAME_YEAR_COMPARATOR);
+		sortFilter.addComparator(Group.class, DefaultGroup.NAME_COMPARATOR);
 		templateContextFactory.addFilter("sort", sortFilter);
+		templateContextFactory.addFilter("matches", new MatchFilter());
+		templateContextFactory.addFilter("time", new DurationFilter());
+		templateContextFactory.addFilter("concise", new ConciseNumberFilter());
+		templateContextFactory.addFilter("remove", new RemoveFilter());
 
 		templateContextFactory.addTemplateObject("core", core);
 		templateContextFactory.addTemplateObject("dataManager", core.getDataManager());
@@ -149,6 +170,7 @@ public class TemplateServlet extends HttpServlet {
 	 */
 	@Override
 	protected void doGet(HttpServletRequest request, HttpServletResponse httpServletResponse) throws ServletException, IOException {
+		request.setCharacterEncoding("UTF-8");
 		String path = request.getPathInfo();
 		if (path.startsWith("/")) {
 			path = path.substring(1);