From 9e00e6994169e1bbd0673c676f2b2d8d28a166a6 Mon Sep 17 00:00:00 2001 From: Simon Ding Date: Mon, 30 Jun 2025 18:29:51 +0800 Subject: [PATCH] fix: deps --- engine/importlist.go | 18 ++++++++++++++++-- ent/schema/media.go | 10 ++++++---- go.sum | 8 ++++++++ pkg/tmdb/tmdb.go | 2 +- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/engine/importlist.go b/engine/importlist.go index 09618b6..be17dc2 100644 --- a/engine/importlist.go +++ b/engine/importlist.go @@ -217,11 +217,18 @@ func (c *Engine) AddTv2Watchlist(in AddWatchlistIn) (interface{}, error) { Limiter: schema.MediaLimiter{SizeMin: in.SizeMin, SizeMax: in.SizeMax}, Extras: schema.MediaExtras{ OriginalLanguage: detail.OriginalLanguage, - Genres: detail.Genres, + //Genres: detail.Genres, }, AlternativeTitles: alterTitles, } + for _, g := range detail.Genres { + m.Extras.Genres = append(m.Extras.Genres, schema.Genre{ + ID: g.ID, + Name: g.Name, + }) + } + r, err := c.db.AddMediaWatchlist(m, epIds) if err != nil { return nil, errors.Wrap(err, "add to list") @@ -338,7 +345,14 @@ func (c *Engine) AddMovie2Watchlist(in AddWatchlistIn) (interface{}, error) { extras := schema.MediaExtras{ IsAdultMovie: detail.Adult, OriginalLanguage: detail.OriginalLanguage, - Genres: detail.Genres, + //Genres: detail.Genres, + } + + for _, g := range detail.Genres { + extras.Genres = append(extras.Genres, schema.Genre{ + ID: g.ID, + Name: g.Name, + }) } if IsJav(detail) { javid := c.GetJavid(in.TmdbID) diff --git a/ent/schema/media.go b/ent/schema/media.go index 916124f..5c529be 100644 --- a/ent/schema/media.go +++ b/ent/schema/media.go @@ -60,10 +60,12 @@ type MediaExtras struct { JavId string `json:"javid"` //OriginCountry []string `json:"origin_country"` OriginalLanguage string `json:"original_language"` - Genres []struct { - ID int64 `json:"id"` - Name string `json:"name"` - } `json:"genres"` + Genres []Genre `json:"genres"` +} + +type Genre struct { + ID int64 `json:"id"` + Name string `json:"name"` } func (m *MediaExtras) IsJav() bool { diff --git a/go.sum b/go.sum index 229f49d..7864da0 100644 --- a/go.sum +++ b/go.sum @@ -315,6 +315,8 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -349,6 +351,8 @@ github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g= github.com/nikoksr/notify v1.0.0 h1:qe9/6FRsWdxBgQgWcpvQ0sv8LRGJZDpRB4TkL2uNdO8= github.com/nikoksr/notify v1.0.0/go.mod h1:hPaaDt30d6LAA7/5nb0e48Bp/MctDfycCSs8VEgN29I= +github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= +github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -455,6 +459,8 @@ github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= @@ -672,6 +678,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= +golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkg/tmdb/tmdb.go b/pkg/tmdb/tmdb.go index 9672242..3a605bf 100644 --- a/pkg/tmdb/tmdb.go +++ b/pkg/tmdb/tmdb.go @@ -125,7 +125,7 @@ func (c *Client) SearchMedia(query string, lang string, page int) (*SearchResult } searchResult := &SearchResult{ - Page: res.Page, + Page: int(res.Page), TotalResults: res.TotalResults, TotalPages: res.TotalPages, }