Improve fetching from wallhaven

Author: bjarneo

app.go

@@ -521,7 +521,7 @@ func (a *App) SaveWallhavenConfig(config map[string]interface{}) error {
 
 // SearchWallhaven searches wallhaven.cc for wallpapers.
 func (a *App) SearchWallhaven(params wallhaven.SearchParams) (*wallhaven.SearchResult, error) {
-	return a.wallhaven.Search(params)
+	return a.wallhaven.SearchMultiPage(params, 2)
 }
 
 // DownloadWallpaper downloads a wallpaper from a URL. Returns local path.

frontend/src/lib/components/wallhaven/WallhavenBrowser.svelte

@@ -6,6 +6,7 @@
         getResults,
         getIsSearching,
         search,
+        searchPage,
         getTotalPages,
         getTotalResults,
         getPage,
@@ -45,7 +46,7 @@
             totalPages={getTotalPages()}
             onPageChange={p => {
                 setPage(p);
-                search();
+                searchPage();
             }}
         />
     {/if}

frontend/src/lib/stores/wallhaven.svelte.ts

@@ -154,6 +154,15 @@ export function togglePurity(index: number): void {
 
 // --- Actions ---
 export async function search(): Promise<void> {
+    page = 1;
+    await doSearch();
+}
+
+export async function searchPage(): Promise<void> {
+    await doSearch();
+}
+
+async function doSearch(): Promise<void> {
     isSearching = true;
     try {
         const {SearchWallhaven} = await import('../../../wailsjs/go/main/App');

internal/wallhaven/client.go

@@ -102,6 +102,59 @@ func (c *Client) Search(params SearchParams) (*SearchResult, error) {
 	return &result, nil
 }
 
+// SearchMultiPage fetches numPages consecutive pages concurrently and merges
+// the results. Metadata is normalized so the caller sees logical pagination
+// (e.g. last_page is adjusted for the multi-page fetch).
+func (c *Client) SearchMultiPage(params SearchParams, numPages int) (*SearchResult, error) {
+	if numPages <= 1 {
+		return c.Search(params)
+	}
+
+	type pageResult struct {
+		index  int
+		result *SearchResult
+		err    error
+	}
+
+	ch := make(chan pageResult, numPages)
+	for i := 0; i < numPages; i++ {
+		go func(idx int) {
+			p := params
+			p.Page = params.Page + idx
+			res, err := c.Search(p)
+			ch <- pageResult{index: idx, result: res, err: err}
+		}(i)
+	}
+
+	results := make([]*SearchResult, numPages)
+	for i := 0; i < numPages; i++ {
+		pr := <-ch
+		if pr.err != nil {
+			if pr.index == 0 {
+				return nil, pr.err
+			}
+			continue
+		}
+		results[pr.index] = pr.result
+	}
+
+	merged := results[0]
+	if merged == nil {
+		return nil, fmt.Errorf("wallhaven search failed for first page")
+	}
+	for i := 1; i < numPages; i++ {
+		if results[i] != nil {
+			merged.Data = append(merged.Data, results[i].Data...)
+		}
+	}
+
+	// Normalize pagination metadata so the caller sees logical pages
+	merged.Meta.CurrentPage = (params.Page-1)/numPages + 1
+	merged.Meta.LastPage = (merged.Meta.LastPage + numPages - 1) / numPages
+
+	return merged, nil
+}
+
 // wallhavenPagePattern matches wallhaven.cc page URLs and extracts the ID.
 var wallhavenPagePattern = regexp.MustCompile(`wallhaven\.cc/w/([a-zA-Z0-9]+)`)