From 57e7a11c061772f813d44d71ce1e7c5112b7fae2 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Fri, 31 Oct 2025 12:51:31 +0100 Subject: [PATCH] Refactored (and renamed) the Skin for the Hugo site-generator --- pom.xml | 16 +- src/main/resources/META-INF/maven/site.vm | 294 ++++++++-------------- 2 files changed, 116 insertions(+), 194 deletions(-) diff --git a/pom.xml b/pom.xml index 19702fb..b2cd6ab 100644 --- a/pom.xml +++ b/pom.xml @@ -9,17 +9,17 @@ de.juplo.maven - maven-thymeleaf-skin - 1.1.2 + maven-hugo-skin + 1.0.0-SNAPSHOT - Thymeleaf-Skin - A maven skin, that renders the site as thymeleaf-templates. - http://juplo.de/maven-thymeleaf-skin/index.html + Hugo-Skin + A maven skin, that renders the site as content for Hugo. + http://juplo.de/maven-hugo-skin/index.html - scm:git:http://juplo.de/git/maven-thymeleaf-skin - scm:git:ssh://juplo.de:/var/lib/git/juplo/maven-thymeleaf-skin - http://juplo.de/gitweb/?p=maven-thymeleaf-skin;a=summary + scm:git:http://juplo.de/git/maven-hugo-skin + scm:git:ssh://juplo.de:/var/lib/git/juplo/maven-hugo-skin + http://juplo.de/gitweb/?p=maven-hugo-skin;a=summary diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm index 366dcfd..1cbbee9 100644 --- a/src/main/resources/META-INF/maven/site.vm +++ b/src/main/resources/META-INF/maven/site.vm @@ -1,216 +1,138 @@ - - - - - #set ( $pages = $project.getClass().forName('java.util.LinkedHashMap').newInstance() ) #set ( $stack = $project.getClass().forName('java.util.LinkedList').newInstance() ) -#macro ( buildPages $menu ) - - #if ( $menu.href ) - #set ( $currentItemHref = $PathTool.calculateLink( $menu.href, $relativePath ) ) +#macro ( buildPages $item ) + + #if ( $item.href ) + #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) #else #set ( $currentItemHref = '' ) #end #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) ) - - #set ( $seen = false ) - #foreach ( $entry in $stack ) - #if ( $entry.uri == $currentItemHref ) - #set ( $seen = true ) - #end - #end - - #if ( !$seen ) - #if ($currentItemHref) - #set( $sinkhole = $stack.peek().childs.put($currentItemHref, $menu.name) ) - #end - + #if ( $currentItemHref and !$pages.containsKey( $currentItemHref) ) + #set ( $sinkhole = $stack.peek().childs.add($currentItemHref) ) #set ( $page = $project.getClass().forName('java.util.LinkedHashMap').newInstance() ) - #set ( $sinkhole = $page.put("name", $menu.name) ) - #set ( $sinkhole = $page.put("uri", $currentItemHref) ) - #set ( $sinkhole = $page.put("childs", $project.getClass().forName('java.util.LinkedHashMap').newInstance()) ) + #set ( $sinkhole = $page.put("name", $item.name) ) + #set ( $sinkhole = $page.put("href", $currentItemHref) ) + #set ( $sinkhole = $page.put("childs", $project.getClass().forName('java.util.LinkedList').newInstance()) ) + #set ( $sinkhole = $pages.put($page.href, $page) ) #set ( $sinkhole = $stack.push( $page ) ) - - #if ($menu.title) - #set( $sinkhole = $page.put("title", $menu.title) ) - #end - #if ($menu.alt) - #set( $sinkhole = $page.put("alt", $menu.alt) ) - #end - #if ($menu.img) - #set( $sinkhole = $page.put("img", $menu.img) ) - #end - - #foreach ( $item in $menu.items ) - #buildPages ( $item ) - #end - - #set ( $page = $stack.pop() ) - #if ( $page.uri != "" ) - - #set ( $crumbs = $project.getClass().forName('java.util.LinkedList').newInstance() ) - #set ( $crumb = $project.getClass().forName('java.util.LinkedHashMap').newInstance() ) - #set ( $sinkhole = $crumb.put("uri", $page.uri) ) - #set ( $sinkhole = $crumb.put("name", $page.name) ) - #set ( $sinkhole = $crumbs.push($crumb) ) - #foreach ( $entry in $stack ) - #if ( $entry.uri != "" ) - #set ( $crumb = $project.getClass().forName('java.util.LinkedHashMap').newInstance() ) - #set ( $sinkhole = $crumb.put("uri", $entry.uri) ) - #set ( $sinkhole = $crumb.put("name", $entry.name) ) - #set ( $sinkhole = $crumbs.push($crumb) ) - #end + #if ($item.image) + #set ( $image = $project.getClass().forName('java.util.LinkedHashMap').newInstance() ) + #set ( $sinkhole = $page.put("image", $image) ) + #if ($item.image.src) + #set ( $sinkhole = $image.put("src", $item.image.src) ) #end - #set ( $sinkhole = $page.put("crumbs", $crumbs) ) - - #if ( $pages.containsKey($page.uri) ) - #set ( $childs = $pages.get($page.uri).childs ) - #set ( $sinkhole = $page.put("childs", $childs) ) - - - #else - - + #if ($item.image.position) + #set ( $sinkhole = $image.put("position", $item.image.position) ) #end - - #set ( $sinkhole = $pages.put($page.uri, $page) ) - - #else - - #else(no name)--> - #set( $siteTitle = $menu.title ) - #set( $siteAlt = $menu.alt ) - #set( $siteImg = $menu.img ) - #set( $sinkhole = $pages.get("index.html").put("childs", $page.childs) ) + #if ($item.image.alt) + #set ( $sinkhole = $image.put("alt", $item.image.alt) ) + #end + #if ($item.image.width) + #set ( $sinkhole = $image.put("width", $item.image.width) ) + #end + #if ($item.image.height) + #set ( $sinkhole = $image.put("height", $item.image.height) ) + #end + #if ($item.image.style) + #set ( $sinkhole = $image.put("style", $item.image.style) ) #end - #end + #foreach ( $entry in $item.items ) + #buildPages ( $entry ) + #end + #set ( $page = $stack.pop() ) + #set ( $crumbs = $project.getClass().forName('java.util.LinkedList').newInstance() ) + #foreach ( $entry in $stack ) + #set ( $sinkhole = $crumbs.push($entry.href) ) + #end + #set ( $sinkhole = $page.put("crumbs", $crumbs) ) #else - + #end #end +--- +title: $!{shortTitle} +lastmod: ${date.get("yyyy-MM-dd'T'HH:mm:ssZ")} +params: + generator: Apache Maven Doxia Site Renderer $!{doxiaSiteRendererVersion} + project: + groupId: $!{project.groupId} + artifactId: $!{project.artifactId} + version: $!{project.version} + name: $!{project.name} + description: $!{project.description} + site: + name: $!{site.name} + url: $!{site.url} +outputs: + - html +url: $!{site.custom.getChild('path').getValue()}${alignedFilePath} +--- +
+$bodyContent +
+ +#if (!$alignedFilePath or $alignedFilePath == 'index.html') +## Custom Variablen einlesen +#set ( $path = $site.custom.getChild( 'path' ).getValue() ) +#set ( $menuName = $site.custom.getChild( 'menuName' ).getValue() ) ## Seiten einlesen -#set ( $page = $project.getClass().forName('java.util.LinkedHashMap').newInstance() ) -#set ( $sinkhole = $page.put("uri", "index.html") ) -#set ( $sinkhole = $page.put("name", "$project.name") ) -#set ( $crumbs = $project.getClass().forName('java.util.LinkedList').newInstance() ) -#set ( $crumb = $project.getClass().forName('java.util.LinkedHashMap').newInstance() ) -#set ( $sinkhole = $crumb.put("uri", $page.uri) ) -#set ( $sinkhole = $crumb.put("name", $page.name) ) -#set ( $sinkhole = $crumbs.push( $crumb ) ) -#set ( $sinkhole = $page.put("crumbs", $crumbs ) ) -#set ( $sinkhole = $pages.put($page.uri, $page) ) -#set ( $sinkhole = $stack.push($page) ) -#foreach ( $menu in $decoration.body.menus ) - ## Nur benannte Menüs werden berücksichtigt - #if ($menu.name) - #buildPages ( $menu ) +#foreach ( $menu in $site.body.menus ) + ## Zuerst alle anderen Menüs verarbeiten + #if ($menu.name != $menuName) + #foreach ( $item in $menu.items ) + #buildPages ( $item ) + #end #end #end -#foreach ( $menu in $decoration.body.menus ) - ## Nur unbenannte Menüs werden berücksichtigt - #if (!($menu.name)) - #buildPages ( $menu ) +#foreach ( $menu in $site.body.menus ) + ## Danach dann das Haupt-Menü einlesen + ## Durch diese Reihenfolge überschreiben Referenzen die automatisch erzeugten Einträge nicht + #if ($menu.name == $menuName) + #foreach ( $item in $menu.items ) + #buildPages ( $item ) + #end #end #end -## Custom Variablen einlesen -#set ( $pathPrefix = $decoration.custom.getChild( 'thymeproxy' ).getChild( 'prefix' ).getValue() ) -#if ( !$pathPrefix ) - #set ( $pathPrefix = "" ) + +#if ( $project.description ) + "description": "$project.description", #end -#if ( $decoration.custom.getChild( 'thymeproxy' ).getChild( 'flat' ).getValue() ) - - #set ( $sitePath = $canonicalPath ) -#else - #set ( $sitePath = $pathPrefix + $canonicalPath + $project.version + "/" ) +#if ( $path ) + "path": "$path", #end -#set ( $siteCrumbs = $decoration.custom.getChild( 'thymeproxy' ).getChild( 'crumbs' ).getValue() ) -#set ( $command = $decoration.custom.getChild( 'thymeproxy' ).getChild( 'command' ).getValue() ) -#if ( !$command ) - #set ( $command = "" ) - + "pages": [#set( $page_sep="")#foreach( $page in $pages )$page_sep + { +#if ( $page.name ) + "name": "$page.name", #end - - - - - - - - - - - - - - $title - - - - -

