Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix radarr movie types. #72

Merged
merged 2 commits into from
Oct 11, 2022
Merged

Fix radarr movie types. #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48e64fa
fix radarr movie types
davidnewhall Oct 8, 2022
d9ac6a3
fix comment
davidnewhall Oct 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 24 additions & 55 deletions radarr/movie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,15 @@ type Movie struct {
Genres []string `json:"genres,omitempty"`
Tags []int `json:"tags,omitempty"`
Added time.Time `json:"added,omitempty"`
Ratings *starr.Ratings `json:"ratings,omitempty"`
Ratings starr.OpenRatings `json:"ratings,omitempty"`
MovieFile *MovieFile `json:"movieFile,omitempty"`
Collection *Collection `json:"collection,omitempty"`
HasFile bool `json:"hasFile,omitempty"`
IsAvailable bool `json:"isAvailable,omitempty"`
Monitored bool `json:"monitored"`
Popularity float64 `json:"popularity"`
OriginalLanguage *starr.Value `json:"originalLanguage,omitempty"`
Comment on lines +55 to +56
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

"originalFilePath": "Beast.2022.1080p.AMZN.WEBRip.DD5.1.X.264-EVO/Beast.2022.1080p.AMZN.WEBRip.DD5.1.X.264-EVO.mkv",
"popularity": 2240.269,

AddOptions *AddMovieOptions `json:"addOptions,omitempty"` // only available upon adding a movie.
}

// Collection belongs to a Movie.
Expand All @@ -77,6 +80,7 @@ type MovieFile struct {
Languages []*starr.Value `json:"languages"`
ReleaseGroup string `json:"releaseGroup"`
Edition string `json:"edition"`
OriginalFilePath string `json:"originalFilePath"`
}

