fixed bug + added more debug info pzdr

hspsh · Apr 17, 2024 · b75fcff · b75fcff
1 parent b236f20
commit b75fcff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/main/kotlin/sh/hsp/techtree/graphviz/DSLConverter.kt b/src/main/kotlin/sh/hsp/techtree/graphviz/DSLConverter.kt
@@ -10,16 +10,16 @@ class DSLConverter {
             .map { registerNode(it) }
             .collect(Collectors.joining(" "))
 
-        return "digraph { graph [splines=\"ortho\"] node [shape=\"box\"] edge [dir=\"back\"] $nodesAsDSL }"
+        return "digraph { graph [splines=\"ortho\"] node [shape=\"box\"] edge [dir=\"back\"] \n $nodesAsDSL }"
     }
 
     private fun registerNode(node: TreeNode): String {
-        val pathsToChildren = node.requires?.apply {
-            stream()
+        val pathsToChildren = node.requires?.let {require ->
+            require.stream()
                 .map { "${node.title.escaped()} -> ${it.escaped()}" }
                 .collect(Collectors.joining(" "))
-        } ?: listOf()
-        return "${node.title.escaped()} ${node.link?.let { "[ href=${it.escaped()} fontcolor=blue]" } ?: ""} $pathsToChildren"
+        } ?: ""
+        return "${node.title.escaped()} ${node.link?.let { "[ href=${it.escaped()} fontcolor=blue ]" } ?: ""} $pathsToChildren \n"
     }
 
     private fun String.escaped(): String = "\"$this\""

diff --git a/src/main/kotlin/sh/hsp/techtree/graphviz/GraphvizCommandRunner.kt b/src/main/kotlin/sh/hsp/techtree/graphviz/GraphvizCommandRunner.kt
@@ -8,6 +8,7 @@ class GraphvizCommandRunner {
     fun run(dsl: String) {
         ProcessBuilder()
             .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+            .redirectError(ProcessBuilder.Redirect.INHERIT)
             .command("dot", "-Tsvg").start()
             .apply {
                 outputStream.writer()

diff --git a/src/main/kotlin/sh/hsp/techtree/graphviz/SimpleGraphvizConverter.kt b/src/main/kotlin/sh/hsp/techtree/graphviz/SimpleGraphvizConverter.kt
@@ -9,6 +9,7 @@ class SimpleGraphvizConverter(
 ) : GraphvizConverter {
     override fun convert(model: TreeModel) {
         val dsl = dslConverter.convert(model)
+        System.err.println(dsl)
         commandRunner.run(dsl)
     }
 }