X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=publishing%2Forg.argeo.publishing.ui%2Fsrc%2Forg%2Fargeo%2Fpublishing%2Fservlet%2FDbkServlet.java;h=e892562bbcfb0f7eb542f3575504ca57a99af015;hb=752a7b2614895002a3d184be166ef4162caf0d05;hp=d977377b3a6d4078455faec18fd77579744cf962;hpb=dd5d3b4edb76ba0b6497f6cf8af7838abef16e96;p=gpl%2Fargeo-suite.git diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java b/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java index d977377..e892562 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/publishing/servlet/DbkServlet.java @@ -8,6 +8,9 @@ import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import javax.jcr.Node; import javax.jcr.Repository; @@ -33,6 +36,8 @@ import javax.xml.transform.stream.StreamSource; import org.apache.commons.io.IOUtils; import org.apache.xalan.processor.TransformerFactoryImpl; import org.argeo.cms.servlet.ServletAuthUtils; +import org.argeo.cms.ui.CmsTheme; +import org.argeo.docbook.DbkType; import org.argeo.docbook.DbkUtils; import org.argeo.jcr.Jcr; import org.argeo.jcr.JcrException; @@ -51,69 +56,118 @@ public class DbkServlet extends HttpServlet { private TransformerFactory transformerFactory; private Templates docBoookTemplates; + private Map themes = Collections.synchronizedMap(new HashMap<>()); + @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + String pathInfo = req.getPathInfo(); + if (pathInfo.startsWith("//")) + pathInfo = pathInfo.substring(1); + String path = URLDecoder.decode(pathInfo, StandardCharsets.UTF_8); + + if (path.toLowerCase().endsWith(".css")) { + path = path.substring(1); + int firstSlash = path.indexOf('/'); + String themeId = path.substring(0, firstSlash); + String cssPath = path.substring(firstSlash); + CmsTheme cmsTheme = themes.get(themeId); + if (cmsTheme == null) + throw new IllegalArgumentException("Theme " + themeId + " not found."); + resp.setContentType("text/css"); + IOUtils.copy(cmsTheme.getResourceAsStream(cssPath), resp.getOutputStream()); + return; + } + + if (path.toLowerCase().endsWith("/index.html")) { + path = path.substring(0, path.length() - "/index.html".length()); + } + Session session = null; try { session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req); - - String pathInfo = req.getPathInfo(); - if (pathInfo.startsWith("//")) - pathInfo = pathInfo.substring(1); - String path = URLDecoder.decode(pathInfo, StandardCharsets.UTF_8); - Node node = session.getNode(path); - if (DbkUtils.isDbk(node)) { - // TODO customise DocBook so that it outputs UTF-8 - // see http://www.sagehill.net/docbookxsl/OutputEncoding.html - resp.setContentType("text/html; charset=ISO-8859-1"); - - // TODO optimise with pipes, SAX, etc. ? - byte[] arr; - try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { - session.exportDocumentView(path, out, true, false); - arr = out.toByteArray(); + + if (node.hasNode(DbkType.article.get())) { + Node dbkNode = node.getNode(DbkType.article.get()); + if (DbkUtils.isDbk(dbkNode)) { + CmsTheme cmsTheme = null; + String themeId = req.getParameter("themeId"); + if (themeId != null) { + cmsTheme = themes.get(themeId); + if (cmsTheme == null) + throw new IllegalArgumentException("Theme " + themeId + " not found."); + } + + // TODO customise DocBook so that it outputs UTF-8 + // see http://www.sagehill.net/docbookxsl/OutputEncoding.html + resp.setContentType("text/html; charset=ISO-8859-1"); + + // TODO optimise with pipes, SAX, etc. ? + byte[] arr; + try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { + session.exportDocumentView(dbkNode.getPath(), out, true, false); + arr = out.toByteArray(); // System.out.println(new String(arr, StandardCharsets.UTF_8)); - } catch (RepositoryException e) { - throw new JcrException(e); - } + } catch (RepositoryException e) { + throw new JcrException(e); + } - try (InputStream in = new ByteArrayInputStream(arr); + try (InputStream in = new ByteArrayInputStream(arr); // ByteArrayOutputStream out = new ByteArrayOutputStream(); - ) { + ) { - Result xmlOutput = new StreamResult(resp.getOutputStream()); + Result xmlOutput = new StreamResult(resp.getOutputStream()); - DocumentBuilder docBuilder = documentBuilderFactory.newDocumentBuilder(); + DocumentBuilder docBuilder = documentBuilderFactory.newDocumentBuilder(); // Document doc = docBuilder.parse(new File( // System.getProperty("user.home") + "/dev/git/gpl/argeo-qa/doc/platform/argeo-platform.dbk.xml")); - Document doc = docBuilder.parse(in); - Source xmlInput = new DOMSource(doc); - - Transformer transformer = docBoookTemplates.newTransformer(); - transformer.transform(xmlInput, xmlOutput); + Document doc = docBuilder.parse(in); + Source xmlInput = new DOMSource(doc); + + Transformer transformer = docBoookTemplates.newTransformer(); + + // gather CSS + if (cmsTheme != null) { + StringBuilder sb = new StringBuilder(); + for (String cssPath : cmsTheme.getWebCssPaths()) { + sb.append(req.getContextPath()).append(req.getServletPath()).append('/'); + sb.append(themeId).append('/').append(cssPath).append(' '); + } + // FIXME make it more generic + sb.append("https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap") + .append(' '); + sb.append( + "https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,300;0,400;0,600;1,400&display=swap") + .append(' '); + if (sb.length() > 0) + transformer.setParameter("html.stylesheet", sb.toString()); + } + transformer.transform(xmlInput, xmlOutput); // resp.getOutputStream().write(out.toByteArray()); - } catch (Exception e) { - throw new ServletException("Cannot transform " + path, e); + } catch (Exception e) { + throw new ServletException("Cannot transform " + path, e); + } } - } else if (node.isNodeType(NodeType.NT_FILE)) {// media download etc. - String fileNameLowerCase = node.getName().toLowerCase(); - if (fileNameLowerCase.endsWith(".jpg") || fileNameLowerCase.endsWith(".jpeg")) { - resp.setContentType("image/jpeg"); - } else if (fileNameLowerCase.endsWith(".png")) { - resp.setContentType("image/png"); - } else if (fileNameLowerCase.endsWith(".gif")) { - resp.setContentType("image/gif"); - } else if (fileNameLowerCase.endsWith(".svg")) { - resp.setContentType("image/svg+xml"); + } else { + if (node.isNodeType(NodeType.NT_FILE)) {// media download etc. + String fileNameLowerCase = node.getName().toLowerCase(); + if (fileNameLowerCase.endsWith(".jpg") || fileNameLowerCase.endsWith(".jpeg")) { + resp.setContentType("image/jpeg"); + } else if (fileNameLowerCase.endsWith(".png")) { + resp.setContentType("image/png"); + } else if (fileNameLowerCase.endsWith(".gif")) { + resp.setContentType("image/gif"); + } else if (fileNameLowerCase.endsWith(".svg")) { + resp.setContentType("image/svg+xml"); + } else { + // TODO know more content types... + resp.setHeader("Content-Disposition", "attachment; filename=\"" + node.getName() + "\""); + } + IOUtils.copy(JcrUtils.getFileAsStream(node), resp.getOutputStream()); } else { - // TODO know more content types... - resp.setHeader("Content-Disposition", "attachment; filename=\"" + node.getName() + "\""); + throw new IllegalArgumentException("Unsupported node " + node); } - IOUtils.copy(JcrUtils.getFileAsStream(node), resp.getOutputStream()); - } else { - throw new IllegalArgumentException("Unsupported node " + node); } } catch (RepositoryException e1) { throw new JcrException(e1); @@ -160,4 +214,12 @@ public class DbkServlet extends HttpServlet { this.repository = repository; } + public void addTheme(CmsTheme theme, Map properties) { + themes.put(theme.getThemeId(), theme); + } + + public void removeTheme(CmsTheme theme, Map properties) { + themes.remove(theme.getThemeId()); + } + }