Merge pull request #48 from k1LoW/hide-real-node-count-when-unload-no…

…des-yml hide real nodes count when unload nodes.yml
k1LoW · Jan 5, 2021 · 3a21d84 · 3a21d84
2 parents 0facb6f + 3508a36
commit 3a21d84
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/cmd/doc.go b/cmd/doc.go
@@ -290,9 +290,13 @@ func newConfig() (*config.Config, error) {
 	if err := cfg.LoadConfigFile(detectConfigPath(configPath)); err != nil {
 		return nil, err
 	}
-	for _, n := range nodeLists {
-		if err := cfg.LoadRealNodesFile(n); err != nil {
-			return nil, err
+	if len(nodeLists) == 0 {
+		cfg.HideRealNodes = true
+	} else {
+		for _, n := range nodeLists {
+			if err := cfg.LoadRealNodesFile(n); err != nil {
+				return nil, err
+			}
 		}
 	}
 	if err := cfg.Build(); err != nil {

diff --git a/cmd/draw.go b/cmd/draw.go
@@ -41,16 +41,8 @@ var drawCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		var o output.Output
 
-		cfg := config.New()
-		if err := cfg.LoadConfigFile(detectConfigPath(configPath)); err != nil {
-			return err
-		}
-		for _, n := range nodeLists {
-			if err := cfg.LoadRealNodesFile(n); err != nil {
-				return err
-			}
-		}
-		if err := cfg.Build(); err != nil {
+		cfg, err := newConfig()
+		if err != nil {
 			return err
 		}
 

diff --git a/ndiag_ndiag.ja.yml b/ndiag_ndiag.ja.yml
@@ -3,7 +3,6 @@ name: ndiag アーキテクチャ
 docPath: docs/arch.ja
 descPath: docs/ndiag.descriptions.ja
 hideLayers: true
-hideRealNodes: true
 hideLabelGroups: true
 graph:
   attrs:

diff --git a/ndiag_ndiag.yml b/ndiag_ndiag.yml
@@ -3,7 +3,6 @@ name: ndiag architecture
 docPath: docs/arch
 descPath: docs/ndiag.descriptions
 hideLayers: true
-hideRealNodes: true
 hideLabelGroups: true
 graph:
   attrs: