Migrate to github.com/RedSkiesReaperr/howlongtobeat package

* Migrate to RedSkiesReaperr/howlongtobeat package

* Updated hltb to v0.1.1 & Added chromium

Author: RedSkiesReaperr

Dockerfile

@@ -12,6 +12,8 @@ RUN make docker
 # Release stage
 FROM alpine:3.18
 
+RUN apk update && apk add --no-cache chromium
+
 WORKDIR /bin
 COPY --from=build /usr/local/bin/igdb-app /bin/igdb-app
 RUN touch .env

README.md

@@ -142,6 +142,7 @@ Thanks to all the authors who created and maintains the following packages:
 - [google/uuid](https://github.com/google/uuid)
 - [jomei/notionapi](https://github.com/jomei/notionapi)
 - [spf13/viper](https://github.com/spf13/viper)
+- [RedSkiesReaperr/howlongtobeat](https://github.com/RedSkiesReaperr/howlongtobeat)
 
 ## Contributing
 If you wish to contribute to this project, please follow these steps:

core/core.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"log"
 	"notion-igdb-autocomplete/config"
-	"notion-igdb-autocomplete/howlongtobeat"
 	"notion-igdb-autocomplete/igdb"
 	"notion-igdb-autocomplete/notion"
 	"time"
 
+	"github.com/RedSkiesReaperr/howlongtobeat"
 	"github.com/jomei/notionapi"
 )
 

core/initialize.go

@@ -3,9 +3,11 @@ package core
 import (
 	"fmt"
 	"log"
-	"notion-igdb-autocomplete/howlongtobeat"
+
 	"notion-igdb-autocomplete/igdb"
 	"notion-igdb-autocomplete/notion"
+
+	"github.com/RedSkiesReaperr/howlongtobeat"
 )
 
 func (c *Core) initializeNotion() error {
@@ -41,8 +43,12 @@ func (c *Core) initializeIGDB() error {
 func (c *Core) initializeHLTB() error {
 	log.Println("Initializing HowLongToBeat client")
 	log.Println(".... Creating")
-	client := howlongtobeat.NewClient()
-	c.hltb = &client
+	client, err := howlongtobeat.New()
+	if err != nil {
+		return fmt.Errorf("create failed: %v", err)
+	}
+
+	c.hltb = client
 
 	log.Println(".... Success!")
 	return nil

core/task.go

@@ -4,12 +4,13 @@ import (
 	"fmt"
 	"log"
 	"notion-igdb-autocomplete/choose"
-	"notion-igdb-autocomplete/howlongtobeat"
+	hltb "notion-igdb-autocomplete/howlongtobeat"
 	"notion-igdb-autocomplete/igdb"
 	"notion-igdb-autocomplete/notion"
 	"strings"
 	"time"
 
+	"github.com/RedSkiesReaperr/howlongtobeat"
 	"github.com/google/uuid"
 )
 
@@ -139,19 +140,25 @@ func (t *Task) runGameInfos(notionClient *notion.Client, igdbClient *igdb.Client
 }
 
 func (t *Task) runTimeToBeat(notionClient *notion.Client, hltbClient *howlongtobeat.Client) error {
+	req, err := howlongtobeat.NewSearchRequest(t.Query)
+	if err != nil {
+		return err
+	}
+
 	// Fetch
-	games, err := hltbClient.SearchGame(t.Query)
+	response, err := hltbClient.Search(req)
 	if err != nil {
 		return err
 	}
 
 	foundGame := &howlongtobeat.Game{Name: fmt.Sprintf("Not found (%s)", t.Query), CompletionMain: 0, CompletionPlus: 0, CompletionFull: 0}
-	if len(games) > 0 {
-		foundGame = &games[0]
+	if len(response.Data) > 0 {
+		foundGame = &response.Data[0]
 	}
 
 	// Update
-	_, err = notionClient.Page(t.NotionId).Update(foundGame)
+	wrappedGame := hltb.GameWrapper{Game: foundGame}
+	_, err = notionClient.Page(t.NotionId).Update(wrappedGame)
 	if err != nil {
 		return err
 	}

go.mod

@@ -3,11 +3,11 @@ module notion-igdb-autocomplete
 go 1.21.1
 
 require (
+	github.com/RedSkiesReaperr/howlongtobeat v0.1.1
 	github.com/agnivade/levenshtein v1.1.1
 	github.com/charmbracelet/bubbles v0.17.1
 	github.com/charmbracelet/bubbletea v0.25.0
 	github.com/charmbracelet/lipgloss v0.9.1
-	github.com/corpix/uarand v0.2.0
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/google/uuid v1.6.0
 	github.com/jomei/notionapi v1.12.9
@@ -18,6 +18,8 @@ require (
 	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
+	github.com/corpix/uarand v0.2.0 // indirect
+	github.com/go-rod/rod v0.116.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
@@ -38,6 +40,11 @@ require (
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/ysmood/fetchup v0.2.3 // indirect
+	github.com/ysmood/goob v0.4.0 // indirect
+	github.com/ysmood/got v0.40.0 // indirect
+	github.com/ysmood/gson v0.7.3 // indirect
+	github.com/ysmood/leakless v0.9.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect

go.sum

@@ -1,3 +1,7 @@
+github.com/RedSkiesReaperr/howlongtobeat v0.1.0 h1:HlNtiaXWkIxDNCQBustbsNDxjVSxedI58StGQ7VrwM4=
+github.com/RedSkiesReaperr/howlongtobeat v0.1.0/go.mod h1:urJQvzpSQSp3FsHOloXM+GxCt3yKFAmhsBeDmSM09eA=
+github.com/RedSkiesReaperr/howlongtobeat v0.1.1 h1:EyWu74Nnz+AE3w3bu0ma4IqCmM+63grRS4miIugG6+I=
+github.com/RedSkiesReaperr/howlongtobeat v0.1.1/go.mod h1:urJQvzpSQSp3FsHOloXM+GxCt3yKFAmhsBeDmSM09eA=
 github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8=
 github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo=
 github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=
@@ -26,6 +30,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/go-rod/rod v0.116.2 h1:A5t2Ky2A+5eD/ZJQr1EfsQSe5rms5Xof/qj296e+ZqA=
+github.com/go-rod/rod v0.116.2/go.mod h1:H+CMO9SCNc2TJ2WfrG+pKhITz57uGNYU43qYHh438Mg=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -95,6 +101,20 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
+github.com/ysmood/fetchup v0.2.3 h1:ulX+SonA0Vma5zUFXtv52Kzip/xe7aj4vqT5AJwQ+ZQ=
+github.com/ysmood/fetchup v0.2.3/go.mod h1:xhibcRKziSvol0H1/pj33dnKrYyI2ebIvz5cOOkYGns=
+github.com/ysmood/goob v0.4.0 h1:HsxXhyLBeGzWXnqVKtmT9qM7EuVs/XOgkX7T6r1o1AQ=
+github.com/ysmood/goob v0.4.0/go.mod h1:u6yx7ZhS4Exf2MwciFr6nIM8knHQIE22lFpWHnfql18=
+github.com/ysmood/gop v0.2.0 h1:+tFrG0TWPxT6p9ZaZs+VY+opCvHU8/3Fk6BaNv6kqKg=
+github.com/ysmood/gop v0.2.0/go.mod h1:rr5z2z27oGEbyB787hpEcx4ab8cCiPnKxn0SUHt6xzk=
+github.com/ysmood/got v0.40.0 h1:ZQk1B55zIvS7zflRrkGfPDrPG3d7+JOza1ZkNxcc74Q=
+github.com/ysmood/got v0.40.0/go.mod h1:W7DdpuX6skL3NszLmAsC5hT7JAhuLZhByVzHTq874Qg=
+github.com/ysmood/gotrace v0.6.0 h1:SyI1d4jclswLhg7SWTL6os3L1WOKeNn/ZtzVQF8QmdY=
+github.com/ysmood/gotrace v0.6.0/go.mod h1:TzhIG7nHDry5//eYZDYcTzuJLYQIkykJzCRIo4/dzQM=
+github.com/ysmood/gson v0.7.3 h1:QFkWbTH8MxyUTKPkVWAENJhxqdBa4lYTQWqZCiLG6kE=
+github.com/ysmood/gson v0.7.3/go.mod h1:3Kzs5zDl21g5F/BlLTNcuAGAYLKt2lV5G8D1zF3RNmg=
+github.com/ysmood/leakless v0.9.0 h1:qxCG5VirSBvmi3uynXFkcnLMzkphdh3xx5FtrORwDCU=
+github.com/ysmood/leakless v0.9.0/go.mod h1:R8iAXPRaG97QJwqxs74RdwzcRHT1SWCGTNqY8q0JvMQ=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=

howlongtobeat/client.go

@@ -5,24 +5,15 @@ import (
 	"math"
 	"time"
 
+	"github.com/RedSkiesReaperr/howlongtobeat"
 	"github.com/jomei/notionapi"
 )
 
-type Result struct {
-	Count int   `json:"count,required"`
-	Data  Games `json:"data,required"`
+type GameWrapper struct {
+	Game *howlongtobeat.Game
 }
 
-type Game struct {
-	Name           string `json:"game_name,required"`
-	CompletionMain int    `json:"comp_main,required"`
-	CompletionPlus int    `json:"comp_plus,required"`
-	CompletionFull int    `json:"comp_100,required"`
-}
-
-type Games []Game
-
-func (g Game) ReadableCompletion(rawCompletion int) string {
+func (ug GameWrapper) readableCompletion(rawCompletion int) string {
 	duration := time.Duration(rawCompletion * int(time.Second))
 	hours := int(math.Round(duration.Hours()))
 
@@ -34,15 +25,15 @@ func (g Game) ReadableCompletion(rawCompletion int) string {
 }
 
 // Implements notion.PageUpdateRequester interface
-func (g Game) UpdateRequest() notionapi.PageUpdateRequest {
+func (ug GameWrapper) UpdateRequest() notionapi.PageUpdateRequest {
 	return notionapi.PageUpdateRequest{
 		Properties: notionapi.Properties{
 			"Time to complete (Main Story)": notionapi.RichTextProperty{
 				Type: notionapi.PropertyTypeRichText,
 				RichText: []notionapi.RichText{
 					{
 						Text: &notionapi.Text{
-							Content: g.ReadableCompletion(g.CompletionMain),
+							Content: ug.readableCompletion(ug.Game.CompletionMain),
 						},
 					},
 				},
@@ -52,7 +43,7 @@ func (g Game) UpdateRequest() notionapi.PageUpdateRequest {
 				RichText: []notionapi.RichText{
 					{
 						Text: &notionapi.Text{
-							Content: g.ReadableCompletion(g.CompletionPlus),
+							Content: ug.readableCompletion(ug.Game.CompletionPlus),
 						},
 					},
 				},
@@ -62,7 +53,7 @@ func (g Game) UpdateRequest() notionapi.PageUpdateRequest {
 				RichText: []notionapi.RichText{
 					{
 						Text: &notionapi.Text{
-							Content: g.ReadableCompletion(g.CompletionFull),
+							Content: ug.readableCompletion(ug.Game.CompletionFull),
 						},
 					},
 				},