feat: image search

src/cli/climode.go

@@ -17,7 +17,7 @@ import (
 func printResults(results []result.Result) {
 	fmt.Print("\n\tThe Search Results:\n\n")
 	for _, r := range results {
-		fmt.Printf("%v (%.2f) -----\n\t\"%v\"\n\t\"%v\"\n\t\"%v\"\n\t-", r.Rank, r.Score, r.Title, r.URL, r.Description)
+		fmt.Printf("%v (%.2f) -----\n\t%q\n\t%q\n\t%q\n\n%+v\n\t-", r.Rank, r.Score, r.Title, r.URL, r.Description, r)
 		for seInd := uint8(0); seInd < r.TimesReturned; seInd++ {
 			fmt.Printf("%v", r.EngineRanks[seInd].SearchEngine.ToLower())
 			if seInd != r.TimesReturned-1 {

src/config/defaults.go

@@ -44,6 +44,9 @@ func NewSettings() map[engines.Name]Settings {
 		engines.BING: {
 			Shortcut: "bi",
 		},
+		engines.BINGIMAGES: {
+			Shortcut: "biimg",
+		},
 		engines.BRAVE: {
 			Shortcut: "br",
 		},
@@ -56,6 +59,9 @@ func NewSettings() map[engines.Name]Settings {
 		engines.GOOGLE: {
 			Shortcut: "g",
 		},
+		engines.GOOGLEIMAGES: {
+			Shortcut: "gimg",
+		},
 		engines.GOOGLESCHOLAR: {
 			Shortcut: "gs",
 		},
@@ -114,6 +120,13 @@ func NewGeneral() []engines.Name {
 	}
 }
 
+func NewImage() []engines.Name {
+	return []engines.Name{
+		engines.BINGIMAGES,
+		engines.GOOGLEIMAGES,
+	}
+}
+
 func NewInfo() []engines.Name {
 	return []engines.Name{
 		engines.BING,
@@ -158,6 +171,14 @@ func New() *Config {
 					PageTimeout: 1000 * time.Millisecond,
 				},
 			},
+			category.IMAGE: {
+				Engines: NewImage(),
+				Ranking: NewRanking(),
+				Timings: Timings{
+					Timeout:     1500 * time.Millisecond,
+					PageTimeout: 1500 * time.Millisecond,
+				},
+			},
 			category.INFO: {
 				Engines: NewInfo(),
 				Ranking: NewRanking(),

src/router/search.go

@@ -50,37 +50,37 @@ func Search(c *gin.Context, conf *config.Config, db cache.DB) error {
 	} else {
 		maxPages, pageserr := strconv.Atoi(pages)
 		if pageserr != nil {
-			c.String(http.StatusUnprocessableEntity, fmt.Sprintf("Cannot convert pages value (\"%v\") to int", pages))
-			return fmt.Errorf("router.Search(): cannot convert pages value \"%v\" to int: %w", pages, pageserr)
+			c.String(http.StatusUnprocessableEntity, fmt.Sprintf("Cannot convert pages value (%q) to int", pages))
+			return fmt.Errorf("router.Search(): cannot convert pages value %q to int: %w", pages, pageserr)
 		}
 
 		visitPages, deeperr := strconv.ParseBool(deepSearch)
 		if deeperr != nil {
-			c.String(http.StatusUnprocessableEntity, fmt.Sprintf("Cannot convert deep value (\"%v\") to bool", deepSearch))
-			return fmt.Errorf("router.Search(): cannot convert deep value \"%v\" to int: %w", deepSearch, deeperr)
+			c.String(http.StatusUnprocessableEntity, fmt.Sprintf("Cannot convert deep value (%q) to bool", deepSearch))
+			return fmt.Errorf("router.Search(): cannot convert deep value %q to int: %w", deepSearch, deeperr)
 		}
 
 		if lerr := engines.ValidateLocale(locale); lerr != nil {
-			c.String(http.StatusUnprocessableEntity, fmt.Sprintf("Invalid locale value (\"%v\"), should be of the form \"en_US\"", locale))
-			return fmt.Errorf("router.Search(): invalid locale value \"%v\": %w", locale, lerr)
+			c.String(http.StatusUnprocessableEntity, fmt.Sprintf("Invalid locale value (%q), should be of the form \"en_US\"", locale))
+			return fmt.Errorf("router.Search(): invalid locale value %q: %w", locale, lerr)
 		}
 
 		ccateg = category.SafeFromString(categ)
 		if ccateg == category.UNDEFINED {
-			c.String(http.StatusUnprocessableEntity, fmt.Sprintf("Invalid category value (\"%v\")", categ))
-			return fmt.Errorf("router.Search(): invalid category value \"%v\"", categ)
+			c.String(http.StatusUnprocessableEntity, fmt.Sprintf("Invalid category value (%q)", categ))
+			return fmt.Errorf("router.Search(): invalid category value %q", categ)
 		}
 
 		safeSearchB, safeerr := strconv.ParseBool(safesearch)
 		if safeerr != nil {
-			c.String(http.StatusUnprocessableEntity, fmt.Sprintf("Cannot convert safesearch value (\"%v\") to bool", safesearch))
-			return fmt.Errorf("router.Search(): cannot convert safesearch value \"%v\" to bool: %w", safesearch, safeerr)
+			c.String(http.StatusUnprocessableEntity, fmt.Sprintf("Cannot convert safesearch value (%q) to bool", safesearch))
+			return fmt.Errorf("router.Search(): cannot convert safesearch value %q to bool: %w", safesearch, safeerr)
 		}
 
 		isMobile, mobileerr := strconv.ParseBool(mobile)
 		if mobileerr != nil {
-			c.String(http.StatusUnprocessableEntity, fmt.Sprintf("Cannot convert mobile value (\"%v\") to bool", mobile))
-			return fmt.Errorf("router.Search(): cannot convert mobile value \"%v\" to bool: %w", mobile, mobileerr)
+			c.String(http.StatusUnprocessableEntity, fmt.Sprintf("Cannot convert mobile value (%q) to bool", mobile))
+			return fmt.Errorf("router.Search(): cannot convert mobile value %q to bool: %w", mobile, mobileerr)
 		}
 
 		options := engines.Options{

src/search/bucket/addresult.go

@@ -29,7 +29,7 @@ func AddSEResult(seResult *result.RetrievedResult, seName engines.Name, relay *R
 			Description:   seResult.Description,
 			EngineRanks:   engineRanks,
 			TimesReturned: 1,
-			Response:      nil,
+			ImageResult:   seResult.ImageResult,
 		}
 
 		relay.Mutex.Lock()

src/search/bucket/makeresult.go

@@ -5,18 +5,61 @@ import (
 	"github.com/hearchco/hearchco/src/search/result"
 )
 
-func MakeSEResult(urll string, title string, description string, searchEngineName engines.Name, sePage int, seOnPageRank int) *result.RetrievedResult {
+func MakeSEResult(
+	urll, title, desc string,
+	seName engines.Name, sePage, seOnPageRank int,
+) *result.RetrievedResult {
+
 	ser := result.RetrievedRank{
-		SearchEngine: searchEngineName,
+		SearchEngine: seName,
 		Rank:         0,
 		Page:         uint(sePage),
 		OnPageRank:   uint(seOnPageRank),
 	}
+
 	res := result.RetrievedResult{
 		URL:         urll,
 		Title:       title,
-		Description: description,
+		Description: desc,
 		Rank:        ser,
 	}
+
+	return &res
+}
+
+func MakeSEImageResult(
+	urll, title, desc string,
+	src, srcUrl, thmbUrl string,
+	origH, origW, thmbH, thmbW int,
+	seName engines.Name, sePage, seOnPageRank int,
+) *result.RetrievedResult {
+
+	ser := result.RetrievedRank{
+		SearchEngine: seName,
+		Rank:         0,
+		Page:         uint(sePage),
+		OnPageRank:   uint(seOnPageRank),
+	}
+
+	res := result.RetrievedResult{
+		URL:         urll,
+		Title:       title,
+		Description: desc,
+		ImageResult: result.ImageResult{
+			Original: result.ImageFormat{
+				Height: uint(origH),
+				Width:  uint(origW),
+			},
+			Thumbnail: result.ImageFormat{
+				Height: uint(thmbH),
+				Width:  uint(thmbW),
+			},
+			ThumbnailURL: thmbUrl,
+			Source:       src,
+			SourceURL:    srcUrl,
+		},
+		Rank: ser,
+	}
+
 	return &res
 }

src/search/category/category.go

@@ -7,6 +7,7 @@ import (
 var FromString = map[string]Name{
 	//main
 	"general": GENERAL,
+	"image":   IMAGE,
 	"info":    INFO,
 	"science": SCIENCE,
 	"news":    NEWS,

src/search/category/name.go

@@ -6,6 +6,7 @@ type Name string
 const (
 	UNDEFINED Name = "undefined"
 	GENERAL   Name = "general"
+	IMAGE     Name = "image"
 	INFO      Name = "info"
 	SCIENCE   Name = "science"
 	NEWS      Name = "news"

src/search/engines/_engines_test/structs.go

@@ -36,6 +36,13 @@ func NewConfig(engineName engines.Name) *config.Config {
 					Timeout: 10000 * time.Millisecond, // colly default
 				},
 			},
+			category.IMAGE: {
+				Engines: []engines.Name{engineName},
+				Ranking: config.NewRanking(),
+				Timings: config.Timings{
+					Timeout: 10000 * time.Millisecond, // colly default
+				},
+			},
 		},
 	}
 }

src/search/engines/_engines_test/tester.go

@@ -14,15 +14,15 @@ func CheckTestCases(tchar []TestCaseHasAnyResults, tccr []TestCaseContainsResult
 	// TestCaseHasAnyResults
 	for _, tc := range tchar {
 		if results := search.PerformSearch(tc.Query, tc.Options, conf); len(results) == 0 {
-			defer t.Errorf("Got no results for %v", tc.Query)
+			defer t.Errorf("Got no results for %q", tc.Query)
 		}
 	}
 
 	// TestCaseContainsResults
 	for _, tc := range tccr {
 		results := search.PerformSearch(tc.Query, tc.Options, conf)
 		if len(results) == 0 {
-			defer t.Errorf("Got no results for %v", tc.Query)
+			defer t.Errorf("Got no results for %q", tc.Query)
 		} else {
 			for _, rURL := range tc.ResultURL {
 				found := false
@@ -35,7 +35,7 @@ func CheckTestCases(tchar []TestCaseHasAnyResults, tccr []TestCaseContainsResult
 				}
 
 				if !found {
-					defer t.Errorf("Couldn't find %v (%v).\nThe results: %v", rURL, tc.Query, results)
+					defer t.Errorf("Couldn't find %q (%q).\nThe results: %q", rURL, tc.Query, results)
 				}
 			}
 		}
@@ -45,13 +45,13 @@ func CheckTestCases(tchar []TestCaseHasAnyResults, tccr []TestCaseContainsResult
 	for _, tc := range tcrr {
 		results := search.PerformSearch(tc.Query, tc.Options, conf)
 		if len(results) == 0 {
-			defer t.Errorf("Got no results for %v", tc.Query)
+			defer t.Errorf("Got no results for %q", tc.Query)
 		} else if len(results) < len(tc.ResultURL) {
 			defer t.Errorf("Number of results is less than test case URLs.")
 		} else {
 			for i, rURL := range tc.ResultURL {
 				if !strings.Contains(results[i].URL, rURL) {
-					defer t.Errorf("Wrong result on rank %v: %v (%v).\nThe results: %v", i+1, rURL, tc.Query, results)
+					defer t.Errorf("Wrong result on rank %q: %q (%q).\nThe results: %q", i+1, rURL, tc.Query, results)
 				}
 			}
 		}