From 976e2fa613d897be04fafc83eba9175222ddd547 Mon Sep 17 00:00:00 2001
From: Manfred Touron <m@42.am>
Date: Thu, 20 Sep 2018 11:24:25 +0200
Subject: [PATCH] feat: make the generated graph more compact

---
 graphviz.go | 27 ++++++++++++++++-----------
 issue.go    |  2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/graphviz.go b/graphviz.go
index bf4ea14af..b9fb4dc0b 100644
--- a/graphviz.go
+++ b/graphviz.go
@@ -41,7 +41,9 @@ func graphviz(issues Issues, opts *runOptions) (string, error) {
 	panicIfErr(g.SetName("G"))
 	attrs := map[string]string{}
 	attrs["truecolor"] = "true"
-	attrs["overlap"] = "false"
+	attrs["overlap"] = "compress"
+	attrs["sep"] = "-0.7"
+	attrs["compound"] = "true"
 	attrs["splines"] = "true"
 	attrs["rankdir"] = "RL"
 	attrs["ranksep"] = "0.3"
@@ -79,7 +81,7 @@ func graphviz(issues Issues, opts *runOptions) (string, error) {
 		if issue.Hidden {
 			continue
 		}
-		parent := fmt.Sprintf("anon%d", issue.Weight())
+		parent := fmt.Sprintf("cluster_weight_%d", issue.Weight())
 		if issue.IsOrphan || !issue.LinkedWithEpic {
 			if len(issue.DependsOn) > 0 || len(issue.Blocks) > 0 {
 				parent = "cluster_orphans_with_links"
@@ -149,7 +151,10 @@ func graphviz(issues Issues, opts *runOptions) (string, error) {
 		}
 	}
 	if hasOrphansWithLinks {
-		panicIfErr(g.AddSubGraph("G", "cluster_orphans_with_links", map[string]string{"label": escape("orphans with links"), "style": "dashed"}))
+		attrs := map[string]string{}
+		attrs["label"] = escape("orphans with links")
+		attrs["style"] = "dashed"
+		panicIfErr(g.AddSubGraph("G", "cluster_orphans_with_links", attrs))
 		stats["subgraphs"]++
 
 		panicIfErr(g.AddNode("cluster_orphans_with_links", "placeholder_orphans_with_links", invisStyle))
@@ -166,19 +171,19 @@ func graphviz(issues Issues, opts *runOptions) (string, error) {
 
 	// set weights clusters and placeholders
 	for _, weight := range weights {
-		clusterName := fmt.Sprintf("anon%d", weight)
-		panicIfErr(g.AddSubGraph("G", clusterName, map[string]string{"rank": "same"}))
+		clusterName := fmt.Sprintf("cluster_weight_%d", weight)
+		attrs := invisStyle
+		attrs["rank"] = "same"
+		panicIfErr(g.AddSubGraph("G", clusterName, attrs))
 		stats["subgraphs"]++
 
-		//clusterName := fmt.Sprintf("cluster_w%d", weight)
-		//panicIfErr(g.AddSubGraph("G", clusterName, map[string]string{"label": fmt.Sprintf("w%d", weight)}))
+		attrs = invisStyle
+		attrs["shape"] = "none"
+		attrs["label"] = fmt.Sprintf(`"weight=%d"`, weight)
 		panicIfErr(g.AddNode(
 			clusterName,
 			fmt.Sprintf("placeholder_%d", weight),
-			map[string]string{
-				"shape": "none",
-				"label": fmt.Sprintf(`"weight=%d"`, weight),
-			},
+			attrs,
 		))
 		stats["nodes"]++
 	}
diff --git a/issue.go b/issue.go
index d18acc98a..0921ed280 100644
--- a/issue.go
+++ b/issue.go
@@ -383,7 +383,7 @@ func (issues Issues) prepare() error {
 		blocksRegex, _           = regexp.Compile(`(?i)(blocks|block|address|addresses|part of|child of|fix|fixes) ([a-z0-9:/_.-]+issues/[0-9]+|[a-z0-9:/_.-]+#[0-9]+|[a-z0-9/_-]*#[0-9]+)`)
 		isDuplicateRegex, _      = regexp.Compile(`(?i)(duplicates|duplicate|dup of|dup|duplicate of) ([a-z0-9:/_.-]+issues/[0-9]+|[a-z0-9:/_.-]+#[0-9]+|[a-z0-9/_-]*#[0-9]+)`)
 		weightMultiplierRegex, _ = regexp.Compile(`(?i)(depviz.weight_multiplier[:= ]+)([0-9]+)`)
-		baseWeightRegex, _       = regexp.Compile(`(?i)(depviz.base_weight[:= ]+)([0-9]+)`)
+		baseWeightRegex, _       = regexp.Compile(`(?i)(depviz.base_weight|depviz.weight)[:= ]+([0-9]+)`)
 		hideFromRoadmapRegex, _  = regexp.Compile(`(?i)(depviz.hide)`) // FIXME: use label
 	)