Compare commits
3 commits
5614da4648
...
5d0525b1e9
Author | SHA1 | Date | |
---|---|---|---|
|
5d0525b1e9 | ||
|
d057915e66 | ||
|
dae80c0684 |
12 changed files with 445 additions and 279 deletions
24
common.go
Normal file
24
common.go
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"html/template"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
debugMode bool = true
|
||||||
|
funcs = template.FuncMap{
|
||||||
|
"sub": func(a, b int) int {
|
||||||
|
return a - b
|
||||||
|
},
|
||||||
|
"add": func(a, b int) int {
|
||||||
|
return a + b
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
func max(a, b int) int {
|
||||||
|
if a > b {
|
||||||
|
return a
|
||||||
|
}
|
||||||
|
return b
|
||||||
|
}
|
1
go.mod
1
go.mod
|
@ -16,4 +16,5 @@ require (
|
||||||
github.com/mailru/easyjson v0.7.7 // indirect
|
github.com/mailru/easyjson v0.7.7 // indirect
|
||||||
golang.org/x/net v0.21.0 // indirect
|
golang.org/x/net v0.21.0 // indirect
|
||||||
golang.org/x/sys v0.17.0 // indirect
|
golang.org/x/sys v0.17.0 // indirect
|
||||||
|
golang.org/x/time v0.5.0 // indirect
|
||||||
)
|
)
|
||||||
|
|
2
go.sum
2
go.sum
|
@ -55,6 +55,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||||
|
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
|
||||||
|
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||||
|
|
143
images-imgur.go
Normal file
143
images-imgur.go
Normal file
|
@ -0,0 +1,143 @@
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/PuerkitoBio/goquery"
|
||||||
|
)
|
||||||
|
|
||||||
|
// PerformImgurImageSearch performs an image search on Imgur and returns the results
|
||||||
|
func PerformImgurImageSearch(query, safe, lang string, page int) ([]ImageSearchResult, error) {
|
||||||
|
var results []ImageSearchResult
|
||||||
|
searchURL := buildImgurSearchURL(query, page)
|
||||||
|
|
||||||
|
resp, err := http.Get(searchURL)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("making request: %v", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
doc, err := goquery.NewDocumentFromReader(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("loading HTML document: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
doc.Find("div.cards div.post").Each(func(i int, s *goquery.Selection) {
|
||||||
|
thumbnailSrc, exists := s.Find("a img").Attr("src")
|
||||||
|
if !exists || len(thumbnailSrc) < 25 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
imgSrc := strings.Replace(thumbnailSrc, "b.", ".", 1)
|
||||||
|
|
||||||
|
// Ensure the URLs have the correct protocol
|
||||||
|
if !strings.HasPrefix(thumbnailSrc, "http") {
|
||||||
|
thumbnailSrc = "https:" + thumbnailSrc
|
||||||
|
}
|
||||||
|
if !strings.HasPrefix(imgSrc, "http") {
|
||||||
|
imgSrc = "https:" + imgSrc
|
||||||
|
}
|
||||||
|
|
||||||
|
urlPath, exists := s.Find("a").Attr("href")
|
||||||
|
if !exists {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Scrape the image directly from the Imgur page
|
||||||
|
imgSrc = scrapeImageFromImgurPage("https://imgur.com" + urlPath)
|
||||||
|
|
||||||
|
// Remove any query parameters from the URL
|
||||||
|
imgSrc = removeQueryParameters(imgSrc)
|
||||||
|
|
||||||
|
title, _ := s.Find("a img").Attr("alt")
|
||||||
|
|
||||||
|
width, _ := strconv.Atoi(s.Find("a img").AttrOr("width", "0"))
|
||||||
|
height, _ := strconv.Atoi(s.Find("a img").AttrOr("height", "0"))
|
||||||
|
|
||||||
|
results = append(results, ImageSearchResult{
|
||||||
|
Thumbnail: thumbnailSrc,
|
||||||
|
Title: strings.TrimSpace(title),
|
||||||
|
Media: imgSrc,
|
||||||
|
Width: width,
|
||||||
|
Height: height,
|
||||||
|
Source: "https://imgur.com" + urlPath,
|
||||||
|
ThumbProxy: imgSrc, //"/img_proxy?url=" + url.QueryEscape(imgSrc)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
return results, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// scrapeImageFromImgurPage scrapes the image source from the Imgur page
|
||||||
|
func scrapeImageFromImgurPage(pageURL string) string {
|
||||||
|
resp, err := http.Get(pageURL)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Error fetching page: %v\n", err)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
fmt.Printf("Unexpected status code: %d\n", resp.StatusCode)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
doc, err := goquery.NewDocumentFromReader(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Error loading HTML document: %v\n", err)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
imgSrc, exists := doc.Find("meta[property='og:image']").Attr("content")
|
||||||
|
if !exists {
|
||||||
|
fmt.Printf("Image not found on page: %s\n", pageURL)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure the URL has the correct protocol
|
||||||
|
if !strings.HasPrefix(imgSrc, "http") {
|
||||||
|
imgSrc = "https:" + imgSrc
|
||||||
|
}
|
||||||
|
|
||||||
|
return imgSrc
|
||||||
|
}
|
||||||
|
|
||||||
|
// removeQueryParameters removes query parameters from a URL
|
||||||
|
func removeQueryParameters(rawURL string) string {
|
||||||
|
parsedURL, err := url.Parse(rawURL)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Error parsing URL: %v\n", err)
|
||||||
|
return rawURL
|
||||||
|
}
|
||||||
|
parsedURL.RawQuery = ""
|
||||||
|
return parsedURL.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildImgurSearchURL(query string, page int) string {
|
||||||
|
baseURL := "https://imgur.com/search/score/all"
|
||||||
|
params := url.Values{}
|
||||||
|
params.Add("q", query)
|
||||||
|
params.Add("qs", "thumbs")
|
||||||
|
params.Add("p", fmt.Sprintf("%d", page-1))
|
||||||
|
return fmt.Sprintf("%s?%s", baseURL, params.Encode())
|
||||||
|
}
|
||||||
|
|
||||||
|
// func main() {
|
||||||
|
// results, err := PerformImgurImageSearch("cats", "true", "en", 1)
|
||||||
|
// if err != nil {
|
||||||
|
// fmt.Println("Error:", err)
|
||||||
|
// return
|
||||||
|
// }
|
||||||
|
|
||||||
|
// for _, result := range results {
|
||||||
|
// fmt.Printf("Title: %s\nSource: %s\nMedia: %s\nThumbnail: %s\nThumbProxy: %s\nWidth: %d\nHeight: %d\n\n",
|
||||||
|
// result.Title, result.Source, result.Media, result.Thumbnail, result.ThumbProxy, result.Width, result.Height)
|
||||||
|
// }
|
||||||
|
// }
|
95
images-quant.go
Normal file
95
images-quant.go
Normal file
|
@ -0,0 +1,95 @@
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// QwantAPIResponse represents the JSON response structure from Qwant API
|
||||||
|
type QwantAPIResponse struct {
|
||||||
|
Data struct {
|
||||||
|
Result struct {
|
||||||
|
Items []struct {
|
||||||
|
Media string `json:"media"`
|
||||||
|
Thumbnail string `json:"thumbnail"`
|
||||||
|
Title string `json:"title"`
|
||||||
|
Url string `json:"url"`
|
||||||
|
Width int `json:"width"`
|
||||||
|
Height int `json:"height"`
|
||||||
|
} `json:"items"`
|
||||||
|
} `json:"result"`
|
||||||
|
} `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PerformQwantImageSearch performs an image search on Qwant and returns the results.
|
||||||
|
func PerformQwantImageSearch(query, safe, lang string, page int) ([]ImageSearchResult, error) {
|
||||||
|
const resultsPerPage = 50
|
||||||
|
var offset int
|
||||||
|
if page <= 1 {
|
||||||
|
offset = 0
|
||||||
|
} else {
|
||||||
|
offset = (page - 1) * resultsPerPage
|
||||||
|
}
|
||||||
|
|
||||||
|
if safe == "" {
|
||||||
|
safe = "0"
|
||||||
|
}
|
||||||
|
|
||||||
|
if lang == "" {
|
||||||
|
lang = "en_CA"
|
||||||
|
}
|
||||||
|
|
||||||
|
apiURL := fmt.Sprintf("https://api.qwant.com/v3/search/images?t=images&q=%s&count=%d&locale=%s&offset=%d&device=desktop&tgp=2&safesearch=%s",
|
||||||
|
url.QueryEscape(query),
|
||||||
|
resultsPerPage,
|
||||||
|
lang,
|
||||||
|
offset,
|
||||||
|
safe)
|
||||||
|
|
||||||
|
client := &http.Client{Timeout: 10 * time.Second}
|
||||||
|
|
||||||
|
req, err := http.NewRequest("GET", apiURL, nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("creating request: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ImageUserAgent, err := GetUserAgent("Image-Search")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
req.Header.Set("User-Agent", ImageUserAgent)
|
||||||
|
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("making request: %v", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
var apiResp QwantAPIResponse
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&apiResp); err != nil {
|
||||||
|
return nil, fmt.Errorf("decoding response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var results []ImageSearchResult
|
||||||
|
for _, item := range apiResp.Data.Result.Items {
|
||||||
|
results = append(results, ImageSearchResult{
|
||||||
|
Thumbnail: item.Thumbnail,
|
||||||
|
Title: item.Title,
|
||||||
|
Media: item.Media,
|
||||||
|
Source: item.Url,
|
||||||
|
ThumbProxy: "/img_proxy?url=" + url.QueryEscape(item.Media),
|
||||||
|
Width: item.Width,
|
||||||
|
Height: item.Height,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return results, nil
|
||||||
|
}
|
174
images.go
174
images.go
|
@ -1,120 +1,35 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"html/template"
|
"html/template"
|
||||||
"log"
|
"log"
|
||||||
|
"math/rand"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
// QwantAPIResponse represents the JSON response structure from Qwant API
|
var (
|
||||||
type QwantAPIResponse struct {
|
imageEngines []imageEngine
|
||||||
Data struct {
|
imageEngineLock sync.Mutex
|
||||||
Result struct {
|
)
|
||||||
Items []struct {
|
|
||||||
Media string `json:"media"`
|
type imageEngine struct {
|
||||||
Thumbnail string `json:"thumbnail"`
|
Name string
|
||||||
Title string `json:"title"`
|
Func func(string, string, string, int) ([]ImageSearchResult, error)
|
||||||
Url string `json:"url"`
|
Weight int
|
||||||
Width int `json:"width"`
|
|
||||||
Height int `json:"height"`
|
|
||||||
} `json:"items"`
|
|
||||||
} `json:"result"`
|
|
||||||
} `json:"data"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var funcs = template.FuncMap{
|
func init() {
|
||||||
"sub": func(a, b int) int {
|
imageEngines = []imageEngine{
|
||||||
return a - b
|
{Name: "Qwant", Func: PerformQwantImageSearch, Weight: 1},
|
||||||
},
|
{Name: "Imgur", Func: PerformImgurImageSearch, Weight: 2},
|
||||||
"add": func(a, b int) int {
|
}
|
||||||
return a + b
|
|
||||||
},
|
rand.Seed(time.Now().UnixNano())
|
||||||
}
|
}
|
||||||
|
|
||||||
// FetchImageResults contacts the image search API and returns a slice of ImageSearchResult
|
|
||||||
func fetchImageResults(query string, safe, lang string, page int) ([]ImageSearchResult, error) {
|
|
||||||
const resultsPerPage = 50
|
|
||||||
var offset int
|
|
||||||
if page <= 1 {
|
|
||||||
offset = 0
|
|
||||||
} else {
|
|
||||||
offset = (page - 1) * resultsPerPage
|
|
||||||
}
|
|
||||||
|
|
||||||
// Ensuring safe search is disabled by default if not specified
|
|
||||||
if safe == "" {
|
|
||||||
safe = "0"
|
|
||||||
}
|
|
||||||
|
|
||||||
// Defaulting to English Canada locale if not specified
|
|
||||||
if lang == "" {
|
|
||||||
lang = "en_CA"
|
|
||||||
}
|
|
||||||
|
|
||||||
// Format &lang=lang_de is incorrect, implement fix !
|
|
||||||
apiURL := fmt.Sprintf("https://api.qwant.com/v3/search/images?t=images&q=%s&count=%d&locale=%s&offset=%d&device=desktop&tgp=2&safesearch=%s",
|
|
||||||
url.QueryEscape(query),
|
|
||||||
resultsPerPage,
|
|
||||||
lang,
|
|
||||||
offset,
|
|
||||||
safe)
|
|
||||||
|
|
||||||
client := &http.Client{Timeout: 10 * time.Second}
|
|
||||||
|
|
||||||
req, err := http.NewRequest("GET", apiURL, nil)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("creating request: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// User Agent generation
|
|
||||||
ImageUserAgent, err := GetUserAgent("Image-Search")
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println("Error:", err)
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if debugMode {
|
|
||||||
fmt.Println("Generated User Agent (images):", ImageUserAgent)
|
|
||||||
}
|
|
||||||
|
|
||||||
req.Header.Set("User-Agent", ImageUserAgent)
|
|
||||||
|
|
||||||
resp, err := client.Do(req)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("making request: %v", err)
|
|
||||||
}
|
|
||||||
defer resp.Body.Close()
|
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
|
||||||
return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
|
|
||||||
}
|
|
||||||
|
|
||||||
var apiResp QwantAPIResponse
|
|
||||||
if err := json.NewDecoder(resp.Body).Decode(&apiResp); err != nil {
|
|
||||||
return nil, fmt.Errorf("decoding response: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var results []ImageSearchResult
|
|
||||||
for _, item := range apiResp.Data.Result.Items {
|
|
||||||
results = append(results, ImageSearchResult{
|
|
||||||
Thumbnail: item.Thumbnail, // Thumbnail URL
|
|
||||||
Title: item.Title, // Image title
|
|
||||||
Media: item.Media, // Direct link to the image
|
|
||||||
Source: item.Url,
|
|
||||||
ThumbProxy: "/img_proxy?url=" + url.QueryEscape(item.Media),
|
|
||||||
Width: item.Width,
|
|
||||||
Height: item.Height,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
return results, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleImageSearch is the HTTP handler for image search requests
|
|
||||||
func handleImageSearch(w http.ResponseWriter, query, safe, lang string, page int) {
|
func handleImageSearch(w http.ResponseWriter, query, safe, lang string, page int) {
|
||||||
startTime := time.Now()
|
startTime := time.Now()
|
||||||
|
|
||||||
|
@ -174,31 +89,58 @@ func getImageResultsFromCacheOrFetch(cacheKey CacheKey, query, safe, lang string
|
||||||
select {
|
select {
|
||||||
case results := <-cacheChan:
|
case results := <-cacheChan:
|
||||||
if results == nil {
|
if results == nil {
|
||||||
combinedResults = fetchAndCacheImageResults(query, safe, lang, page)
|
combinedResults = fetchImageResults(query, safe, lang, page)
|
||||||
|
resultsCache.Set(cacheKey, convertToSearchResults(combinedResults))
|
||||||
} else {
|
} else {
|
||||||
_, _, imageResults := convertToSpecificResults(results)
|
_, _, imageResults := convertToSpecificResults(results)
|
||||||
combinedResults = imageResults
|
combinedResults = imageResults
|
||||||
}
|
}
|
||||||
case <-time.After(2 * time.Second):
|
case <-time.After(2 * time.Second):
|
||||||
log.Println("Cache check timeout")
|
log.Println("Cache check timeout")
|
||||||
combinedResults = fetchAndCacheImageResults(query, safe, lang, page)
|
combinedResults = fetchImageResults(query, safe, lang, page)
|
||||||
|
resultsCache.Set(cacheKey, convertToSearchResults(combinedResults))
|
||||||
}
|
}
|
||||||
|
|
||||||
return combinedResults
|
return combinedResults
|
||||||
}
|
}
|
||||||
|
|
||||||
func fetchAndCacheImageResults(query, safe, lang string, page int) []ImageSearchResult {
|
func fetchImageResults(query, safe, lang string, page int) []ImageSearchResult {
|
||||||
results, err := fetchImageResults(query, safe, lang, page)
|
engine := selectImageEngine()
|
||||||
if err != nil || len(results) == 0 {
|
log.Printf("Using image search engine: %s", engine.Name)
|
||||||
log.Printf("Error fetching image results: %v", err)
|
|
||||||
return []ImageSearchResult{
|
|
||||||
{Title: "Results are currently unavailable, sorry. Please try again later."},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cache the valid results
|
results, err := engine.Func(query, safe, lang, page)
|
||||||
cacheKey := CacheKey{Query: query, Page: page, Safe: safe == "true", Lang: lang, Type: "image"}
|
if err != nil {
|
||||||
resultsCache.Set(cacheKey, convertToSearchResults(results))
|
log.Printf("Error performing image search with %s: %v", engine.Name, err)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
return results
|
return results
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func selectImageEngine() imageEngine {
|
||||||
|
imageEngineLock.Lock()
|
||||||
|
defer imageEngineLock.Unlock()
|
||||||
|
|
||||||
|
totalWeight := 0
|
||||||
|
for _, engine := range imageEngines {
|
||||||
|
totalWeight += engine.Weight
|
||||||
|
}
|
||||||
|
|
||||||
|
randValue := rand.Intn(totalWeight)
|
||||||
|
for _, engine := range imageEngines {
|
||||||
|
if randValue < engine.Weight {
|
||||||
|
// Adjust weights for load balancing
|
||||||
|
for i := range imageEngines {
|
||||||
|
if imageEngines[i].Name == engine.Name {
|
||||||
|
imageEngines[i].Weight = max(1, imageEngines[i].Weight-1)
|
||||||
|
} else {
|
||||||
|
imageEngines[i].Weight++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return engine
|
||||||
|
}
|
||||||
|
randValue -= engine.Weight
|
||||||
|
}
|
||||||
|
|
||||||
|
return imageEngines[0] // fallback to the first engine
|
||||||
|
}
|
||||||
|
|
2
run.sh
2
run.sh
|
@ -1,3 +1,3 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
go run main.go images.go imageproxy.go video.go map.go text.go text-searchxng.go text-librex.go text-google.go cache.go forums.go files.go files-torrentgalaxy.go files-thepiratebay.go agent.go --debug
|
go run main.go common.go images.go imageproxy.go images-quant.go images-imgur.go video.go map.go text.go text-searchxng.go text-librex.go text-google.go cache.go forums.go files.go files-torrentgalaxy.go files-thepiratebay.go agent.go
|
|
@ -56,7 +56,7 @@
|
||||||
</select>
|
</select>
|
||||||
<button class="results-save" name="t" value="text">Apply settings</button>
|
<button class="results-save" name="t" value="text">Apply settings</button>
|
||||||
</form>
|
</form>
|
||||||
<div class="results">
|
<div class="results" id="results">
|
||||||
{{if .Results}}
|
{{if .Results}}
|
||||||
{{range .Results}}
|
{{range .Results}}
|
||||||
<div class="result_item">
|
<div class="result_item">
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
<div class="no-results">No results found for '{{ .Query }}'. Try different keywords.</div>
|
<div class="no-results">No results found for '{{ .Query }}'. Try different keywords.</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
<div class="prev-next prev-img">
|
<div class="prev-next prev-img" id="prev-next">
|
||||||
<form action="/search" method="get">
|
<form action="/search" method="get">
|
||||||
<input type="hidden" name="q" value="{{ .Query }}">
|
<input type="hidden" name="q" value="{{ .Query }}">
|
||||||
<input type="hidden" name="t" value="text">
|
<input type="hidden" name="t" value="text">
|
||||||
|
@ -83,8 +83,35 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script>
|
||||||
// Check if JavaScript is enabled and modify the DOM accordingly
|
|
||||||
document.getElementById('content').classList.remove('js-enabled');
|
document.getElementById('content').classList.remove('js-enabled');
|
||||||
|
|
||||||
|
document.addEventListener("DOMContentLoaded", function() {
|
||||||
|
if (document.getElementById('prev-next')) {
|
||||||
|
document.getElementById('prev-next').style.display = 'none';
|
||||||
|
|
||||||
|
let page = {{ .Page }};
|
||||||
|
const query = "{{ .Query }}";
|
||||||
|
|
||||||
|
function loadResults(newPage) {
|
||||||
|
fetch(`/search?q=${encodeURIComponent(query)}&t=text&p=${newPage}`)
|
||||||
|
.then(response => response.text())
|
||||||
|
.then(data => {
|
||||||
|
const parser = new DOMParser();
|
||||||
|
const doc = parser.parseFromString(data, 'text/html');
|
||||||
|
const newResults = doc.getElementById('results').innerHTML;
|
||||||
|
document.getElementById('results').innerHTML += newResults;
|
||||||
|
page = newPage;
|
||||||
|
})
|
||||||
|
.catch(error => console.error('Error loading results:', error));
|
||||||
|
}
|
||||||
|
|
||||||
|
window.addEventListener('scroll', () => {
|
||||||
|
if (window.innerHeight + window.scrollY >= document.body.offsetHeight) {
|
||||||
|
loadResults(page + 1);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -11,9 +11,9 @@ import (
|
||||||
"github.com/PuerkitoBio/goquery"
|
"github.com/PuerkitoBio/goquery"
|
||||||
)
|
)
|
||||||
|
|
||||||
func PerformDuckDuckGoTextSearch(query, safe, lang string) ([]TextSearchResult, error) {
|
func PerformDuckDuckGoTextSearch(query, safe, lang string, page int) ([]TextSearchResult, error) {
|
||||||
var results []TextSearchResult
|
var results []TextSearchResult
|
||||||
searchURL := fmt.Sprintf("https://duckduckgo.com/html/?q=%s", url.QueryEscape(query))
|
searchURL := buildDuckDuckGoSearchURL(query, page)
|
||||||
|
|
||||||
resp, err := http.Get(searchURL)
|
resp, err := http.Get(searchURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -56,3 +56,11 @@ func PerformDuckDuckGoTextSearch(query, safe, lang string) ([]TextSearchResult,
|
||||||
|
|
||||||
return results, nil
|
return results, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func buildDuckDuckGoSearchURL(query string, page int) string {
|
||||||
|
startParam := ""
|
||||||
|
if page > 1 {
|
||||||
|
startParam = fmt.Sprintf("&s=%d", (page-1)*10)
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("https://duckduckgo.com/html/?q=%s%s", url.QueryEscape(query), startParam)
|
||||||
|
}
|
|
@ -11,57 +11,37 @@ import (
|
||||||
"github.com/chromedp/chromedp"
|
"github.com/chromedp/chromedp"
|
||||||
)
|
)
|
||||||
|
|
||||||
// type TextSearchResult struct {
|
func PerformGoogleTextSearch(query, safe, lang string, page int) ([]TextSearchResult, error) {
|
||||||
// URL string
|
opts := append(chromedp.DefaultExecAllocatorOptions[:],
|
||||||
// Header string
|
chromedp.DisableGPU,
|
||||||
// Description string
|
chromedp.NoDefaultBrowserCheck,
|
||||||
// }
|
chromedp.NoFirstRun,
|
||||||
|
chromedp.Flag("disable-javascript", true),
|
||||||
|
)
|
||||||
|
ctx, cancel := chromedp.NewExecAllocator(context.Background(), opts...)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
// func main() {
|
ctx, cancel = chromedp.NewContext(ctx)
|
||||||
// // Example usage
|
|
||||||
// results, err := PerformGoogleTextSearch("golang", "off", "lang_en", 2)
|
|
||||||
// if err != nil {
|
|
||||||
// log.Fatalf("Error performing search: %v", err)
|
|
||||||
// }
|
|
||||||
|
|
||||||
// for _, result := range results {
|
|
||||||
// fmt.Printf("URL: %s\nHeader: %s\nDescription: %s\n", result.URL, result.Header, result.Description)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
func PerformGoogleTextSearch(query, safe, lang string, numPages int) ([]TextSearchResult, error) {
|
|
||||||
ctx, cancel := chromedp.NewContext(context.Background())
|
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
var results []TextSearchResult
|
var results []TextSearchResult
|
||||||
|
|
||||||
searchURL := buildSearchURL(query, safe, lang, 1, 10)
|
searchURL := buildSearchURL(query, safe, lang, page, 10)
|
||||||
|
var pageSource string
|
||||||
err := chromedp.Run(ctx,
|
err := chromedp.Run(ctx,
|
||||||
chromedp.Navigate(searchURL),
|
chromedp.Navigate(searchURL),
|
||||||
|
chromedp.Sleep(2*time.Second),
|
||||||
|
chromedp.OuterHTML("html", &pageSource),
|
||||||
)
|
)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to navigate to search URL: %v", err)
|
return nil, fmt.Errorf("failed to retrieve page source: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
for page := 1; page <= numPages; page++ {
|
newResults, err := parseResults(pageSource)
|
||||||
var pageSource string
|
if err != nil {
|
||||||
err := chromedp.Run(ctx,
|
return nil, fmt.Errorf("error parsing results: %v", err)
|
||||||
chromedp.Sleep(2*time.Second),
|
|
||||||
chromedp.OuterHTML("html", &pageSource),
|
|
||||||
chromedp.Evaluate(`window.scrollTo(0, document.body.scrollHeight);`, nil),
|
|
||||||
)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to retrieve page source: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
newResults, err := parseResults(pageSource)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("error parsing results: %v", err)
|
|
||||||
}
|
|
||||||
results = append(results, newResults...)
|
|
||||||
}
|
}
|
||||||
|
results = append(results, newResults...)
|
||||||
|
|
||||||
return results, nil
|
return results, nil
|
||||||
}
|
}
|
||||||
|
@ -77,7 +57,9 @@ func buildSearchURL(query, safe, lang string, page, resultsPerPage int) string {
|
||||||
langParam = "&lr=" + lang
|
langParam = "&lr=" + lang
|
||||||
}
|
}
|
||||||
|
|
||||||
return fmt.Sprintf("https://www.google.com/search?q=%s%s%s", url.QueryEscape(query), safeParam, langParam)
|
startParam := fmt.Sprintf("&start=%d", (page-1)*resultsPerPage)
|
||||||
|
|
||||||
|
return fmt.Sprintf("https://www.google.com/search?q=%s%s%s%s", url.QueryEscape(query), safeParam, langParam, startParam)
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseResults(pageSource string) ([]TextSearchResult, error) {
|
func parseResults(pageSource string) ([]TextSearchResult, error) {
|
||||||
|
|
|
@ -20,7 +20,7 @@ type LibreXResponse []LibreXResult
|
||||||
|
|
||||||
func PerformLibreXTextSearch(query, safe, lang string, page int) ([]TextSearchResult, error) {
|
func PerformLibreXTextSearch(query, safe, lang string, page int) ([]TextSearchResult, error) {
|
||||||
// LibreX uses page starting from 0
|
// LibreX uses page starting from 0
|
||||||
searchURL := fmt.Sprintf("https://%s/api.php?q=%s&p=%d&t=0", LIBREX_DOMAIN, url.QueryEscape(query), page-1)
|
searchURL := fmt.Sprintf("https://%s/api.php?q=%s&p=%d&t=0", LIBREX_DOMAIN, url.QueryEscape(query), page)
|
||||||
|
|
||||||
// User Agent generation
|
// User Agent generation
|
||||||
userAgent, err := GetUserAgent("librex-text-search")
|
userAgent, err := GetUserAgent("librex-text-search")
|
||||||
|
@ -63,10 +63,6 @@ func PerformLibreXTextSearch(query, safe, lang string, page int) ([]TextSearchRe
|
||||||
Source: "LibreX",
|
Source: "LibreX",
|
||||||
}
|
}
|
||||||
|
|
||||||
if debugMode {
|
|
||||||
log.Printf("LibreX result: %+v\n", result)
|
|
||||||
}
|
|
||||||
|
|
||||||
results = append(results, result)
|
results = append(results, result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
170
text.go
170
text.go
|
@ -1,44 +1,56 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"flag"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"html/template"
|
"html/template"
|
||||||
"log"
|
"log"
|
||||||
|
"math/rand"
|
||||||
"net/http"
|
"net/http"
|
||||||
"sort"
|
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
debugMode bool
|
searchEngines []searchEngine
|
||||||
|
searchEngineLock sync.Mutex
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type searchEngine struct {
|
||||||
|
Name string
|
||||||
|
Func func(string, string, string, int) ([]TextSearchResult, error)
|
||||||
|
Weight int
|
||||||
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
flag.BoolVar(&debugMode, "debug", false, "enable debug mode")
|
searchEngines = []searchEngine{
|
||||||
flag.Parse()
|
{Name: "Google", Func: PerformGoogleTextSearch, Weight: 1},
|
||||||
|
{Name: "LibreX", Func: PerformLibreXTextSearch, Weight: 2},
|
||||||
|
// {Name: "DuckDuckGo", Func: PerformDuckDuckGoTextSearch, Weight: 3}, // DuckDuckGo timeouts too fast and search results are trash
|
||||||
|
// {Name: "SearXNG", Func: PerformSearXNGTextSearch, Weight: 2}, // Uncomment when implemented
|
||||||
|
}
|
||||||
|
|
||||||
|
rand.Seed(time.Now().UnixNano())
|
||||||
}
|
}
|
||||||
|
|
||||||
func HandleTextSearch(w http.ResponseWriter, query, safe, lang string, page int) {
|
func HandleTextSearch(w http.ResponseWriter, query, safe, lang string, page int) {
|
||||||
startTime := time.Now()
|
startTime := time.Now()
|
||||||
const resultsPerPage = 10
|
|
||||||
|
|
||||||
cacheKey := CacheKey{Query: query, Page: page, Safe: safe == "true", Lang: lang, Type: "text"}
|
cacheKey := CacheKey{Query: query, Page: page, Safe: safe == "true", Lang: lang, Type: "text"}
|
||||||
combinedResults := getTextResultsFromCacheOrFetch(cacheKey, query, safe, lang, page, resultsPerPage)
|
combinedResults := getTextResultsFromCacheOrFetch(cacheKey, query, safe, lang, page)
|
||||||
|
|
||||||
hasPrevPage := page > 1
|
hasPrevPage := page > 1
|
||||||
hasNextPage := len(combinedResults) == resultsPerPage
|
hasNextPage := len(combinedResults) > 0
|
||||||
|
|
||||||
displayResults(w, combinedResults, query, lang, time.Since(startTime).Seconds(), page, hasPrevPage, hasNextPage)
|
displayResults(w, combinedResults, query, lang, time.Since(startTime).Seconds(), page, hasPrevPage, hasNextPage)
|
||||||
|
|
||||||
// Always check and cache the next page if not enough results
|
// Prefetch next and previous pages
|
||||||
if hasNextPage {
|
go prefetchPage(query, safe, lang, page+1)
|
||||||
go cacheNextPageIfNotCached(query, safe, lang, page+1, resultsPerPage)
|
if hasPrevPage {
|
||||||
|
go prefetchPage(query, safe, lang, page-1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func getTextResultsFromCacheOrFetch(cacheKey CacheKey, query, safe, lang string, page, resultsPerPage int) []TextSearchResult {
|
func getTextResultsFromCacheOrFetch(cacheKey CacheKey, query, safe, lang string, page int) []TextSearchResult {
|
||||||
cacheChan := make(chan []SearchResult)
|
cacheChan := make(chan []SearchResult)
|
||||||
var combinedResults []TextSearchResult
|
var combinedResults []TextSearchResult
|
||||||
|
|
||||||
|
@ -56,7 +68,7 @@ func getTextResultsFromCacheOrFetch(cacheKey CacheKey, query, safe, lang string,
|
||||||
select {
|
select {
|
||||||
case results := <-cacheChan:
|
case results := <-cacheChan:
|
||||||
if results == nil {
|
if results == nil {
|
||||||
combinedResults = fetchTextResultsUntilFull(query, safe, lang, page, resultsPerPage)
|
combinedResults = fetchTextResults(query, safe, lang, page)
|
||||||
resultsCache.Set(cacheKey, convertToSearchResults(combinedResults))
|
resultsCache.Set(cacheKey, convertToSearchResults(combinedResults))
|
||||||
} else {
|
} else {
|
||||||
textResults, _, _ := convertToSpecificResults(results)
|
textResults, _, _ := convertToSpecificResults(results)
|
||||||
|
@ -64,129 +76,63 @@ func getTextResultsFromCacheOrFetch(cacheKey CacheKey, query, safe, lang string,
|
||||||
}
|
}
|
||||||
case <-time.After(2 * time.Second):
|
case <-time.After(2 * time.Second):
|
||||||
log.Println("Cache check timeout")
|
log.Println("Cache check timeout")
|
||||||
combinedResults = fetchTextResultsUntilFull(query, safe, lang, page, resultsPerPage)
|
combinedResults = fetchTextResults(query, safe, lang, page)
|
||||||
resultsCache.Set(cacheKey, convertToSearchResults(combinedResults))
|
resultsCache.Set(cacheKey, convertToSearchResults(combinedResults))
|
||||||
}
|
}
|
||||||
|
|
||||||
return combinedResults
|
return combinedResults
|
||||||
}
|
}
|
||||||
|
|
||||||
func cacheNextPageIfNotCached(query, safe, lang string, page, resultsPerPage int) {
|
func prefetchPage(query, safe, lang string, page int) {
|
||||||
cacheKey := CacheKey{Query: query, Page: page, Safe: safe == "true", Lang: lang, Type: "text"}
|
cacheKey := CacheKey{Query: query, Page: page, Safe: safe == "true", Lang: lang, Type: "text"}
|
||||||
if _, exists := resultsCache.Get(cacheKey); !exists {
|
if _, exists := resultsCache.Get(cacheKey); !exists {
|
||||||
log.Printf("Next page %d not cached, caching now...", page)
|
log.Printf("Page %d not cached, caching now...", page)
|
||||||
nextPageResults := fetchTextResultsUntilFull(query, safe, lang, page, resultsPerPage)
|
pageResults := fetchTextResults(query, safe, lang, page)
|
||||||
resultsCache.Set(cacheKey, convertToSearchResults(nextPageResults))
|
resultsCache.Set(cacheKey, convertToSearchResults(pageResults))
|
||||||
} else {
|
} else {
|
||||||
log.Printf("Next page %d already cached", page)
|
log.Printf("Page %d already cached", page)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func fetchTextResultsUntilFull(query, safe, lang string, targetPage, resultsPerPage int) []TextSearchResult {
|
func fetchTextResults(query, safe, lang string, page int) []TextSearchResult {
|
||||||
var combinedResults []TextSearchResult
|
engine := selectSearchEngine()
|
||||||
currentPage := 1
|
log.Printf("Using search engine: %s", engine.Name)
|
||||||
resultsNeeded := targetPage * resultsPerPage
|
|
||||||
|
|
||||||
for len(combinedResults) < resultsNeeded {
|
results, err := engine.Func(query, safe, lang, page)
|
||||||
cacheKey := CacheKey{Query: query, Page: targetPage, Safe: safe == "true", Lang: lang, Type: "text"}
|
if err != nil {
|
||||||
cachedResults, exists := resultsCache.Get(cacheKey)
|
log.Printf("Error performing search with %s: %v", engine.Name, err)
|
||||||
if exists {
|
return nil
|
||||||
textResults, _, _ := convertToSpecificResults(cachedResults)
|
|
||||||
combinedResults = append(combinedResults, textResults...)
|
|
||||||
} else {
|
|
||||||
results := fetchAndCacheTextResults(query, safe, lang, currentPage, resultsPerPage)
|
|
||||||
if len(results) == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
combinedResults = append(combinedResults, results...)
|
|
||||||
resultsCache.Set(cacheKey, convertToSearchResults(results))
|
|
||||||
}
|
|
||||||
|
|
||||||
currentPage++
|
|
||||||
|
|
||||||
// Stop fetching if we have enough results for the target page and the next page
|
|
||||||
if len(combinedResults) >= resultsNeeded+resultsPerPage {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
startIndex := (targetPage - 1) * resultsPerPage
|
return results
|
||||||
endIndex := startIndex + resultsPerPage
|
|
||||||
|
|
||||||
if startIndex >= len(combinedResults) {
|
|
||||||
return []TextSearchResult{}
|
|
||||||
}
|
|
||||||
if endIndex > len(combinedResults) {
|
|
||||||
endIndex = len(combinedResults)
|
|
||||||
}
|
|
||||||
|
|
||||||
return combinedResults[startIndex:endIndex]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func fetchAndCacheTextResults(query, safe, lang string, page, resultsPerPage int) []TextSearchResult {
|
func selectSearchEngine() searchEngine {
|
||||||
var combinedResults []TextSearchResult
|
searchEngineLock.Lock()
|
||||||
var wg sync.WaitGroup
|
defer searchEngineLock.Unlock()
|
||||||
var mu sync.Mutex
|
|
||||||
|
|
||||||
resultsChan := make(chan []TextSearchResult)
|
totalWeight := 0
|
||||||
|
for _, engine := range searchEngines {
|
||||||
searchFuncs := []struct {
|
totalWeight += engine.Weight
|
||||||
Func func(string, string, string, int) ([]TextSearchResult, error)
|
|
||||||
Source string
|
|
||||||
}{
|
|
||||||
{PerformGoogleTextSearch, "Google"},
|
|
||||||
// {PerformLibreXTextSearch, "LibreX"},
|
|
||||||
// {PerformSearXNGTextSearch, "SearXNG"},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wg.Add(len(searchFuncs))
|
randValue := rand.Intn(totalWeight)
|
||||||
|
for _, engine := range searchEngines {
|
||||||
for _, searchFunc := range searchFuncs {
|
if randValue < engine.Weight {
|
||||||
go func(searchFunc func(string, string, string, int) ([]TextSearchResult, error), source string) {
|
// Adjust weights for load balancing
|
||||||
defer wg.Done()
|
for i := range searchEngines {
|
||||||
results, err := searchFunc(query, safe, lang, page)
|
if searchEngines[i].Name == engine.Name {
|
||||||
if err == nil {
|
searchEngines[i].Weight = max(1, searchEngines[i].Weight-1)
|
||||||
for i := range results {
|
} else {
|
||||||
results[i].Source = source
|
searchEngines[i].Weight++
|
||||||
}
|
}
|
||||||
resultsChan <- results
|
|
||||||
} else {
|
|
||||||
log.Printf("Error performing search from %s: %v", source, err)
|
|
||||||
}
|
}
|
||||||
}(searchFunc.Func, searchFunc.Source)
|
return engine
|
||||||
|
}
|
||||||
|
randValue -= engine.Weight
|
||||||
}
|
}
|
||||||
|
|
||||||
go func() {
|
return searchEngines[0] // fallback to the first engine
|
||||||
wg.Wait()
|
|
||||||
close(resultsChan)
|
|
||||||
}()
|
|
||||||
|
|
||||||
for results := range resultsChan {
|
|
||||||
mu.Lock()
|
|
||||||
combinedResults = append(combinedResults, results...)
|
|
||||||
mu.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
sort.SliceStable(combinedResults, func(i, j int) bool {
|
|
||||||
return sourceOrder(combinedResults[i].Source) < sourceOrder(combinedResults[j].Source)
|
|
||||||
})
|
|
||||||
|
|
||||||
log.Printf("Fetched %d results for page %d", len(combinedResults), page)
|
|
||||||
|
|
||||||
return combinedResults
|
|
||||||
}
|
|
||||||
|
|
||||||
func sourceOrder(source string) int {
|
|
||||||
switch source {
|
|
||||||
case "Google":
|
|
||||||
return 1
|
|
||||||
case "LibreX":
|
|
||||||
return 2
|
|
||||||
case "SearchXNG":
|
|
||||||
return 3
|
|
||||||
default:
|
|
||||||
return 4
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func displayResults(w http.ResponseWriter, results []TextSearchResult, query, lang string, elapsed float64, page int, hasPrevPage, hasNextPage bool) {
|
func displayResults(w http.ResponseWriter, results []TextSearchResult, query, lang string, elapsed float64, page int, hasPrevPage, hasNextPage bool) {
|
||||||
|
|
Loading…
Reference in a new issue