refactor code

cmd/book.go

@@ -25,7 +25,8 @@ Example:
 			os.Exit(0)
 		}
 
-		if os.Getenv("HARDCOVER_API_KEY") == "" {
+		apiKey := os.Getenv("HARDCOVER_API_KEY")
+		if apiKey == "" {
 			fmt.Println("HARDCOVER_API_KEY environment variable must be set")
 			fmt.Println("get an API key at https://hardcover.app/account/api")
 			os.Exit(0)
@@ -37,7 +38,7 @@ Example:
 		}
 		tmplPath := utils.GetTmplPath(tmplName)
 
-		hits := api.Query(args)
+		hits := api.Query(args, apiKey)
 		book := internal.Chooser(hits)
 		result := internal.Format(book, tmplPath)
 

internal/api/query.go

@@ -3,7 +3,6 @@ package api
 import (
 	"context"
 	"log"
-	"os"
 	"strings"
 
 	"github.com/machinebox/graphql"
@@ -52,7 +51,7 @@ type QueryResponse struct {
 	}
 }
 
-func Query(args []string) Hits {
+func Query(args []string, apiKey string) Hits {
 	// set endpoint
 	client := graphql.NewClient("https://api.hardcover.app/v1/graphql")
 
@@ -70,7 +69,7 @@ func Query(args []string) Hits {
 
 	// set header fields
 	req.Header.Set("content-type", "application/json")
-	req.Header.Set("authorization", os.Getenv("HARDCOVER_API_KEY"))
+	req.Header.Set("authorization", apiKey)
 
 	// define a Context for the request
 	ctx := context.Background()

internal/format.go

@@ -10,34 +10,30 @@ import (
 	"github.com/hatredholder/mediabrowse/internal/templates"
 )
 
-func Process(t *template.Template, vars interface{}) string {
+func processTmpl(book api.Document, tmpl *template.Template) string {
 	var tmplBytes bytes.Buffer
 
-	err := t.Execute(&tmplBytes, vars)
+	err := tmpl.Execute(&tmplBytes, book)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	return tmplBytes.String()
 }
 
-func ProcessFile(tmplPath string, funcMap template.FuncMap, vars interface{}) string {
+func Format(book api.Document, tmplPath string) string {
 	tmplFile := filepath.Base(tmplPath)
 
-	tmpl, err := template.New(tmplFile).Funcs(funcMap).ParseFiles(tmplPath)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	return Process(tmpl, vars)
-}
-
-func Format(book api.Document, tmplPath string) string {
 	funcMap := template.FuncMap{
 		"commify":      templates.Commify,
 		"truncate":     templates.Truncate,
 		"formatRating": templates.FormatRating,
 	}
 
-	return ProcessFile(tmplPath, funcMap, book)
+	tmpl, err := template.New(tmplFile).Funcs(funcMap).ParseFiles(tmplPath)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return processTmpl(book, tmpl)
 }