// MediaInfo is part of a MovieFile.
Expand All @@ -91,6 +95,7 @@ type MediaInfo struct {
VideoBitrate int `json:"videoBitrate"`
VideoCodec string `json:"videoCodec"`
VideoFps float64 `json:"videoFps"`
VideoDynamicRangeType string `json:"videoDynamicRangeType"`
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a blank string on the movie I looked at.

"videoDynamicRangeType": "",

Resolution string `json:"resolution"`
RunTime string `json:"runTime"`
ScanType string `json:"scanType"`
Expand Down Expand Up @@ -118,53 +123,17 @@ type AddMovieOptions struct {
SearchForMovie bool `json:"searchForMovie"`
}

// AddMovieOutput is the data returned when adding a movier.
type AddMovieOutput struct {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only difference between this and Movie was the AddOptions member. I went ahead and added that to Movie.

ID int64 `json:"id"`
Title string `json:"title"`
OriginalTitle string `json:"originalTitle"`
AlternateTitles []*AlternativeTitle `json:"alternateTitles"`
SecondaryYearSourceID int64 `json:"secondaryYearSourceId"`
SortTitle string `json:"sortTitle"`
SizeOnDisk int `json:"sizeOnDisk"`
Status string `json:"status"`
Overview string `json:"overview"`
InCinemas time.Time `json:"inCinemas"`
DigitalRelease time.Time `json:"digitalRelease"`
Images []*starr.Image `json:"images"`
Website string `json:"website"`
Year int `json:"year"`
YouTubeTrailerID string `json:"youTubeTrailerId"`
Studio string `json:"studio"`
Path string `json:"path"`
QualityProfileID int64 `json:"qualityProfileId"`
MinimumAvailability Availability `json:"minimumAvailability"`
FolderName string `json:"folderName"`
Runtime int `json:"runtime"`
CleanTitle string `json:"cleanTitle"`
ImdbID string `json:"imdbId"`
TmdbID int64 `json:"tmdbId"`
TitleSlug string `json:"titleSlug"`
Genres []string `json:"genres"`
Tags []int `json:"tags"`
Added time.Time `json:"added"`
AddOptions *AddMovieOptions `json:"addOptions"`
Ratings *starr.Ratings `json:"ratings"`
HasFile bool `json:"hasFile"`
Monitored bool `json:"monitored"`
IsAvailable bool `json:"isAvailable"`
}

// AlternativeTitle is part of a Movie.
type AlternativeTitle struct {
MovieID int `json:"movieId"`
Title string `json:"title"`
SourceType string `json:"sourceType"`
SourceID int `json:"sourceId"`
Votes int `json:"votes"`
VoteCount int `json:"voteCount"`
Language *starr.Value `json:"language"`
ID int `json:"id"`
MovieMetadataID int64 `json:"movieMetadataId"`
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

  "alternateTitles": [
    {
      "sourceType": "tmdb",
      "movieMetadataId": 2671,
      "title": "Zvērs",
      "sourceId": 0,
      "votes": 0,
      "voteCount": 0,
      "language": {
        "id": 1,
        "name": "English"
      },
      "id": 18219
    },
    {
      "sourceType": "tmdb",
      "movieMetadataId": 2671,
      "title": "La Bestia",
      "sourceId": 0,
      "votes": 0,
      "voteCount": 0,
      "language": {
        "id": 3,
        "name": "Spanish"
      },
      "id": 18220
    },
    {
      "sourceType": "tmdb",
      "movieMetadataId": 2671,
      "title": "جانور",
      "sourceId": 0,
      "votes": 0,
      "voteCount": 0,
      "language": {
        "id": 1,
        "name": "English"
      },
      "id": 18221
    },
    {
      "sourceType": "tmdb",
      "movieMetadataId": 2671,
      "title": "Žvėris",
      "sourceId": 0,
      "votes": 0,
      "voteCount": 0,
      "language": {
        "id": 24,
        "name": "Lithuanian"
      },
      "id": 18330
    }

MovieID int64 `json:"movieId"`
Title string `json:"title"`
SourceType string `json:"sourceType"`
SourceID int64 `json:"sourceId"`
Votes int `json:"votes"`
VoteCount int `json:"voteCount"`
Language *starr.Value `json:"language"`
ID int64 `json:"id"`
}

// GetMovie grabs a movie from the queue, or all movies if tmdbId is 0.
Expand Down Expand Up @@ -207,18 +176,18 @@ func (r *Radarr) GetMovieByIDContext(ctx context.Context, movieID int64) (*Movie
}

// UpdateMovie sends a PUT request to update a movie in place.
func (r *Radarr) UpdateMovie(movieID int64, movie *Movie) error {
func (r *Radarr) UpdateMovie(movieID int64, movie *Movie) (*Movie, error) {
return r.UpdateMovieContext(context.Background(), movieID, movie)
}

// UpdateMovieContext sends a PUT request to update a movie in place.
func (r *Radarr) UpdateMovieContext(ctx context.Context, movieID int64, movie *Movie) error {
func (r *Radarr) UpdateMovieContext(ctx context.Context, movieID int64, movie *Movie) (*Movie, error) {
var body bytes.Buffer
if err := json.NewEncoder(&body).Encode(movie); err != nil {
return fmt.Errorf("json.Marshal(%s): %w", bpMovie, err)
return nil, fmt.Errorf("json.Marshal(%s): %w", bpMovie, err)
}

var output interface{} // not sure what this looks like.
var output Movie

req := starr.Request{
URI: path.Join(bpMovie, fmt.Sprint(movieID)),
Expand All @@ -228,25 +197,25 @@ func (r *Radarr) UpdateMovieContext(ctx context.Context, movieID int64, movie *M
req.Query.Add("moveFiles", "true")

if err := r.PutInto(ctx, req, &output); err != nil {
return fmt.Errorf("api.Put(%s): %w", &req, err)
return nil, fmt.Errorf("api.Put(%s): %w", &req, err)
}

return nil
return &output, nil
}

// AddMovie adds a movie to the queue.
func (r *Radarr) AddMovie(movie *AddMovieInput) (*AddMovieOutput, error) {
func (r *Radarr) AddMovie(movie *AddMovieInput) (*Movie, error) {
return r.AddMovieContext(context.Background(), movie)
}

// AddMovieContext adds a movie to the queue.
func (r *Radarr) AddMovieContext(ctx context.Context, movie *AddMovieInput) (*AddMovieOutput, error) {
func (r *Radarr) AddMovieContext(ctx context.Context, movie *AddMovieInput) (*Movie, error) {
var body bytes.Buffer
if err := json.NewEncoder(&body).Encode(movie); err != nil {
return nil, fmt.Errorf("json.Marshal(%s): %w", bpMovie, err)
}

var output AddMovieOutput
var output Movie

req := starr.Request{URI: bpMovie, Query: make(url.Values), Body: &body}
req.Query.Add("moveFiles", "true")
Expand Down
4 changes: 4 additions & 0 deletions shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,12 @@ type Ratings struct {
Votes int64 `json:"votes"`
Value float64 `json:"value"`
Popularity float64 `json:"popularity,omitempty"`
Type string `json:"type,omitempty"`
}

// OpenRatings is a ratings type that has a source and type.
type OpenRatings map[string]Ratings
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the /api/v3/movie endpoint came this cool payload...

"ratings": {
    "imdb": {
      "votes": 16719,
      "value": 5.6,
      "type": "user"
    },
    "tmdb": {
      "votes": 566,
      "value": 7,
      "type": "user"
    },
    "metacritic": {
      "votes": 0,
      "value": 54,
      "type": "user"
    },
    "rottenTomatoes": {
      "votes": 0,
      "value": 69,
      "type": "user"
    }
  }


// IsLoaded is a generic struct used in a few places.
type IsLoaded struct {
IsLoaded bool `json:"isLoaded"`
Expand Down