From b9a834cb691879252606458949953383d47fbbc2 Mon Sep 17 00:00:00 2001 From: Quentin Lemaire Date: Sun, 26 Apr 2020 16:16:08 +0200 Subject: [PATCH] fix: Use more defer function --- disk.go | 8 ++++---- dummy_test.go | 1 + history.go | 9 ++++++--- lookup.go | 6 +++--- movie.go | 28 ++++++++++++++-------------- status.go | 8 ++++---- 6 files changed, 32 insertions(+), 28 deletions(-) diff --git a/disk.go b/disk.go index d369f19..1519a07 100644 --- a/disk.go +++ b/disk.go @@ -28,22 +28,22 @@ func newDiskspaceService(s *Service) *DiskspaceService { // Get return Radarr disk space info func (s *DiskspaceService) Get() (*Diskspaces, error) { diskspaceURL := fmt.Sprintf("%s/api%s", s.s.url, diskspaceURI) - response, err := s.s.client.Get(diskspaceURL) + resp, err := s.s.client.Get(diskspaceURL) if err != nil { return nil, err } + defer resp.Body.Close() - err = parseRadarrResponse(response) + err = parseRadarrResponse(resp) if err != nil { return nil, err } var diskspaces Diskspaces - err = json.NewDecoder(response.Body).Decode(&diskspaces) + err = json.NewDecoder(resp.Body).Decode(&diskspaces) if err != nil { return nil, err } - _ = response.Body.Close() return &diskspaces, nil } diff --git a/dummy_test.go b/dummy_test.go index 00e0b03..08dee41 100644 --- a/dummy_test.go +++ b/dummy_test.go @@ -26,6 +26,7 @@ func helperLoadBytes(name string) []byte { if err != nil { panic(err) } + return bytes } diff --git a/history.go b/history.go index c5553e6..b5e3e27 100644 --- a/history.go +++ b/history.go @@ -125,19 +125,22 @@ func (s *HistoryService) paginate(page int) (*History, error) { q.Add("pageSize", "50") request.URL.RawQuery = q.Encode() - response, err := s.s.client.Do(request) + resp, err := s.s.client.Do(request) if err != nil { return nil, err } - err = parseRadarrResponse(response) + defer resp.Body.Close() + + err = parseRadarrResponse(resp) if err != nil { return nil, err } var history History - err = json.NewDecoder(response.Body).Decode(&history) + err = json.NewDecoder(resp.Body).Decode(&history) if err != nil { return nil, err } + return &history, nil } diff --git a/lookup.go b/lookup.go index 082a4dd..677a90c 100644 --- a/lookup.go +++ b/lookup.go @@ -39,6 +39,7 @@ func (l *LookupService) Plain(term string) (Movies, error) { if err != nil { return nil, err } + defer resp.Body.Close() err = parseRadarrResponse(resp) if err != nil { @@ -51,7 +52,6 @@ func (l *LookupService) Plain(term string) (Movies, error) { return nil, err } - _ = resp.Body.Close() return movies, nil } @@ -72,6 +72,7 @@ func (l *LookupService) Tmdb(TMDBID int) (*Movie, error) { if err != nil { return nil, err } + defer resp.Body.Close() err = parseRadarrResponse(resp) if err != nil { @@ -84,7 +85,6 @@ func (l *LookupService) Tmdb(TMDBID int) (*Movie, error) { return nil, err } - _ = resp.Body.Close() return &movie, nil } @@ -110,6 +110,7 @@ func (l *LookupService) Imdb(IMDBID string) (*Movie, error) { if err != nil { return nil, err } + defer resp.Body.Close() err = parseRadarrResponse(resp) if err != nil { @@ -122,6 +123,5 @@ func (l *LookupService) Imdb(IMDBID string) (*Movie, error) { return nil, err } - _ = resp.Body.Close() return &movie, nil } diff --git a/movie.go b/movie.go index 9a2f4b3..10e4879 100644 --- a/movie.go +++ b/movie.go @@ -167,23 +167,23 @@ type UpcomingOptions struct { // https://github.com/Radarr/Radarr/wiki/API:Movie#getid func (m *MovieService) Get(movieID int) (*Movie, error) { movieURL := fmt.Sprintf("%s/api%s/%d", m.s.url, movieURI, movieID) - response, err := m.s.client.Get(movieURL) + resp, err := m.s.client.Get(movieURL) if err != nil { return nil, err } + defer resp.Body.Close() - err = parseRadarrResponse(response) + err = parseRadarrResponse(resp) if err != nil { return nil, err } var movie Movie - err = json.NewDecoder(response.Body).Decode(&movie) + err = json.NewDecoder(resp.Body).Decode(&movie) if err != nil { return nil, err } - _ = response.Body.Close() return &movie, nil } @@ -191,23 +191,23 @@ func (m *MovieService) Get(movieID int) (*Movie, error) { // https://github.com/Radarr/Radarr/wiki/API:Movie#get func (m *MovieService) List() (Movies, error) { moviesURL := fmt.Sprintf("%s/api%s", m.s.url, movieURI) - response, err := m.s.client.Get(moviesURL) + resp, err := m.s.client.Get(moviesURL) if err != nil { return nil, err } + defer resp.Body.Close() - err = parseRadarrResponse(response) + err = parseRadarrResponse(resp) if err != nil { return nil, err } var movies Movies - err = json.NewDecoder(response.Body).Decode(&movies) + err = json.NewDecoder(resp.Body).Decode(&movies) if err != nil { return nil, err } - _ = response.Body.Close() return movies, nil } @@ -245,23 +245,23 @@ func (m *MovieService) Upcoming(opts ...*UpcomingOptions) (Movies, error) { } } - response, err := m.s.client.Do(req) + resp, err := m.s.client.Do(req) if err != nil { return nil, err } + defer resp.Body.Close() - err = parseRadarrResponse(response) + err = parseRadarrResponse(resp) if err != nil { return nil, err } var movies Movies - err = json.NewDecoder(response.Body).Decode(&movies) + err = json.NewDecoder(resp.Body).Decode(&movies) if err != nil { return nil, err } - _ = response.Body.Close() return movies, nil } @@ -286,9 +286,9 @@ func (m *MovieService) Delete(movie *Movie, opts ...*DeleteMovieOptions) error { if err != nil { return err } + defer resp.Body.Close() err = parseRadarrResponse(resp) - _ = resp.Body.Close() return err } @@ -299,6 +299,7 @@ func (m *MovieService) Excluded() (ExcludedMovies, error) { if err != nil { return nil, err } + defer resp.Body.Close() err = parseRadarrResponse(resp) if err != nil { @@ -311,6 +312,5 @@ func (m *MovieService) Excluded() (ExcludedMovies, error) { return nil, err } - _ = resp.Body.Close() return movies, nil } diff --git a/status.go b/status.go index 782257f..da0325f 100644 --- a/status.go +++ b/status.go @@ -44,22 +44,22 @@ func newSystemStatusService(s *Service) *SystemStatusService { // Get https://github.com/Radarr/Radarr/wiki/API:System-Status#get func (s *SystemStatusService) Get() (*SystemStatus, error) { statusURL := fmt.Sprintf("%s/api%s", s.s.url, statusURI) - response, err := s.s.client.Get(statusURL) + resp, err := s.s.client.Get(statusURL) if err != nil { return nil, err } + defer resp.Body.Close() - err = parseRadarrResponse(response) + err = parseRadarrResponse(resp) if err != nil { return nil, err } var status SystemStatus - err = json.NewDecoder(response.Body).Decode(&status) + err = json.NewDecoder(resp.Body).Decode(&status) if err != nil { return nil, err } - _ = response.Body.Close() return &status, nil }