homelab/Watcharr
1
0
Fork 0
mirror of https://github.com/sbondCo/Watcharr.git synced 2026-08-07 07:14:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

tmdb: Make req local, Movie/Show details funcs now accept struct options

Browse Source
This commit is contained in:
IRHM
2026-08-02 22:22:58 +01:00
committed by momi
parent bff354fcc3
commit fb1017f551
10 changed files with 95 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/feature/content/router.go
+10 -10
View File
@@ -76,13 +76,13 @@ func (r *Router) GetMovieDetails(c *gin.Context) {
c.JSON(http.StatusBadRequest, router.ErrorResponse{Error: "an id was not provided"})
return
}
content, err := r.tmdb.MovieDetails(
c.Param("id"),
c.MustGet("userCountry").(string),
map[string]string{
content, err := r.tmdb.MovieDetails(tmdb.MovieDetailsOptions{
ID: c.Param("id"),
Country: c.MustGet("userCountry").(string),
Params: map[string]string{
"append_to_response": "videos,watch/providers,similar",
},
)
})
if err != nil {
c.JSON(http.StatusBadRequest, router.ErrorResponse{Error: err.Error()})
return
@@ -134,13 +134,13 @@ func (r *Router) GetTvDetails(c *gin.Context) {
return
}
// 1. Get details
content, err := r.tmdb.ShowDetails(
c.Param("id"),
c.MustGet("userCountry").(string),
map[string]string{
content, err := r.tmdb.ShowDetails(tmdb.ShowDetailsOptions{
ID: c.Param("id"),
Country: c.MustGet("userCountry").(string),
Params: map[string]string{
"append_to_response": "videos,watch/providers,similar,external_ids,keywords",
},
)
})
if err != nil {
c.JSON(http.StatusBadRequest, router.ErrorResponse{Error: err.Error()})
return
server/feature/search/search.go
+6 -2
View File
@@ -194,7 +194,9 @@ func (s *Service) searchMovieById(
resp *domain.SearchResponse,
) error {
slog.Debug("searchMovieById: Running.", "id", id)
details, err := s.tmdb.MovieDetails(id, "", map[string]string{})
details, err := s.tmdb.MovieDetails(tmdb.MovieDetailsOptions{
ID: id,
})
if err != nil {
slog.Error("searchMovieById: Failed to search tmdb!", "error", err)
return errors.New("content request failed")
@@ -236,7 +238,9 @@ func (s *Service) searchTvById(
resp *domain.SearchResponse,
) error {
slog.Debug("searchTvById: Running.", "id", id)
details, err := s.tmdb.ShowDetails(id, "", map[string]string{})
details, err := s.tmdb.ShowDetails(tmdb.ShowDetailsOptions{
ID: id,
})
if err != nil {
slog.Error("searchTvById: Failed to search tmdb!", "error", err)
return errors.New("content request failed")
server/media/tmdb/tmdb.go
+4 -4
View File
@@ -19,7 +19,7 @@ import (
var ContentStore = gocache.New(time.Hour*24, time.Minute)
type ContentProvider interface {
CacheContentTv(content TMDBShowDetails, onlyUpdate bool) (entity.Content, error)
CacheContentShow(content TMDBShowDetails, onlyUpdate bool) (entity.Content, error)
CacheContentMovie(content TMDBMovieDetails, onlyUpdate bool) (entity.Content, error)
}
@@ -45,7 +45,7 @@ func (t *TMDB) GetKey() string {
return "d047fa61d926371f277e7a83c9c4ff2c"
}
func (t *TMDB) APIRequest(ep string, p map[string]string) ([]byte, error) {
func (t *TMDB) apiRequest(ep string, p map[string]string) ([]byte, error) {
slog.Debug("tmdbAPIRequest", "endpoint", ep, "params", p)
base, err := url.Parse("https://api.themoviedb.org/3")
if err != nil {
@@ -83,8 +83,8 @@ func (t *TMDB) APIRequest(ep string, p map[string]string) ([]byte, error) {
return body, nil
}
func (t *TMDB) Request(ep string, p map[string]string, resp interface{}) error {
body, err := t.APIRequest(ep, p)
func (t *TMDB) req(ep string, p map[string]string, resp interface{}) error {
body, err := t.apiRequest(ep, p)
if err != nil {
return err
}
server/media/tmdb/tmdb_discover.go
+2 -2
View File
@@ -28,7 +28,7 @@ func (t *TMDB) DiscoverMovies(
slog.Debug("DiscoverMovies: Returning cache.")
return *resp, nil
}
err := t.Request("/discover/movie", reqParams, &resp)
err := t.req("/discover/movie", reqParams, &resp)
if err != nil {
slog.Error("DiscoverMovies: Request failed!", "error", err)
return TMDBDiscoverMovies{}, errors.New("request failed")
@@ -56,7 +56,7 @@ func (t *TMDB) DiscoverShows(
slog.Debug("DiscoverShows: Returning cache.")
return *resp, nil
}
err := t.Request("/discover/tv", reqParams, &resp)
err := t.req("/discover/tv", reqParams, &resp)
if err != nil {
slog.Error("DiscoverShows: Request failed!", "error", err)
return TMDBDiscoverShows{}, errors.New("request failed")
server/media/tmdb/tmdb_movie.go
+31 -11
View File
@@ -8,32 +8,52 @@ import (
"github.com/sbondCo/Watcharr/cache"
)
func (t *TMDB) MovieDetails(
id string,
country string,
rParams map[string]string,
) (TMDBMovieDetails, error) {
type MovieDetailsOptions struct {
// TMDB ID
ID string
// Country (currently used for watch providers)
Country string
// Request params map.
Params map[string]string
// If CacheContentMovie should be ran or not.
// If the caller wants to do its own caching to the db, it can use this
// to avoid multiple calls to CacheContentMovie.
DontRunDBCache bool
}
func (t *TMDB) MovieDetails(o MovieDetailsOptions) (TMDBMovieDetails, error) {
resp := new(TMDBMovieDetails)
cacheKey := cache.CreateCacheKey("MovieDetails", id, country, rParams)
cacheKey := cache.CreateCacheKey(
"MovieDetails",
o.ID,
o.Country,
o.Params)
if cache.GetCache(ContentStore, cacheKey, &resp) {
slog.Debug("MovieDetails: Returning cache.")
return *resp, nil
}
err := t.Request("/movie/"+id, rParams, &resp)
err := t.req("/movie/"+o.ID, o.Params, &resp)
if err != nil {
slog.Error("MovieDetails: Request failed!", "error", err)
return TMDBMovieDetails{}, errors.New("request failed")
}
resp.WatchProvidersTransformed = transformProviders(&resp.WatchProviders, country)
resp.WatchProviders = nil // We don't want this to linger around (in cache) since we have the transformed version now..
go t.contentProvider.CacheContentMovie(*resp, true)
resp.WatchProvidersTransformed = transformProviders(
&resp.WatchProviders,
o.Country)
// We don't want this to linger around (in cache) since we have the
// transformed version now..
resp.WatchProviders = nil
if !o.DontRunDBCache {
go t.contentProvider.CacheContentMovie(*resp, true)
}
ContentStore.Set(cacheKey, resp, time.Hour*24)
return *resp, nil
}
func (t *TMDB) MovieCredits(id string) (TMDBContentCredits, error) {
resp := new(TMDBContentCredits)
err := t.Request("/movie/"+id+"/credits", map[string]string{}, &resp)
err := t.req("/movie/"+id+"/credits", map[string]string{}, &resp)
if err != nil {
slog.Error("MovieCredits: Request failed!", "error", err)
return TMDBContentCredits{}, errors.New("request failed")
server/media/tmdb/tmdb_person.go
+3 -3
View File
@@ -11,7 +11,7 @@ import (
func (t *TMDB) PersonDetails(id string) (TMDBPersonDetails, error) {
resp := new(TMDBPersonDetails)
err := t.Request("/person/"+id, map[string]string{}, &resp)
err := t.req("/person/"+id, map[string]string{}, &resp)
if err != nil {
slog.Error("PersonDetails: Request failed!", "error", err)
return TMDBPersonDetails{}, errors.New("request failed")
@@ -26,7 +26,7 @@ func (t *TMDB) PersonCredits(id string) (TMDBPersonCombinedCredits, error) {
slog.Debug("PersonCredits: Returning cache.")
return *resp, nil
}
err := t.Request(
err := t.req(
"/person/"+id+"/combined_credits",
map[string]string{},
&resp)
@@ -45,7 +45,7 @@ func (t *TMDB) PopularPeople(pageNum int) (TMDBPopularPeople, error) {
slog.Debug("PopularPeople: Returning cache.")
return *resp, nil
}
err := t.Request(
err := t.req(
"/person/popular",
map[string]string{"page": strconv.Itoa(pageNum)},
&resp)
server/media/tmdb/tmdb_search.go
+5 -5
View File
@@ -65,7 +65,7 @@ func (t *TMDB) SearchMulti(
slog.Debug("SearchMulti: Returning cache.")
return *resp, nil
}
err := t.Request(
err := t.req(
"/search/multi",
o.AsParamsMap(),
&resp)
@@ -112,7 +112,7 @@ func (t *TMDB) SearchMovies(
slog.Debug("SearchMovies: Returning cache.")
return *resp, nil
}
err := t.Request(
err := t.req(
"/search/movie",
o.AsParamsMap(),
&resp)
@@ -162,7 +162,7 @@ func (t *TMDB) SearchShows(
slog.Debug("SearchShows: Returning cache.")
return *resp, nil
}
err := t.Request(
err := t.req(
"/search/tv",
o.AsParamsMap(),
&resp)
@@ -193,7 +193,7 @@ func (t *TMDB) SearchPeople(
slog.Debug("SearchPeople: Returning cache.")
return *resp, nil
}
err := t.Request(
err := t.req(
"/search/person",
o.AsParamsMap(),
&resp)
@@ -223,7 +223,7 @@ func (t *TMDB) SearchByExternalId(
slog.Debug("SearchByExternalId: Got cache.")
} else {
// If not found in cache, request data from tmdb.
err := t.Request(
err := t.req(
"/find/"+id,
map[string]string{"external_source": source + "_id"},
&resp)
server/media/tmdb/tmdb_show.go
+32 -12
View File
@@ -8,32 +8,52 @@ import (
"github.com/sbondCo/Watcharr/cache"
)
func (t *TMDB) ShowDetails(
id string,
country string,
rParams map[string]string,
) (TMDBShowDetails, error) {
cacheKey := cache.CreateCacheKey("ShowDetails", id, country, rParams)
type ShowDetailsOptions struct {
// TMDB ID
ID string
// Country (currently used for watch providers)
Country string
// Request params map.
Params map[string]string
// If CacheContentShow should be ran or not.
// If the caller wants to do its own caching to the db, it can use this
// to avoid multiple calls to CacheContentShow.
DontRunDBCache bool
}
func (t *TMDB) ShowDetails(o ShowDetailsOptions) (TMDBShowDetails, error) {
cacheKey := cache.CreateCacheKey(
"ShowDetails",
o.ID,
o.Country,
o.Params)
resp := new(TMDBShowDetails)
if cache.GetCache(ContentStore, cacheKey, &resp) {
slog.Debug("ShowDetails: Returning cache.")
return *resp, nil
}
err := t.Request("/tv/"+id, rParams, &resp)
err := t.req("/tv/"+o.ID, o.Params, &resp)
if err != nil {
slog.Error("ShowDetails: Request failed!", "error", err)
return TMDBShowDetails{}, errors.New("request failed")
}
resp.WatchProvidersTransformed = transformProviders(&resp.WatchProviders, country)
resp.WatchProviders = nil // We don't want this to linger around (in cache) since we have the transformed version now..
go t.contentProvider.CacheContentTv(*resp, true)
resp.WatchProvidersTransformed = transformProviders(
&resp.WatchProviders,
o.Country)
// We don't want this to linger around (in cache) since we have the
// transformed version now..
resp.WatchProviders = nil
if !o.DontRunDBCache {
go t.contentProvider.CacheContentShow(*resp, true)
}
ContentStore.Set(cacheKey, resp, time.Hour*24)
return *resp, nil
}
func (t *TMDB) ShowCredits(id string) (TMDBContentCredits, error) {
resp := new(TMDBContentCredits)
err := t.Request("/tv/"+id+"/credits", map[string]string{}, &resp)
err := t.req("/tv/"+id+"/credits", map[string]string{}, &resp)
if err != nil {
slog.Error("ShowCredits: Request failed!", "error", err)
return TMDBContentCredits{}, errors.New("request failed")
@@ -51,7 +71,7 @@ func (t *TMDB) SeasonDetails(
slog.Debug("SeasonDetails: Returning cache.")
return *resp, nil
}
err := t.Request(
err := t.req(
"/tv/"+showId+"/season/"+seasonNumber,
map[string]string{},
&resp)
server/media/tmdb/tmdb_trending.go
+1 -1
View File
@@ -34,7 +34,7 @@ func (t *TMDB) Trending(
slog.Debug("Trending: Returning cache.")
return *resp, nil
}
err := t.Request(
err := t.req(
"/trending/"+string(ttype)+"/day",
map[string]string{
"page": strconv.Itoa(pageNum),
server/media/tmdb/tmdb_watch_providers.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
func (t *TMDB) Regions() (TMDBRegions, error) {
resp := new(TMDBRegions)
err := t.Request(
err := t.req(
"/watch/providers/regions",
map[string]string{},
&resp)