Merge pull request #33 from jmillerv/29-add-oldest-random-support-to-…

…podcastplayorder

29 add oldest random support to podcastplayorder

README.md

@@ -86,11 +86,17 @@ At the moment go-dj only supports local files.
 go-dj recognizes four types of content `file`, `folder`, `podcast`, `web_radio`
 
 
+### File
 The `file` type is intended to be a local file; however, I see the use case for being able to pull files from URLs and will
 eventually add that functionality
 
+### Podcast
 The `podcast` file is for podcasts with published RSS feeds. go-dj will parse the RSS and select from there.
 
+The podcast type defaults to playing newest. If the oldest or random flags are passed, podcasts will play in those orders. 
+An improvement on this would be to allow this to be set on a per podcast basis in the config.yml. 
+
+### Web Radio
 The `web_radio` file is able to take in a web radio address and play it through your go-dj.
 
 ## Feature Requests 

content/podcast.go

@@ -20,7 +20,7 @@ type Podcast struct {
 	Name      string
 	URL       string
 	Player    streamPlayer
-	PlayOrder PlayOrder // options: newest, oldest, random
+	PlayOrder PlayOrder
 }
 
 type PlayOrder string
@@ -43,15 +43,12 @@ func (p *Podcast) Get() error {
 		ep = pods.getNewestEpisode()
 		break
 	case playOrderOldest:
-		log.Panic("implement me")
-		//ep = pods.getOldestEpisode()
+		ep = pods.getOldestEpisode()
 	case playOrderRandom:
-		log.Panic("implement me")
-		//ep = pods.getRandomEpisode()
+		ep = pods.getRandomEpisode()
 	}
 
 	// setup podcast stream
-	log.Infof("extension: %v", ep.EpExtension)
 	podcastStream.playerName = streamPlayerName
 	podcastStream.url = ep.EpURL
 	podcastStream.command = exec.Command(podcastStream.playerName, "-quiet", podcastStream.url)

content/podcast_episodes.go

@@ -27,8 +27,8 @@ func (p *podcasts) getNewestEpisode() episode {
 	return newestEpisode
 }
 
-func (p *podcasts) getOldestEpisode() *episode {
-	var oldestEpisode *episode
+func (p *podcasts) getOldestEpisode() episode {
+	var oldestEpisode episode
 	var date *time.Time
 	// TODO if played, log that it's in the cache, and skip to the next episode
 	for _, ep := range p.Episodes {
@@ -43,8 +43,8 @@ func (p *podcasts) getOldestEpisode() *episode {
 	return oldestEpisode
 }
 
-func (p *podcasts) getRandomEpisode() *episode {
-	var randomEpisode *episode
+func (p *podcasts) getRandomEpisode() episode {
+	var randomEpisode episode
 	rand.Seed(time.Now().UnixNano())
 	item := p.Episodes[rand.Intn(len(p.Episodes))]
 	// TODO if played, log that it's in the cache, and skip to the next episode

content/program.go

@@ -12,6 +12,11 @@ type Program struct {
 	Type     MediaType
 }
 
+var (
+	PodcastPlayOrderRandom   bool
+	PodcastPlayerOrderOldest bool
+)
+
 func (p *Program) GetMedia() Media {
 	media := p.mediaFactory()
 	return media
@@ -36,7 +41,14 @@ func (p *Program) mediaFactory() Media {
 		podcast := m.(*Podcast)
 		podcast.Name = p.Name
 		podcast.URL = p.Source
-		podcast.PlayOrder = "newest" // TODO: Add support for random, oldest, and set from PlayOrder from config.
+		podcast.PlayOrder = playOrderNewest // default
+		if PodcastPlayerOrderOldest == true {
+			podcast.PlayOrder = playOrderOldest
+		}
+		if PodcastPlayOrderRandom == true {
+			podcast.PlayOrder = playOrderRandom
+		}
+
 		log.Debugf("returning podcast: %v", formatter.StructToString(podcast))
 		return podcast
 	case *WebRadio:

main.go

@@ -50,6 +50,20 @@ func main() {
 						Hidden:      false,
 						Destination: &content.Shuffled,
 					},
+					cli.BoolFlag{
+						Name:        "pod-oldest",
+						Usage:       "podcasts will play starting with the oldest first",
+						Required:    false,
+						Hidden:      false,
+						Destination: &content.PodcastPlayerOrderOldest,
+					},
+					cli.BoolFlag{
+						Name:        "pod-random",
+						Usage:       "podcasts will play in a random order",
+						Required:    false,
+						Hidden:      false,
+						Destination: &content.PodcastPlayOrderRandom,
+					},
 				},
 			},
 		},
@@ -59,3 +73,9 @@ func main() {
 		log.Fatal(err)
 	}
 }
+
+func init() {
+	content.Shuffled = false
+	content.PodcastPlayerOrderOldest = false
+	content.PodcastPlayOrderRandom = false
+}