ODWRTW/canape
2
2
Fork 0
Code Issues 3 Pull Requests 1 Releases Activity

Merge branch 'smallChanges' into 'master'

Browse Source 
Small changes

See merge request !28
This commit is contained in:
Grégoire Delattre 2017-01-04 13:47:17 +00:00
commit 243a7c524e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal/movies/movies.go
View File

@ -64,6 +64,10 @@ type MovieDB struct {
// NewMovieDB returns a Movie ready to be put in DB from a // NewMovieDB returns a Movie ready to be put in DB from a
// Movie // Movie
func NewMovieDB(m *Movie) MovieDB { func NewMovieDB(m *Movie) MovieDB {
genres := []string{}
if m.Genres != nil {
genres = m.Genres
}
return MovieDB{ return MovieDB{
ID: m.ID, ID: m.ID,
ImdbID: m.ImdbID, ImdbID: m.ImdbID,
@ -77,7 +81,7 @@ func NewMovieDB(m *Movie) MovieDB {
Runtime: m.Runtime, Runtime: m.Runtime,
SortTitle: m.SortTitle, SortTitle: m.SortTitle,
Tagline: m.Tagline, Tagline: m.Tagline,
Genres: m.Genres, Genres: genres,
Created: m.Created, Created: m.Created,
Updated: m.Updated, Updated: m.Updated,
} }

6
src/internal/shows/shows.go
View File

@ -257,15 +257,15 @@ func (s *Show) GetPosterURL(env *web.Env) string {
// downloadImages will download the show images // downloadImages will download the show images
func (s *Show) downloadImages(env *web.Env) { func (s *Show) downloadImages(env *web.Env) {
// Download the banner // Download the banner
err := web.Download(s.Show.Banner, s.imgURL(env, "banner")) err := web.Download(s.Show.Banner, s.imgFile(env, "banner"))
if err != nil { if err != nil {
env.Log.Errorf("failed to dowload banner: %s", err) env.Log.Errorf("failed to dowload banner: %s", err)
} }
err = web.Download(s.Show.Fanart, s.imgURL(env, "fanart")) err = web.Download(s.Show.Fanart, s.imgFile(env, "fanart"))
if err != nil { if err != nil {
env.Log.Errorf("failed to dowload fanart: %s", err) env.Log.Errorf("failed to dowload fanart: %s", err)
} }
err = web.Download(s.Show.Poster, s.imgURL(env, "poster")) err = web.Download(s.Show.Poster, s.imgFile(env, "poster"))
if err != nil { if err != nil {
env.Log.Errorf("failed to dowload poster: %s", err) env.Log.Errorf("failed to dowload poster: %s", err)
} }