Merge pull request #51 from fancybits/more-expanded-image-types

Expand all Image Types
cyruzin · Dec 20, 2023 · 6388ea1 · 6388ea1
2 parents 040b666 + d25c580
commit 6388ea1
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 73 deletions.
diff --git a/collections.go b/collections.go
@@ -46,27 +46,22 @@ func (c *Client) GetCollectionDetails(
  return &collectionDetails, nil
 }
 
+// CollectionImage type is a struct for a single image.
+type CollectionImage struct {
+ AspectRatio float32 `json:"aspect_ratio"`
+ FilePath string `json:"file_path"`
+ Height int `json:"height"`
+ Iso639_1 string `json:"iso_639_1"`
+ VoteAverage float32 `json:"vote_average"`
+ VoteCount int64 `json:"vote_count"`
+ Width int `json:"width"`
+}
+
 // CollectionImages type is a struct for images JSON response.
 type CollectionImages struct {
- ID int64 `json:"id"`
- Backdrops []struct {
- AspectRatio float32 `json:"aspect_ratio"`
- FilePath string `json:"file_path"`
- Height int `json:"height"`
- Iso639_1 string `json:"iso_639_1"`
- VoteAverage float32 `json:"vote_average"`
- VoteCount int64 `json:"vote_count"`
- Width int `json:"width"`
- } `json:"backdrops"`
- Posters []struct {
- AspectRatio float32 `json:"aspect_ratio"`
- FilePath string `json:"file_path"`
- Height int `json:"height"`
- Iso639_1 string `json:"iso_639_1"`
- VoteAverage float32 `json:"vote_average"`
- VoteCount int64 `json:"vote_count"`
- Width int `json:"width"`
- } `json:"posters"`
+ ID int64 `json:"id"`
+ Backdrops []CollectionImage `json:"backdrops"`
+ Posters []CollectionImage `json:"posters"`
 }
 
 // GetCollectionImages get the images for a collection by id.

diff --git a/companies.go b/companies.go
@@ -67,19 +67,22 @@ func (c *Client) GetCompanyAlternativeNames(
  return &companyAlternativeNames, nil
 }
 
+// CompanyImage type is a struct for a single image.
+type CompanyImage struct {
+ AspectRatio float32 `json:"aspect_ratio"`
+ FilePath string `json:"file_path"`
+ Height int `json:"height"`
+ ID string `json:"id"`
+ FileType string `json:"file_type"`
+ VoteAverage float32 `json:"vote_average"`
+ VoteCount int64 `json:"vote_count"`
+ Width int `json:"width"`
+}
+
 // CompanyImages type is a struct for images JSON response.
 type CompanyImages struct {
- ID int64 `json:"id"`
- Logos []struct {
- AspectRatio float32 `json:"aspect_ratio"`
- FilePath string `json:"file_path"`
- Height int `json:"height"`
- ID string `json:"id"`
- FileType string `json:"file_type"`
- VoteAverage float32 `json:"vote_average"`
- VoteCount int64 `json:"vote_count"`
- Width int `json:"width"`
- } `json:"logos"`
+ ID int64 `json:"id"`
+ Logos []CompanyImage `json:"logos"`
 }
 
 // GetCompanyImages get a companies logos by id.

diff --git a/networks.go b/networks.go
@@ -61,19 +61,22 @@ func (c *Client) GetNetworkAlternativeNames(
  return &networkAltenativeNames, nil
 }
 
+// NetworkImage type is a struct for a single image.
+type NetworkImage struct {
+ AspectRatio float64 `json:"aspect_ratio"`
+ FilePath string `json:"file_path"`
+ Height int `json:"height"`
+ ID string `json:"id"`
+ FileType string `json:"file_type"`
+ VoteAverage float64 `json:"vote_average"`
+ VoteCount int64 `json:"vote_count"`
+ Width int `json:"width"`
+}
+
 // NetworkImages type is a struct for images JSON response.
 type NetworkImages struct {
- ID int64 `json:"id"`
- Logos []struct {
- AspectRatio float64 `json:"aspect_ratio"`
- FilePath string `json:"file_path"`
- Height int `json:"height"`
- ID string `json:"id"`
- FileType string `json:"file_type"`
- VoteAverage float64 `json:"vote_average"`
- VoteCount int64 `json:"vote_count"`
- Width int `json:"width"`
- } `json:"logos"`
+ ID int64 `json:"id"`
+ Logos []NetworkImage `json:"logos"`
 }
 
 // GetNetworkImages get the TV network logos by id.
