Merge pull request #138 from shift72/AB#12169-Add-carousel-image-focus-to-film-and-tv-models

Ab#12169 add carousel image focus to film and tv models

Author: l0ud0gg

changelog.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+### Added
+- Carousel Focus to film / tv models.
+
 ## 0.17.4
 
 ### Changed

kibble/api/films.go

@@ -171,7 +171,8 @@ func (f filmV2) mapToModel(serviceConfig models.ServiceConfig, itemIndex models.
 		Refs: models.FilmRefs{
 			LetterboxdID: f.Refs.LetterboxdID,
 		},
-		Subtitles: f.Subtitles,
+		Subtitles:     f.Subtitles,
+		CarouselFocus: f.CarouselFocus,
 	}
 
 	film.Images = models.ImageMapToImageSet(film.ImageMap)
@@ -274,6 +275,7 @@ type filmV2 struct {
 	Genres          []string                    `json:"genres"`
 	Tags            []string                    `json:"tags"`
 	Title           string                      `json:"title"`
+	CarouselFocus   string                      `json:"carousel_focus"`
 	Slug            string                      `json:"slug"`
 	FilmID          int                         `json:"film_id"`
 	ID              int                         `json:"id"`

kibble/api/tv.go

@@ -201,6 +201,7 @@ func (t tvSeasonV2) mapToModel(serviceConfig models.ServiceConfig, itemIndex mod
 		Cast:            make([]models.CastMember, 0),
 		Crew:            make([]models.CrewMember, 0),
 		CustomFields:    t.CustomFields,
+		CarouselFocus:   t.CarouselFocus,
 	}
 
 	// map trailers
@@ -373,6 +374,7 @@ type tvSeasonV2 struct {
 	Overview        string   `json:"overview"`
 	PublishingState string   `json:"publishing_state"`
 	Title           string   `json:"title"`
+	CarouselFocus   string   `json:"carousel_focus"`
 	ShowInfo        tvShowV2 `json:"show_info"`
 	Slug            string   `json:"slug"`
 	SeasonNum       int      `json:"season_num"`

kibble/models/film.go

@@ -54,6 +54,7 @@ type Film struct {
 	CustomFields    CustomFields
 	Refs            FilmRefs
 	Classifications []Classification
+	CarouselFocus   string
 }
 
 // FilmCollection - all films

kibble/models/generic_item.go

@@ -59,3 +59,26 @@ func (i GenericItem) GetTranslatedTitle(T i18n.TranslateFunc, i18nKey string) st
 	}
 	return i.Title
 }
+
+// get carousel focus
+func (i GenericItem) GetCarouselImageFocusArea() string {
+	switch i.ItemType {
+	case "film":
+		if f, ok := i.InnerItem.(Film); ok {
+			return f.CarouselFocus
+		}
+	case "tvseason":
+		if s, ok := i.InnerItem.(TVSeason); ok {
+			return s.CarouselFocus
+		}
+	case "page":
+		if p, ok := i.InnerItem.(Page); ok {
+			return p.CustomFields.GetString("carousel_focus", "")
+		}
+	case "bundle":
+		if b, ok := i.InnerItem.(Bundle); ok {
+			return b.CustomFields.GetString("carousel_focus", "")
+		}
+	}
+	return ""
+}

kibble/models/tv.go

@@ -79,6 +79,7 @@ type TVSeason struct {
 	Recommendations []GenericItem
 	CustomFields    CustomFields
 	Classifications []Classification
+	CarouselFocus   string
 }
 
 // TVShowCollection -