added better formatting

cmd/radium/cli.go

@@ -34,7 +34,8 @@ and replace queries with solutions as they come in!
 
 	rootCmd.PersistentFlags().BoolP("ugly", "u", false, "Print raw output as yaml or json")
 	rootCmd.PersistentFlags().Bool("json", false, "Print output as JSON")
-	rootCmd.PersistentFlags().StringSlice("sources", nil, "Enable sources")
+	rootCmd.PersistentFlags().StringSliceP("sources", "s", nil, "Enable sources")
+	rootCmd.PersistentFlags().String("strategy", "1st", "Default strategy to use")
 
 	rootCmd.AddCommand(newServeCmd(cfg))
 	rootCmd.AddCommand(newQueryCmd(cfg))

cmd/radium/query.go

@@ -20,9 +20,7 @@ func newQueryCmd(cfg *config) *cobra.Command {
 	}
 
 	var attribs []string
-	var strategy string
 	cmd.Flags().StringSliceVarP(&attribs, "attr", "a", []string{}, "Attributes to narrow the search scope")
-	cmd.Flags().StringVarP(&strategy, "strategy", "s", "1st", "Strategy to use for executing sources")
 
 	cmd.Run = func(_ *cobra.Command, args []string) {
 		query := radium.Query{}
@@ -41,6 +39,11 @@ func newQueryCmd(cfg *config) *cobra.Command {
 			}
 		}
 
+		strategy, err := cmd.Flags().GetString("strategy")
+		if err != nil {
+			strategy = "1st"
+		}
+
 		ctx := context.Background()
 		ins := getNewRadiumInstance(*cfg)
 		rs, err := ins.Search(ctx, query, strategy)

cmd/radium/server.go

@@ -47,7 +47,11 @@ by passing '--clipboard' or '-C' option and setting '--addr' blank.
 		ins := getNewRadiumInstance(*cfg)
 
 		if addr != "" {
-			srv := radium.NewServer(ins)
+			ds, err := cmd.Flags().GetString("strategy")
+			if err != nil {
+				ds = "1st"
+			}
+			srv := radium.NewServer(ins, ds)
 			wg.Add(1)
 			go func(wg *sync.WaitGroup) {
 				ins.Infof("starting server on '%s'...", addr)

cmd/radium/util.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/shivylp/radium"
 	"github.com/spf13/cobra"
@@ -29,7 +30,12 @@ func tryPrettyPrint(v interface{}) {
 		if len(results) == 1 {
 			tryPrettyPrint(results[0])
 		} else {
-			rawDump(results, false)
+			for num, res := range results {
+				fmt.Printf("%d. %s [source=%s]\n", num+1, strings.TrimSpace(res.Title), res.Source)
+				fmt.Println(strings.Repeat("-", 20))
+				fmt.Println(res.Content)
+				fmt.Println(strings.Repeat("=", 20))
+			}
 		}
 	case error:
 		fmt.Printf("error: %s\n", v)

server.go

@@ -10,10 +10,11 @@ import (
 
 // NewServer initializes the http API server with given
 // instance of Radium
-func NewServer(ins *Instance) *Server {
+func NewServer(ins *Instance, defaultStrategy string) *Server {
 	srv := &Server{}
 
 	srv.ins = ins
+	srv.defStrategy = defaultStrategy
 	srv.router = mux.NewRouter()
 	srv.router.HandleFunc("/search", srv.handleSearch)
 	srv.router.HandleFunc("/sources", srv.handleSources)
@@ -23,8 +24,9 @@ func NewServer(ins *Instance) *Server {
 
 // Server represents an instance of HTTP API server
 type Server struct {
-	ins    *Instance
-	router *mux.Router
+	ins         *Instance
+	router      *mux.Router
+	defStrategy string
 }
 
 func (srv Server) ServeHTTP(wr http.ResponseWriter, req *http.Request) {
@@ -37,7 +39,7 @@ func (srv Server) handleSearch(wr http.ResponseWriter, req *http.Request) {
 	query := Query{}
 	strategy := req.FormValue("strategy")
 	if strategy == "" {
-		strategy = "1st"
+		strategy = srv.defStrategy
 	}
 
 	query.Text = req.FormValue("q")