@@ -86,8 +89,6 @@ type NetworkImages struct {
 // An SVG can be scaled properly beyond those dimensions if you
 // call them as a PNG.
 //
-//
-//
 // https://developers.themoviedb.org/3/networks/get-network-images
 func (c *Client) GetNetworkImages(
  id int,

diff --git a/people.go b/people.go
@@ -388,18 +388,21 @@ func (c *Client) GetPersonExternalIDs(
  return &personExternalIDS, nil
 }
 
+// PersonImage type is a struct for a single image.
+type PersonImage struct {
+ Iso639_1 string `json:"iso_639_1"`
+ Width int `json:"width"`
+ Height int `json:"height"`
+ VoteCount int64 `json:"vote_count"`
+ VoteAverage float32 `json:"vote_average"`
+ FilePath string `json:"file_path"`
+ AspectRatio float32 `json:"aspect_ratio"`
+}
+
 // PersonImages type is a struct for images JSON response.
 type PersonImages struct {
- Profiles []struct {
- Iso639_1 string `json:"iso_639_1"`
- Width int `json:"width"`
- Height int `json:"height"`
- VoteCount int64 `json:"vote_count"`
- VoteAverage float32 `json:"vote_average"`
- FilePath string `json:"file_path"`
- AspectRatio float32 `json:"aspect_ratio"`
- } `json:"profiles"`
- ID int `json:"id,omitempty"`
+ Profiles []PersonImage `json:"profiles"`
+ ID int `json:"id,omitempty"`
 }
 
 // GetPersonImages get the images for a person.

diff --git a/tv_episodes.go b/tv_episodes.go
@@ -252,18 +252,21 @@ func (c *Client) GetTVEpisodeExternalIDs(
  return &tvEpisodeExternalIDs, nil
 }
 
+// TVEpisodeImage type is a struct for a single image.
+type TVEpisodeImage struct {
+ AspectRatio float32 `json:"aspect_ratio"`
+ FilePath string `json:"file_path"`
+ Height int `json:"height"`
+ Iso6391 interface{} `json:"iso_639_1"`
+ VoteAverage float32 `json:"vote_average"`
+ VoteCount int64 `json:"vote_count"`
+ Width int `json:"width"`
+}
+
 // TVEpisodeImages type is a struct for images JSON response.
 type TVEpisodeImages struct {
- ID int64 `json:"id,omitempty"`
- Stills []struct {
- AspectRatio float32 `json:"aspect_ratio"`
- FilePath string `json:"file_path"`
- Height int `json:"height"`
- Iso6391 interface{} `json:"iso_639_1"`
- VoteAverage float32 `json:"vote_average"`
- VoteCount int64 `json:"vote_count"`
- Width int `json:"width"`
- } `json:"stills"`
+ ID int64 `json:"id,omitempty"`
+ Stills []TVEpisodeImage `json:"stills"`
 }
 
 // GetTVEpisodeImages get the images that belong to a TV episode.

diff --git a/tv_seasons.go b/tv_seasons.go
@@ -236,18 +236,21 @@ func (c *Client) GetTVSeasonExternalIDs(
  return &tvSeasonExternalIDs, nil
 }
 
+// TVSeasonImage type is a struct for a single image.
+type TVSeasonImage struct {
+ AspectRatio float32 `json:"aspect_ratio"`
+ FilePath string `json:"file_path"`
+ Height int `json:"height"`
+ Iso639_1 string `json:"iso_639_1"`
+ VoteAverage float32 `json:"vote_average"`
+ VoteCount int64 `json:"vote_count"`
+ Width int `json:"width"`
+}
+
 // TVSeasonImages type is a struct for images JSON response.
 type TVSeasonImages struct {
- ID int64 `json:"id,omitempty"`
- Posters []struct {
- AspectRatio float32 `json:"aspect_ratio"`
- FilePath string `json:"file_path"`
- Height int `json:"height"`
- Iso639_1 string `json:"iso_639_1"`
- VoteAverage float32 `json:"vote_average"`
- VoteCount int64 `json:"vote_count"`
- Width int `json:"width"`
- } `json:"posters"`
+ ID int64 `json:"id,omitempty"`
+ Posters []TVSeasonImage `json:"posters"`
 }
 
 // GetTVSeasonImages get the images that belong to a TV season.