update url code

Author: coderj001

src/app/urlparser.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	"fmt"
+	"net/url"
 
 	"github.com/coderj001/go-wallheven/src"
 )
@@ -56,8 +57,11 @@ type Resolution struct {
 
 type Param struct {
 	Page        int
+	Query       string
 	CTage       string
 	PTage       string
+	Sorting     string
+	Color       string
 	Resolutions []Resolution
 }
 
@@ -82,9 +86,24 @@ func (p Param) String() string {
 		paramStr = rsStr
 	}
 
-	paramStr = fmt.Sprintf("%s&categories=%s", paramStr, p.CTage)
-	paramStr = fmt.Sprintf("%s&purity=%s", paramStr, p.PTage)
-	paramStr = fmt.Sprintf("%s&page=%d", paramStr, p.Page)
+	if p.Query != "" {
+		paramStr = fmt.Sprintf("%s&q=%s", paramStr, p.Query)
+	}
+	if p.Page != 0 {
+		paramStr = fmt.Sprintf("%s&page=%d", paramStr, p.Page)
+	}
+	if p.CTage != "" {
+		paramStr = fmt.Sprintf("%s&categories=%s", paramStr, p.CTage)
+	}
+	if p.PTage != "" {
+		paramStr = fmt.Sprintf("%s&purity=%s", paramStr, p.PTage)
+	}
+	if p.Sorting != "" {
+		paramStr = fmt.Sprintf("%s&sorting=%s", paramStr, p.Sorting)
+	}
+	if p.Color != "" {
+		paramStr = fmt.Sprintf("%s&colors=%s", paramStr, p.Color)
+	}
 
 	return paramStr
 }
@@ -93,11 +112,14 @@ func (p Param) getFullURL() string {
 	return src.BASE_CONFIG.GetURL(p.String())
 }
 
-func GetFullURL(page int, categories string, purity string, sorting string) (string, error) {
+func GetFullURL(page int, categories string, purity string, sorting string, color string, query string) (string, error) {
 	params := Param{
 		Page:        page,
 		CTage:       src.CTAGS[categories],
 		PTage:       src.PTAGS[purity],
+		Sorting:     src.SORTING[sorting],
+		Color:       color,
+		Query:       url.QueryEscape(query),
 		Resolutions: []Resolution{},
 	}
 	return params.getFullURL(), nil

src/cmd/root.go

@@ -9,10 +9,14 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var page int
-var categories string
-var purity string
-var sorting string
+var (
+	page       int
+	query      string
+	categories string
+	purity     string
+	sorting    string
+	colors     string
+)
 
 // var resolutions string
 
@@ -22,11 +26,7 @@ var rootCmd = &cobra.Command{
 	Short:   "go-wallhaven - A command line tool to easily download wallpapers from wallhaven.cc",
 	Long:    `go-wallhaven: A seamless solution for downloading and managing wallpapers from wallhaven.cc right from your command line`,
 	Run: func(cmd *cobra.Command, args []string) {
-		// fmt.Printf("Page: %d\n", page)
-		// fmt.Printf("Categories: %s\n", categories)
-		// fmt.Printf("Purity: %s\n", purity)
-		// fmt.Printf("Sorting: %s\n", sorting)
-		url, _ := app.GetFullURL(page, categories, purity, sorting)
+		url, _ := app.GetFullURL(page, categories, purity, sorting, colors, query)
 		fmt.Println(url)
 	},
 }
@@ -45,7 +45,7 @@ func GetRoot() *cobra.Command {
 
 func init() {
 	GetRoot().Flags().IntVarP(&page, "page", "n", 1, "Total Numbers Of Pages")
-	GetRoot().Flags().StringVarP(&categories, "categories", "c", "all", `
+	GetRoot().Flags().StringVarP(&categories, "categories", "t", "all", `
 			Categories Filter:
 			all     - Every wallpaper.
 			general - For 'general' wallpapers only.
@@ -64,7 +64,7 @@ func init() {
 			sn      - For 'Sketchy' and 'NSFW'
 			all     - For 'SFW', 'Sketchy' and 'NSFW'
 	`)
-	GetRoot().Flags().StringVarP(&sorting, "sorting", "s", "", `
+	GetRoot().Flags().StringVarP(&sorting, "sorting", "s", "relevance", `
 		Sorting Filter:
 		relevance    - For sorting the results based on relevance to the search query
 		random       - For displaying random wallpapers
@@ -75,4 +75,6 @@ func init() {
 		hot          - For sorting the results based on hotness
 
 	`)
+	GetRoot().Flags().StringVarP(&colors, "colors", "c", "", `Select Color Hex Code eg. 663399`)
+	GetRoot().Flags().StringVarP(&query, "query", "q", "", `Search Image For Query eg. Dark Knight`)
 }

src/config.go

@@ -36,6 +36,16 @@ var CTAGS = map[string]string{
 	"gp":      "101",
 }
 
+var SORTING = map[string]string{
+	"relevance":  "relevance",
+	"random":     "random",
+	"date_added": "date_added",
+	"favorites":  "favorites",
+	"views":      "views",
+	"toplist":    "toplist",
+	"hot":        "hot",
+}
+
 func init() {
 	err := godotenv.Load()
 	if err != nil {
@@ -56,6 +66,6 @@ func (c Config) getAPIKey() string {
 }
 
 func (c Config) GetURL(query string) string {
-	return c.getAPIKey() + "&" + query
+	return c.getAPIKey() + query
 
 }