From: Diogo Franco (Kovensky) <diogomfranco@gmail.com>
Date: Thu, 25 Jul 2013 21:17:48 +0000 (-0300)
Subject: misc: Add (*EpisodeRange).Len()
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=77bd19cb3ffc00af0c73186674403be99641c212;p=go-anidb.git

misc: Add (*EpisodeRange).Len()

Use Valid() to check for validity on EpisodeRanges. Remove an unhelpful
panic.
---

diff --git a/misc/episoderange.go b/misc/episoderange.go
index 8a32017..9b0741e 100644
--- a/misc/episoderange.go
+++ b/misc/episoderange.go
@@ -60,13 +60,33 @@ func (er *EpisodeRange) Infinite() bool {
 	return er != nil && er.End == nil
 }
 
+// Returns the number of episodes that Episodes() would return.
+//
+// Returns -1 for infinite ranges.
+func (er *EpisodeRange) Len() int {
+	c := 0
+	switch {
+	case er.Infinite():
+		c = -1
+	case er.Valid():
+		if er.Start.Parts > 0 {
+			c += er.Start.Parts - er.Start.Part
+		}
+		c += 1 + er.End.Number - er.Start.Number
+		if er.End.Part > 0 {
+			c += er.End.Part
+		}
+	}
+	return c
+}
+
 // Returns a channel that can be used to iterate using for/range.
 //
 // If the EpisodeRange is infinite, then the channel is also infinite.
 // The caller is allowed to close the channel in such case.
 func (er *EpisodeRange) Episodes() chan Episode {
 	ch := make(chan Episode, 1)
-	if er == nil || er.Start == nil {
+	if !er.Valid() {
 		close(ch)
 		return ch
 	}
@@ -136,13 +156,9 @@ func (er *EpisodeRange) Episodes() chan Episode {
 //
 // Returns false otherwise.
 func (er *EpisodeRange) ContainsEpisodes(ec EpisodeContainer) bool {
-	if er == nil {
+	if !er.Valid() {
 		return false
 	}
-	if er.Start == nil || er.Start.Type != er.Type ||
-		(er.End != nil && er.End.Type != er.Type) {
-		panic("Invalid EpisodeRange used")
-	}
 
 	switch e := ec.(type) {
 	case *Episode:
@@ -263,12 +279,12 @@ func (er *EpisodeRange) Simplify() *EpisodeRange {
 // Episode as the split point. The Episode is not included in
 // the resulting ranges.
 func (er *EpisodeRange) Split(ep *Episode) []*EpisodeRange {
-	if !er.ContainsEpisodes(ep) { // implies same type
-		return []*EpisodeRange{er}
-	}
 	if !er.Valid() {
 		return []*EpisodeRange{nil, nil}
 	}
+	if !er.ContainsEpisodes(ep) { // implies same type
+		return []*EpisodeRange{er}
+	}
 
 	a := *er.Start