projects
/
demoscenemusic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add accessor for track derivatives.
[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
9b09108
..
df753f1
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
@@
-38,10
+38,14
@@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.pterodactylus.demoscenemusic.data.Artist;
import javax.servlet.http.HttpServletResponse;
import net.pterodactylus.demoscenemusic.data.Artist;
+import net.pterodactylus.demoscenemusic.data.Properties;
import net.pterodactylus.demoscenemusic.data.Style;
import net.pterodactylus.demoscenemusic.data.Track;
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.data.User;
import net.pterodactylus.demoscenemusic.page.ServletRequest;
+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.demoscenemusic.template.UserAccessor;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.io.StreamCopier;
@@
-82,6
+86,8
@@
public class TemplateServlet extends HttpServlet {
templateContextFactory.addAccessor(Object.class, new ReflectionAccessor());
templateContextFactory.addAccessor(User.class, new UserAccessor());
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();
templateContextFactory.addFilter("html", new HtmlFilter());
CollectionSortFilter sortFilter = new CollectionSortFilter();
@@
-149,10
+155,14
@@
public class TemplateServlet extends HttpServlet {
*/
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse httpServletResponse) throws ServletException, IOException {
*/
@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);
}
String path = request.getPathInfo();
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;
Page<ServletRequest> page = pages.get(path);
if (page != null) {
ServletRequest servletRequest;