Author: Adam <git@apiote.tk>
change progress calculation in TV series
libamuse/serie.go | 6 +++++- templates/tvserie.html | 1 + tmdb/serie.go | 1 +
diff --git a/libamuse/serie.go b/libamuse/serie.go index 5c5ca3aaec9fb9bde0baaa8f4ea07ac4de9775ea..e2e3e370ffa6d9c1e7dd850bb56eca9863037ded 100644 --- a/libamuse/serie.go +++ b/libamuse/serie.go @@ -98,6 +98,7 @@ experiences, err := db.GetItemExperiences(result.user.Username, tvSerie.Id, datastructure.ItemTypeTvserie) var ( watched int + skipped int watchedAndSkipped int ) for _, e := range experiences { @@ -110,13 +111,16 @@ } } if isWatched { watched += 1 + } else { + skipped += 1 } watchedAndSkipped += 1 } if tvSerie.AllEpisodes > 0 { - tvSerie.Progress = watchedAndSkipped * 100 / tvSerie.AllEpisodes + tvSerie.Progress = watched * 100 / (tvSerie.AllEpisodes - skipped) } tvSerie.WatchedEpisodes = watched + tvSerie.SkippedEpisodes = skipped return gott.Tuple(args), err } diff --git a/templates/tvserie.html b/templates/tvserie.html index 20cdcde5ef0b8482175c9d2f0a0f8e1afba03d50..9a93ff9c763a9025c513cd8553cddacb5262df06 100644 --- a/templates/tvserie.html +++ b/templates/tvserie.html @@ -94,6 +94,7 @@ {{if and .State.User .Data.IsOnWantList}} <p class="sans text-grey margin-top-1 margin-bottom-_5"><span class="material-icon"></span> {{$.Strings.Serie.watched}}</p> <p class="margin-lr-1 sans margin-tb-_5">Episodes: {{.Data.WatchedEpisodes}}/{{.Data.AllEpisodes}}</p> + <p class="margin-lr-1 sans margin-tb-_5">(Skipped: {{.Data.SkippedEpisodes}})</p> {{end}} </div> <div class="desktop-w6 phone-w12 margin-top-10 padding-lr-2 margin-bottom-2"> diff --git a/tmdb/serie.go b/tmdb/serie.go index 2d9bc7f72a75509b1e419ec7e4136923e4058d01..f7841897b85fb0ceab32e85134623e0ad84b5894 100644 --- a/tmdb/serie.go +++ b/tmdb/serie.go @@ -77,6 +77,7 @@ Next_episode_to_watch Episode Progress int WatchedEpisodes int AllEpisodes int + SkippedEpisodes int } func (s *TvSerie) GetItemInfo() datastructure.ItemInfo {