Switch from open library API to Inventaire API

internal/openlibrary/openlibrary.go

@@ -1,53 +1,12 @@
 package openlibrary
 
 import (
-	"encoding/json"
-	"net/http"
 	"net/url"
-	"strconv"
+
+	"git.artlef.fr/PersonalLibraryManager/internal/callapiutils"
 )
 
 func computeOpenLibraryUrl(paths ...string) (*url.URL, error) {
 	baseUrl := "https://openlibrary.org"
-	u, err := url.Parse(baseUrl)
-	if err != nil {
-		return nil, err
-	}
-	for _, p := range paths {
-		u = u.JoinPath(p)
-	}
-	return u, nil
-}
-
-func fetchAndParseResult[T any](u *url.URL, queryResult *T) error {
-	resp, err := doOpenLibraryQuery(u)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	decoder := json.NewDecoder(resp.Body)
-	err = decoder.Decode(queryResult)
-	return err
-}
-
-func doOpenLibraryQuery(u *url.URL) (*http.Response, error) {
-	client := &http.Client{}
-	req, err := http.NewRequest("GET", u.String(), nil)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Add("Accept", "application/json")
-	req.Header.Add("User-Agent", "PersonalLibraryManager/0.1 (artlef@protonmail.com)")
-	return client.Do(req)
-}
-
-func addQueryParamInt(u *url.URL, paramName string, paramValue int) {
-	addQueryParam(u, paramName, strconv.Itoa(paramValue))
-}
-
-func addQueryParam(u *url.URL, paramName string, paramValue string) {
-	q := u.Query()
-	q.Set(paramName, paramValue)
-	u.RawQuery = q.Encode()
+	return callapiutils.ComputeUrl(baseUrl, paths...)
 }

internal/openlibrary/openlibraryauthor.go

@@ -3,6 +3,8 @@ package openlibrary
 import (
 	"encoding/json"
 	"fmt"
+
+	"git.artlef.fr/PersonalLibraryManager/internal/callapiutils"
 )
 
 type OpenLibraryAuthorResult struct {
@@ -46,7 +48,7 @@ func CallOpenLibraryAuthor(openLibraryId string) (OpenLibraryAuthorResult, error
 		return response, err
 	}
 	var queryResult openLibraryParsedAuthor
-	err = fetchAndParseResult(u, &queryResult)
+	err = callapiutils.FetchAndParseResult(u, &queryResult)
 	if err != nil {
 		return response, err
 	}

internal/openlibrary/openlibrarybook.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"strings"
+
+	"git.artlef.fr/PersonalLibraryManager/internal/callapiutils"
 )
 
 type OpenLibraryBookResult struct {
@@ -63,7 +65,7 @@ func CallOpenLibraryBook(openLibraryId string) (OpenLibraryBookResult, error) {
 		return response, err
 	}
 	var queryResult openLibraryParsedBook
-	err = fetchAndParseResult(u, &queryResult)
+	err = callapiutils.FetchAndParseResult(u, &queryResult)
 	if err != nil {
 		return response, err
 	}

internal/openlibrary/openlibrarysearch.go

@@ -1,5 +1,7 @@
 package openlibrary
 
+import "git.artlef.fr/PersonalLibraryManager/internal/callapiutils"
+
 type OpenLibrarySearchResult struct {
 	Books    []OpenLibrarySearchBook `json:"docs"`
 	NumFound int                     `json:"numFound"`
@@ -18,12 +20,12 @@ func CallOpenLibrarySearch(searchterm string, limit int, offset int) (OpenLibrar
 		return queryResult, err
 	}
 	if limit != 0 {
-		addQueryParamInt(u, "limit", limit)
+		callapiutils.AddQueryParamInt(u, "limit", limit)
 	}
 	if offset != 0 {
-		addQueryParamInt(u, "offset", offset)
+		callapiutils.AddQueryParamInt(u, "offset", offset)
 	}
-	addQueryParam(u, "q", searchterm)
-	err = fetchAndParseResult(u, &queryResult)
+	callapiutils.AddQueryParam(u, "q", searchterm)
+	err = callapiutils.FetchAndParseResult(u, &queryResult)
 	return queryResult, err
 }