Merge pull request #1394 from MichaelRossner/patch-3

Update asciidoc2confluence.groovy
docToolchain · May 10, 2024 · cfaca68 · cfaca68
2 parents 3935c05 + bb76cc9
commit cfaca68
Showing 1 changed file with 35 additions and 36 deletions.
diff --git a/core/src/main/groovy/org/docToolchain/scripts/asciidoc2confluence.groovy b/core/src/main/groovy/org/docToolchain/scripts/asciidoc2confluence.groovy
@@ -320,37 +320,36 @@ def rewriteOpenAPI (org.jsoup.nodes.Element body) {
                     .replaceWith(new TextNode(rawYaml))
         }
     } else if (config.confluence.useOpenapiMacro == 'open-api') {
+        def includeURL=null
 
-              def includeURL=null
-
-              for (Element e : body.select('div .listingblock.openapi')) {
-                  for (String s : e.className().split(" ")) {
-                      if (s.startsWith("url")) {
-                          //include the link to the URL for the macro
-                          includeURL = s.replace('url:', '')
-                     }
-                  }
-              }
-
-              body.select('div.openapi  pre > code').each { code ->
-                  def parent=code.parent()
-                  def rawYaml=code.wholeText()
-
-                  code.parent()
-                      .wrap('<ac:structured-macro ac:name="open-api" ac:schema-version="1" data-layout="default" ac:macro-id="4302c9d8-fca4-4f14-99a9-9885128870fa"></ac:structured-macro>')
-                      .unwrap()
-
-                  if (includeURL!=null)
-                  {
-                      code.before('<ac:parameter ac:name="url">'+includeURL+'</ac:parameter>')
-                  }
-                  else {
-                      //default: show download button
-                      code.before('<ac:parameter ac:name="showDownloadButton">true</ac:parameter>')
-                      code.wrap("<ac:plain-text-body>${CDATA_PLACEHOLDER_START}${CDATA_PLACEHOLDER_END}</ac:plain-text-body>")
-                          .replaceWith(new TextNode(rawYaml))
-                  }
-              }
+        for (Element e : body.select('div .listingblock.openapi')) {
+            for (String s : e.className().split(" ")) {
+                if (s.startsWith("url")) {
+                    //include the link to the URL for the macro
+                    includeURL = s.replace('url:', '')
+                }
+            }
+        }
+
+        body.select('div.openapi  pre > code').each { code ->
+            def parent=code.parent()
+            def rawYaml=code.wholeText()
+
+            code.parent()
+                .wrap('<ac:structured-macro ac:name="open-api" ac:schema-version="1" data-layout="default" ac:macro-id="4302c9d8-fca4-4f14-99a9-9885128870fa"></ac:structured-macro>')
+                .unwrap()
+
+            if (includeURL!=null)
+            {
+                code.before('<ac:parameter ac:name="url">'+includeURL+'</ac:parameter>')
+            }
+            else {
+                //default: show download button
+                code.before('<ac:parameter ac:name="showDownloadButton">true</ac:parameter>')
+                code.wrap("<ac:plain-text-body>${CDATA_PLACEHOLDER_START}${CDATA_PLACEHOLDER_END}</ac:plain-text-body>")
+                    .replaceWith(new TextNode(rawYaml))
+            }
+        }
     }
 }
 
@@ -466,14 +465,14 @@ def parseBody(body, anchors, pageAnchors) {
                 newUrl = sanitizedBaseUrl + src
                 fileName = java.net.URLDecoder.decode((src.tokenize('/')[-1]),"UTF-8")
             }
-          newUrl = java.net.URLDecoder.decode(newUrl,"UTF-8")
-          println "    image: "+newUrl
-          uploads <<  [0,newUrl,fileName,"automatically uploaded"]
-          img.after("<ac:image ac:align=\"${imgAlign}\" ac:width=\"${imgWidth}\"><ri:attachment ri:filename=\"${fileName}\"/></ac:image>")
+            newUrl = java.net.URLDecoder.decode(newUrl,"UTF-8")
+            println "    image: "+newUrl
+            uploads <<  [0,newUrl,fileName,"automatically uploaded"]
+            img.after("<ac:image ac:align=\"${imgAlign}\" ac:width=\"${imgWidth}\"><ri:attachment ri:filename=\"${fileName}\"/></ac:image>")
         }
         // it is an online image, so we have to use the ri:url tag
         else {
-          img.after("<ac:image ac:align=\"imgAlign\" ac:width=\"${imgWidth}\"><ri:url ri:value=\"${src}\"/></ac:image>")
+            img.after("<ac:image ac:align=\"imgAlign\" ac:width=\"${imgWidth}\"><ri:url ri:value=\"${src}\"/></ac:image>")
         }
         img.remove()
     }
@@ -777,7 +776,7 @@ if(config.confluence.inputHtmlFolder) {
         if (fileName.isFile()){
             def map = [file: config.confluence.inputHtmlFolder+fileName.getName()]
             config.confluence.input.add(map)
-         }
+        }
     }
 }