fix: pass generated filename as arg

Signed-off-by: ismael FALL <ismael.fall@epitech.eu>
moul · Apr 13, 2023 · a6bc25b · a6bc25b
1 parent 2b2d9b6
commit a6bc25b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/cmd/depviz/main.go b/cmd/depviz/main.go
@@ -11,12 +11,6 @@ import (
 	"os/signal"
 	"time"
 
-	"github.com/cayleygraph/cayley"
-	"github.com/cayleygraph/cayley/graph"
-	_ "github.com/cayleygraph/cayley/graph/kv/bolt"
-	"github.com/cayleygraph/cayley/schema"
-	"github.com/oklog/run"
-	"github.com/peterbourgon/ff/v3/ffcli"
 	"go.uber.org/zap"
 	"moul.io/banner"
 	"moul.io/depviz/v3/pkg/dvcore"
@@ -26,6 +20,13 @@ import (
 	"moul.io/srand"
 	"moul.io/u"
 	"moul.io/zapconfig"
+
+	"github.com/cayleygraph/cayley"
+	"github.com/cayleygraph/cayley/graph"
+	_ "github.com/cayleygraph/cayley/graph/kv/bolt"
+	"github.com/cayleygraph/cayley/schema"
+	"github.com/oklog/run"
+	"github.com/peterbourgon/ff/v3/ffcli"
 )
 
 var (
@@ -78,6 +79,7 @@ var (
 	graphvizFlags = flag.NewFlagSet("graphviz", flag.ExitOnError)
 	graphvizLabel = graphvizFlags.String("label", "", "label to use for the graph")
 	graphvizType  = graphvizFlags.String("type", "svg", "output type (svg, png, dot)")
+	graphvizFile  = graphvizFlags.String("file", "", "output file (default: stdout)")
 )
 
 func main() {
@@ -376,6 +378,7 @@ func execGenGraphviz(ctx context.Context, args []string) error {
 		GenOpts: genOpts,
 		Label:   *graphvizLabel,
 		Type:    *graphvizType,
+		File:    *graphvizFile,
 	}
 
 	return dvcore.GenGraphviz(store, args, opts)

diff --git a/pkg/dvcore/graphviz.go b/pkg/dvcore/graphviz.go
@@ -2,16 +2,18 @@ package dvcore
 
 import (
 	"fmt"
+	"os"
 	"strings"
 
-	"github.com/cayleygraph/cayley"
-	"github.com/cayleygraph/quad"
-	"github.com/goccy/go-graphviz"
-	"github.com/goccy/go-graphviz/cgraph"
 	"go.uber.org/zap"
 	"moul.io/depviz/v3/pkg/dvmodel"
 	"moul.io/depviz/v3/pkg/dvparser"
 	"moul.io/depviz/v3/pkg/dvstore"
+
+	"github.com/cayleygraph/cayley"
+	"github.com/cayleygraph/quad"
+	"github.com/goccy/go-graphviz"
+	"github.com/goccy/go-graphviz/cgraph"
 )
 
 type GraphvizOpts struct {
@@ -20,6 +22,7 @@ type GraphvizOpts struct {
 	// graphviz
 	Label string
 	Type  string
+	File  string
 }
 
 func GenGraphviz(h *cayley.Handle, args []string, opts GraphvizOpts) error {
@@ -106,7 +109,10 @@ func GenGraphviz(h *cayley.Handle, args []string, opts GraphvizOpts) error {
 			_ = edge
 		}
 	}
-	return g.RenderFilename(graph, graphviz.Format(opts.Type), "graph."+opts.Type)
+	if opts.File == "" {
+		return g.Render(graph, graphviz.Format(opts.Type), os.Stdout)
+	}
+	return g.RenderFilename(graph, graphviz.Format(opts.Type), opts.File)
 }
 
 func fmtIRI(s quad.IRI) string {