#102 preview mode (#106)

CondationCMS · Dec 1, 2023 · e8ed5ac · e8ed5ac
1 parent 778dd97
commit e8ed5ac
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 31 deletions.
diff --git a/cms-api/src/main/java/com/github/thmarx/cms/api/PreviewContext.java b/cms-api/src/main/java/com/github/thmarx/cms/api/PreviewContext.java
@@ -0,0 +1,32 @@
+package com.github.thmarx.cms.api;
+
+/*-
+ * #%L
+ * cms-api
+ * %%
+ * Copyright (C) 2023 Marx-Software
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+/**
+ *
+ * @author t.marx
+ */
+public class PreviewContext {
+
+	public static ThreadLocal<Boolean> IS_PREVIEW = ThreadLocal.withInitial(() -> false);
+}
diff --git a/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/MetaData.java b/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/MetaData.java
@@ -23,6 +23,7 @@
  */
 
 import com.github.thmarx.cms.api.Constants;
+import com.github.thmarx.cms.api.PreviewContext;
 import com.github.thmarx.cms.api.utils.SectionUtil;
 import com.github.thmarx.cms.filesystem.datafilter.DataFilter;
 import com.google.common.base.Strings;
@@ -95,19 +96,7 @@ public List<MetaNode> listChildren(String uri) {
 		if ("".equals(uri)) {
 			return tree.values().stream()
 					.filter(node -> !node.isHidden())
-					.map(node -> {
-						if (node.isDirectory) {
-							var tempNode = node.children.entrySet().stream().filter((entry)
-									-> entry.getKey().equals("index.md")
-							).findFirst();
-							if (tempNode.isPresent()) {
-								return tempNode.get().getValue();
-							}
-							return null;
-						} else {
-							return node;
-						}
-					})
+					.map(this::mapToIndex)
 					.filter(node -> node != null)
 					.filter(MetaData::isVisible)
 					.collect(Collectors.toList());
@@ -118,19 +107,7 @@ public List<MetaNode> listChildren(String uri) {
 				return findFolder.get().children().values()
 						.stream()
 						.filter(node -> !node.isHidden())
-						.map(node -> {
-							if (node.isDirectory) {
-								var tempNode = node.children.entrySet().stream().filter((entry)
-										-> entry.getKey().equals("index.md")
-								).findFirst();
-								if (tempNode.isPresent()) {
-									return tempNode.get().getValue();
-								}
-								return null;
-							} else {
-								return node;
-							}
-						})
+						.map(this::mapToIndex)
 						.filter(node -> node != null)
 						.filter(MetaData::isVisible)
 						.collect(Collectors.toList());
@@ -139,6 +116,20 @@ public List<MetaNode> listChildren(String uri) {
 		return Collections.emptyList();
 	}
 
+	protected MetaNode mapToIndex(MetaNode node) {
+		if (node.isDirectory) {
+			var tempNode = node.children.entrySet().stream().filter((entry)
+					-> entry.getKey().equals("index.md")
+			).findFirst();
+			if (tempNode.isPresent()) {
+				return tempNode.get().getValue();
+			}
+			return null;
+		} else {
+			return node;
+		}
+	}
+
 	public static boolean isVisible (MetaNode node) {
 		return node != null 
 				&& node.isPublished() 
@@ -222,6 +213,9 @@ public boolean isDraft() {
 		}
 
 		public boolean isPublished() {
+			if (PreviewContext.IS_PREVIEW.get()) {
+				return true;
+			}
 			var localDate = (Date) data.getOrDefault(Constants.MetaFields.PUBLISHED, Date.from(Instant.now()));
 			var now = Date.from(Instant.now());
 			return !isDraft() && (localDate.before(now) || localDate.equals(now));

diff --git a/cms-server/hosts/demo/content/templating/index.md b/cms-server/hosts/demo/content/templating/index.md
@@ -1,6 +1,7 @@
 ---
 title: Templates & Engines
 template: content.html
+draft: true
 menu: 
     title: Templating
     position: 20

diff --git a/cms-server/src/main/java/com/github/thmarx/cms/content/ContentResolver.java b/cms-server/src/main/java/com/github/thmarx/cms/content/ContentResolver.java
@@ -60,7 +60,9 @@ public Optional<String> getStaticContent (String uri) {
 			if (!PathUtil.isChild(contentBase, staticFile)) {
 				return Optional.empty();
 			}
-			return Optional.ofNullable(Files.readString(staticFile, StandardCharsets.UTF_8));
+			if (Files.exists(staticFile)) {
+				return Optional.ofNullable(Files.readString(staticFile, StandardCharsets.UTF_8));
+			}
 		} catch (IOException ex) {
 			log.error("", ex);
 		}

diff --git a/cms-server/src/main/java/com/github/thmarx/cms/request/RequestContextFactory.java b/cms-server/src/main/java/com/github/thmarx/cms/request/RequestContextFactory.java
@@ -22,6 +22,7 @@
  * #L%
  */
 
+import com.github.thmarx.cms.Startup;
 import com.github.thmarx.cms.api.markdown.MarkdownRenderer;
 import com.github.thmarx.cms.api.theme.Theme;
 import com.github.thmarx.cms.content.ContentTags;
@@ -45,7 +46,7 @@ public class RequestContextFactory {
 
 
 	public RequestContext create (String uri, Map<String, List<String>> queryParameters) throws IOException {
-		
+
 		var requestTheme = new RequestTheme(theme);
 
 		RequestExtensions requestExtensions = extensionManager.newContext(requestTheme);

diff --git a/cms-server/src/main/java/com/github/thmarx/cms/server/jetty/handler/JettyDefaultHandler.java b/cms-server/src/main/java/com/github/thmarx/cms/server/jetty/handler/JettyDefaultHandler.java
@@ -21,7 +21,10 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
+import com.github.thmarx.cms.Startup;
+import com.github.thmarx.cms.api.PreviewContext;
 import com.github.thmarx.cms.content.ContentResolver;
+import com.github.thmarx.cms.request.RequestContext;
 import com.github.thmarx.cms.request.RequestContextFactory;
 import com.github.thmarx.cms.utils.HTTPUtil;
 import java.util.Optional;
@@ -50,6 +53,10 @@ public boolean handle(Request request, Response response, Callback callback) thr
 		var queryParameters = HTTPUtil.queryParameters(request.getHttpURI().getQuery());
 		try (
 				var requestContext = requestContextFactory.create(uri, queryParameters)) {
+
+			if (Startup.DEV_MODE && queryParameters.containsKey("preview")) {
+				PreviewContext.IS_PREVIEW.set(Boolean.TRUE);
+			}
 
 			Optional<String> content = contentResolver.getContent(requestContext);
 			response.setStatus(200);
@@ -74,6 +81,8 @@ public boolean handle(Request request, Response response, Callback callback) thr
 			response.setStatus(500);
 			response.getHeaders().add("Content-Type", "text/html; charset=utf-8");
 			callback.succeeded();
+		} finally {
+			PreviewContext.IS_PREVIEW.remove();
 		}
 		return true;
 	}

diff --git a/...r/src/main/java/com/github/thmarx/cms/template/functions/AbstractCurrentNodeFunction.java b/...r/src/main/java/com/github/thmarx/cms/template/functions/AbstractCurrentNodeFunction.java
@@ -22,6 +22,7 @@
  * #L%
  */
 
+import com.github.thmarx.cms.api.PreviewContext;
 import com.github.thmarx.cms.content.ContentParser;
 import com.github.thmarx.cms.filesystem.FileSystem;
 import com.github.thmarx.cms.api.markdown.MarkdownRenderer;
@@ -63,7 +64,9 @@ protected String getUrl(Path node) {
 
 		var url = sb.toString();
 
-		return "".equals(url) ? "/" : url;
+		url =  "".equals(url) ? "/" : url;
+
+		return url + (PreviewContext.IS_PREVIEW.get() ? "?preview" : "");
 	}
 
 	protected Optional<ContentParser.Content> parse(Path node) {

diff --git a/cms-server/src/main/java/com/github/thmarx/cms/template/functions/query/QueryFunction.java b/cms-server/src/main/java/com/github/thmarx/cms/template/functions/query/QueryFunction.java
@@ -21,6 +21,7 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
+import com.github.thmarx.cms.api.PreviewContext;
 import com.github.thmarx.cms.api.markdown.MarkdownRenderer;
 import com.github.thmarx.cms.content.ContentParser;
 import com.github.thmarx.cms.filesystem.FileSystem;
@@ -31,7 +32,6 @@
 import com.github.thmarx.cms.utils.NodeUtil;
 import java.nio.file.Path;
 import java.util.function.BiFunction;
-import java.util.function.Function;
 
 /**
  *
@@ -85,6 +85,6 @@ protected String toUrl(String uri) {
 			uri = uri.substring(0, uri.length() - 1);
 		}
 
-		return uri;
+		return uri + (PreviewContext.IS_PREVIEW.get() ? "?preview" : "");
 	}
 }