Merge pull request #154 from jp7677/diagram-exists-check

Fix diagram exists check
avisi-cloud · Feb 28, 2023 · 5c2f5e8 · 5c2f5e8
2 parents bc7b321 + b1da43f
commit 5c2f5e8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/kotlin/nl/avisi/structurizr/site/generatr/ServeCommand.kt b/src/main/kotlin/nl/avisi/structurizr/site/generatr/ServeCommand.kt
@@ -66,12 +66,14 @@ class ServeCommand : Subcommand("serve", "Start a development server") {
             val ms = measureTimeMillis {
                 broadcast("site-updating")
                 val workspace = createStructurizrWorkspace(File(workspaceFile))
+
+                println("Generating idex page...")
+                generateRedirectingIndexPage(File(siteDir), branch)
+                println("Copying assets...")
+                copySiteWideAssets(File(siteDir))
                 println("Generating diagrams...")
                 generateDiagrams(workspace, exportDir)
-
                 println("Generating site...")
-                copySiteWideAssets(File(siteDir))
-                generateRedirectingIndexPage(File(siteDir), branch)
                 generateSite(
                     "0.0.0",
                     workspace,

diff --git a/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/DiagramGenerator.kt b/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/DiagramGenerator.kt
@@ -25,9 +25,9 @@ fun generateDiagrams(workspace: Workspace, exportDir: File) {
             val plantUMLFile = File(pumlDir, "${diagram.key}.puml")
             if (!plantUMLFile.exists() || plantUMLFile.readText() != diagram.definition) {
                 println("${diagram.key}...")
-                saveAsPUML(diagram, plantUMLFile)
                 saveAsSvg(diagram, svgDir)
                 saveAsPng(diagram, pngDir)
+                saveAsPUML(diagram, plantUMLFile)
             } else {
                 println("${diagram.key} UP-TO-DATE")
             }
@@ -43,8 +43,8 @@ fun generateDiagramWithElementLinks(view: View, url: String, exportDir: File): S
     val name = "${diagram.key}-${view.key}"
     val plantUMLFile = File(pumlDir, "$name.puml")
     if (!plantUMLFile.exists() || plantUMLFile.readText() != diagram.definition) {
-        saveAsPUML(diagram, plantUMLFile)
         saveAsSvg(diagram, svgDir, name)
+        saveAsPUML(diagram, plantUMLFile)
     } else {
         println("$name UP-TO-DATE")
     }