$shortTitle

-

URI

- -

Path

-

-

    - #foreach($crumb in $pages.get($alignedFileName).crumbs)
  1. $crumb.name
    2. #end -
-

-
-
- $bodyContent -
-
-

Page Structure as JSON

- 
-{
-  "_titles": {#set($sep = "")#foreach($page in $pages)$sep
-    "$sitePath$page.uri": "$page.name"#set($sep = ",")
+#if ( $page.href )
+      "href": "$page.href",
 #end
-
-  },
-  "_childs": {#set($sep = "")#foreach($page in $pages)#if(!$page.childs.isEmpty())$sep
-    "$sitePath$page.uri": [#set($csep = "")#foreach($child in $page.childs.entrySet())$csep
-      "$sitePath$child.key"#set($csep = ",")#end
-
-    ]#set($sep = ",")#end#end
-
-  },
-  "_crumbs": {#set($sep = "")#foreach($page in $pages)$sep
-    "$sitePath$page.uri": [
-#set($csep = "")#if($siteCrumbs)
-      $siteCrumbs#set($csep = ",")#end#set($last = "")#foreach($crumb in $page.crumbs)#if($sitePath+$crumb.uri != $last)$csep
-      "$sitePath$crumb.uri"#set($csep = ",")#set($last = $sitePath+$crumb.uri)#end#end
-
-    ]#set($sep = ",")#end
-
-  },
-  "_canonical": {#set($sep = "")#foreach($page in $pages)$sep
-    "$sitePath$page.uri": "$canonicalPath$page.uri"#set($sep = ",")
+#if ( $page.image )
+      "image": "",
 #end
-
-  }
+      "childs": [#set( $child_sep="")#foreach( $uri in $page.childs )$child_sep
+        "$uri"#set($child_sep=",")
+#end
+      ],
+      "crumbs": [#set( $crumb_sep="")#foreach( $uri in $page.crumbs )$crumb_sep
+        "$uri"#set($crumb_sep=",")
+#end
+      ]
+    }#set($page_sep=",")
+#end
+  ]
 }
-
-

All Pages

-

-

-

- - +MAVEN-NAVIGATION-END +--> +#end -- 2.39.5