From 73e24cb9ebec71678f2ed631e5a3af7fb99ee5f4 Mon Sep 17 00:00:00 2001 From: Phodal Huang Date: Sun, 29 Dec 2019 11:31:22 +0800 Subject: [PATCH] refactor: remove duplicated code --- cmd/call.go | 11 +++-------- cmd/rcall.go | 13 ++++--------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/cmd/call.go b/cmd/call.go index a6a5ca7..8115a9a 100644 --- a/cmd/call.go +++ b/cmd/call.go @@ -1,14 +1,14 @@ package cmd import ( + "encoding/json" + "github.com/phodal/coca/cmd/cmd_util" "github.com/phodal/coca/config" . "github.com/phodal/coca/core/domain/call_graph" "github.com/phodal/coca/core/models" . "github.com/phodal/coca/core/support" - "encoding/json" "github.com/spf13/cobra" "log" - "os/exec" "strings" ) @@ -46,12 +46,7 @@ var callGraphCmd = &cobra.Command{ } WriteToCocaFile("call.dot", content) - - cmd := exec.Command("dot", []string{"-Tsvg", config.CocaConfig.ReporterPath + "/call.dot", "-o", config.CocaConfig.ReporterPath + "/call.svg"}...) - _, err := cmd.CombinedOutput() - if err != nil { - log.Fatalf("cmd.Run() failed with %s\n", err) - } + cmd_util.ConvertToSvg("call") } }, } diff --git a/cmd/rcall.go b/cmd/rcall.go index 07a5acd..5751b18 100644 --- a/cmd/rcall.go +++ b/cmd/rcall.go @@ -1,14 +1,14 @@ package cmd import ( + "encoding/json" + "fmt" + "github.com/phodal/coca/cmd/cmd_util" "github.com/phodal/coca/config" "github.com/phodal/coca/core/domain/call_graph/rcall" . "github.com/phodal/coca/core/support" - "encoding/json" - "fmt" "github.com/spf13/cobra" "log" - "os/exec" "strings" ) @@ -51,12 +51,7 @@ var reverseCmd = &cobra.Command{ } WriteToCocaFile("rcall.dot", content) - - acmd := exec.Command("dot", []string{"-Tsvg", config.CocaConfig.ReporterPath + "/rcall.dot", "-o", config.CocaConfig.ReporterPath + "/rcall.svg"}...) - output, err := acmd.CombinedOutput() - if err != nil { - log.Fatalf("cmd.Run() failed with %s%s\n", err, string(output)) - } + cmd_util.ConvertToSvg("call") }, } -- GitLab