From 72970bd52ec32ad3c4d9b1d9c785a3454358f1a0 Mon Sep 17 00:00:00 2001 From: Lucas BEE Date: Mon, 6 Apr 2020 12:11:00 +0200 Subject: [PATCH] Cleanup episodes handling Do not delete fields about an episode when we already have them Update the polochon and trakttv libs --- backend/models/episodes.go | 101 ++++++++++++++++++++++--------------- backend/models/utils.go | 19 +++++++ go.mod | 2 +- go.sum | 8 +-- 4 files changed, 84 insertions(+), 46 deletions(-) create mode 100644 backend/models/utils.go diff --git a/backend/models/episodes.go b/backend/models/episodes.go index 2733332..05cbd2c 100644 --- a/backend/models/episodes.go +++ b/backend/models/episodes.go @@ -1,6 +1,7 @@ package models import ( + "database/sql" "time" "github.com/jmoiron/sqlx" @@ -30,41 +31,31 @@ const ( // episodeDB represents the Episode in the DB type episodeDB struct { - ID string `db:"id"` - TvdbID int `db:"tvdb_id"` - ImdbID string `db:"imdb_id"` - ShowImdbID string `db:"show_imdb_id"` - ShowTvdbID int `db:"show_tvdb_id"` - Season int `db:"season"` - Episode int `db:"episode"` - Title string `db:"title"` - Rating float32 `db:"rating"` - Plot string `db:"plot"` - Thumb string `db:"thumb"` - Runtime int `db:"runtime"` - Aired string `db:"aired"` - ReleaseGroup string `db:"release_group"` - Created time.Time `db:"created_at"` - Updated time.Time `db:"updated_at"` + ID string `db:"id"` + TvdbID int `db:"tvdb_id"` + ImdbID string `db:"imdb_id"` + ShowImdbID string `db:"show_imdb_id"` + ShowTvdbID int `db:"show_tvdb_id"` + Season int `db:"season"` + Episode int `db:"episode"` + Title string `db:"title"` + Rating float32 `db:"rating"` + Plot string `db:"plot"` + Thumb string `db:"thumb"` + Runtime int `db:"runtime"` + Aired string `db:"aired"` + Created time.Time `db:"created_at"` + Updated time.Time `db:"updated_at"` } -// NewEpisodeFromPolochon returns an episodeDB from a polochon ShowEpisode -func NewEpisodeFromPolochon(e *polochon.ShowEpisode) *episodeDB { - return &episodeDB{ - TvdbID: e.TvdbID, - ImdbID: e.EpisodeImdbID, - ShowImdbID: e.ShowImdbID, - ShowTvdbID: e.ShowTvdbID, - Season: e.Season, - Episode: e.Episode, - Title: e.Title, - Rating: e.Rating, - Plot: e.Plot, - Thumb: e.Thumb, - Runtime: e.Runtime, - Aired: e.Aired, - ReleaseGroup: e.ReleaseGroup, +// getEpisodeDB returns an episodeDB from a polochon.ShowEpisode +func getEpisodeDB(db *sqlx.DB, episode *polochon.ShowEpisode) (*episodeDB, error) { + var episodeDB episodeDB + err := db.QueryRowx(getEpisodeQuery, episode.ShowImdbID, episode.Season, episode.Episode).StructScan(&episodeDB) + if err != nil { + return &episodeDB, err } + return &episodeDB, nil } // NewEpisodeFromDB returns a new polochon ShowEpisode from an episodeDB @@ -76,10 +67,11 @@ func NewEpisodeFromDB(eDB *episodeDB) *polochon.ShowEpisode { // FillEpisodeFromDB fills a ShowEpisode from an episodeDB func FillEpisodeFromDB(eDB *episodeDB, pEpisode *polochon.ShowEpisode) { - pEpisode.TvdbID = eDB.TvdbID - pEpisode.EpisodeImdbID = eDB.ImdbID - pEpisode.ShowImdbID = eDB.ShowImdbID - pEpisode.ShowTvdbID = eDB.ShowTvdbID + // Keep the data that never changes but only if we have it + updateIfNonEmpty(&pEpisode.EpisodeImdbID, eDB.ImdbID) + updateIfNonEmpty(&pEpisode.ShowImdbID, eDB.ShowImdbID) + updateIfNonZeroInt(&pEpisode.TvdbID, eDB.TvdbID) + updateIfNonZeroInt(&pEpisode.ShowTvdbID, eDB.ShowTvdbID) pEpisode.Season = eDB.Season pEpisode.Episode = eDB.Episode pEpisode.Title = eDB.Title @@ -92,13 +84,12 @@ func FillEpisodeFromDB(eDB *episodeDB, pEpisode *polochon.ShowEpisode) { // GetEpisode gets an episode and fills the polochon episode func GetEpisode(db *sqlx.DB, pEpisode *polochon.ShowEpisode) error { - var episodeDB episodeDB - err := db.QueryRowx(getEpisodeQuery, pEpisode.ShowImdbID, pEpisode.Season, pEpisode.Episode).StructScan(&episodeDB) + episodeDB, err := getEpisodeDB(db, pEpisode) if err != nil { return err } - FillEpisodeFromDB(&episodeDB, pEpisode) + FillEpisodeFromDB(episodeDB, pEpisode) return nil } @@ -125,13 +116,41 @@ func GetEpisodes(db *sqlx.DB, pShow *polochon.Show, log *logrus.Entry) error { return nil } +// updateFromEpisode will update the episodeDB from a ShowEpisode +// We just make sure to never update the episodeDB with empty value +func (e *episodeDB) updateFromEpisode(showEpisode *polochon.ShowEpisode) { + updateIfNonEmpty(&e.ImdbID, showEpisode.EpisodeImdbID) + updateIfNonEmpty(&e.ShowImdbID, showEpisode.ShowImdbID) + updateIfNonEmpty(&e.Title, showEpisode.Title) + updateIfNonEmpty(&e.Plot, showEpisode.Plot) + updateIfNonEmpty(&e.Thumb, showEpisode.Thumb) + updateIfNonEmpty(&e.Aired, showEpisode.Aired) + updateIfNonZeroInt(&e.TvdbID, showEpisode.TvdbID) + updateIfNonZeroInt(&e.ShowTvdbID, showEpisode.ShowTvdbID) + updateIfNonZeroInt(&e.Season, showEpisode.Season) + updateIfNonZeroInt(&e.Episode, showEpisode.Episode) + updateIfNonZeroInt(&e.Runtime, showEpisode.Runtime) + updateIfNonZeroFloat(&e.Rating, showEpisode.Rating) +} + // UpsertEpisode upserts the episode func UpsertEpisode(db *sqlx.DB, showEpisode *polochon.ShowEpisode) error { - e := NewEpisodeFromPolochon(showEpisode) - r, err := db.NamedQuery(upsertEpisodeQuery, e) + // Try to get the episode + episodeDB, err := getEpisodeDB(db, showEpisode) + // Return only if the error is != sql.ErrNoRows + if err != nil { + if err != sql.ErrNoRows { + return err + } + } + + // Update the episodeDB from the showEpisode we have + episodeDB.updateFromEpisode(showEpisode) + r, err := db.NamedQuery(upsertEpisodeQuery, episodeDB) if err != nil { return err } defer r.Close() + return nil } diff --git a/backend/models/utils.go b/backend/models/utils.go new file mode 100644 index 0000000..b222729 --- /dev/null +++ b/backend/models/utils.go @@ -0,0 +1,19 @@ +package models + +func updateIfNonEmpty(old *string, newValue string) { + if newValue != "" { + *old = newValue + } +} + +func updateIfNonZeroInt(old *int, newValue int) { + if newValue != 0 { + *old = newValue + } +} + +func updateIfNonZeroFloat(old *float32, newValue float32) { + if newValue != 0. { + *old = newValue + } +} diff --git a/go.mod b/go.mod index 6d62375..6c46d73 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 github.com/odwrtw/errors v0.0.0-20170604160533-c747b9d17833 github.com/odwrtw/papi v0.0.0-20190511132159-936937ad8b6a - github.com/odwrtw/polochon v0.0.0-20200403121328-985a643dc6aa + github.com/odwrtw/polochon v0.0.0-20200404170220-273fe65c963b github.com/phyber/negroni-gzip v0.0.0-20180113114010-ef6356a5d029 github.com/pioz/tvdb v0.0.0-20190503215423-f45c687faba9 // indirect github.com/robfig/cron v1.1.0 diff --git a/go.sum b/go.sum index 625fdac..61ba926 100644 --- a/go.sum +++ b/go.sum @@ -137,12 +137,12 @@ github.com/odwrtw/papi v0.0.0-20190413103029-bd5bfea85ae6 h1:bF8XKFfYNY4quRdqJ5E github.com/odwrtw/papi v0.0.0-20190413103029-bd5bfea85ae6/go.mod h1:CXotdtODLpW0/yuFV5XH8Rmrj0eAfPLvdMKykPM2WCk= github.com/odwrtw/papi v0.0.0-20190511132159-936937ad8b6a h1:9mdPet/ianrckPWR2jSekoafz6BaqbF7kPXLnDEIKu8= github.com/odwrtw/papi v0.0.0-20190511132159-936937ad8b6a/go.mod h1:eY0skvVHJBwbSJ18uq2c1T4SvhdEV8R0XFSb0zKh5Yo= -github.com/odwrtw/polochon v0.0.0-20200403121328-985a643dc6aa h1:Jh5cSZCcBwzULN9po+0mzydbPqiMRZAXkScON7BNvVw= -github.com/odwrtw/polochon v0.0.0-20200403121328-985a643dc6aa/go.mod h1:vb6PuVZ0ToGnfgVxijvUdYsayoItmdOYSVM8yMnEtJo= +github.com/odwrtw/polochon v0.0.0-20200404170220-273fe65c963b h1:XBJs10QfMcVOr+jMpB2k8Pwfe4ohIWNMfNGStJdi1Pg= +github.com/odwrtw/polochon v0.0.0-20200404170220-273fe65c963b/go.mod h1:6/D6IYxfGqRi8KioWN8ViiwssUdjhZV+U7gw5Xb8Aqk= github.com/odwrtw/tpb v0.0.0-20200130133144-c846aa382c6f h1:fwEIGT+o3e8+XkBqrwsE3/+9ketTQXflPhCkv3/w990= github.com/odwrtw/tpb v0.0.0-20200130133144-c846aa382c6f/go.mod h1:updLvMbQo2xHoz94MX9+GqmSoKhf6E8fs/J+wLvvu6A= -github.com/odwrtw/trakttv v0.0.0-20170418094324-76889e438555 h1:5JfY2cKMq0g+IpgAaY+6EPRZZK8eV2lgRIUsqPB+hBY= -github.com/odwrtw/trakttv v0.0.0-20170418094324-76889e438555/go.mod h1:vb2u+kCVrf+HyvVMzmTzisu+OUsBwwGfFtEmT+S5nzw= +github.com/odwrtw/trakttv v0.0.0-20200404161731-0d594827e4f9 h1:PuQLHO75MXUsJpf9BcTVxvR/FCkdn1MZnZt6h3o6cJI= +github.com/odwrtw/trakttv v0.0.0-20200404161731-0d594827e4f9/go.mod h1:I2ogRfOYYqNpMhljPYdFUVUrLbZQ89Ba7QdfiW6EcJ0= github.com/odwrtw/transmission v0.0.0-20170515140915-08885b3058e7 h1:NZz8yuBWWG4o3EGdoMap4o+JPKLBhqeSQ7nTfX6XPos= github.com/odwrtw/transmission v0.0.0-20170515140915-08885b3058e7/go.mod h1:geyfqmhRrxMwbEo5RPwf5rw5vITQHHQlA7+azUQSIJM= github.com/odwrtw/yifysubs v0.0.0-20190417174645-d3bba6e4cfe0 h1:LasNCTYd9Pc3x34xc1p054ZF8rVPLhD2Vfk3Db2KSpo=