somadic 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e781f2967b238c8b0babce28ff7688a48bf01ce9
-  data.tar.gz: b35d981810b5b6f87dabaebf1155892d239935dd
+  metadata.gz: de245545ac8fcf5c46871ccc33da669bf8e110de
+  data.tar.gz: 3f22648c7c61efd72a150d68126c5fd49eb1de0b
 SHA512:
-  metadata.gz: c68b44cbae2e7bff1a956bf78cb43a00dabf092a58ecd6f52acf25a71408a4c1702b47bd566124d5059dc153033860065ad491a965860005a5ddba7589ef017e
-  data.tar.gz: 370cce2131766c31daa4b96f8e0f3e09b013500a71b384c0ff01fd0190b032ab20b8cdab87f3c9452cecbe0fba26e7fb164c57bfeaa5d70cf19805f3310e0373
+  metadata.gz: bcd9c0b0a9951feb56d54dad3baa2ed9fa5959ce1f262f2e66b6bc0621a143217b225634d44d6f574b289639956ac6c3147eee06ef3d207b46f15f407265752b
+  data.tar.gz: f562e66865f8f06bad224712ada70d7ec6d414a4d7f380a9f7d48d4c7a7a6793aa4273e395b7b622c23552b974c59697b1c7218bb3d014325b4c80966e98849e

data/README.md

@@ -1,7 +1,8 @@
 # Somadic
 
-Somadic is a bare-bones terminal-based player for [somafm.com](http://somafm.com) and [di.fm](http://di.fm). 
-It uses `mplayer` to do the heavy lifting. It's a hot Curses mess, but it works on my machine.
+Somadic is a bare-bones terminal-based player for [somafm.com](http://somafm.com), [di.fm](http://di.fm),
+and [SLAY Radio](http://www.slayradio.org). It uses `mplayer` to do the heavy lifting. It's also a hot 
+Curses mess, but it works on my machine.
 
 ```
 $ somadic di:breaks
@@ -28,8 +29,8 @@ Usage: somadic [options] [preset_name | [site1:channel1 ...]]
 
 You can specify either a `preset_name` or an arbitrary list of `site:channel` identifiers.
 
-  site: either `di` or `soma`
-  channel: a valid channel on `site`
+  site: `di`, `soma`, or `slayradio`
+  channel: a valid channel on `site`, or `slayradio` if site is slayradio
 
 DI premium channels require an environment variable: DI_FM_PREMIUM_ID.
 
@@ -62,6 +63,7 @@ a YAML file in `~/.somadic/presets`, say `chill.yaml`, with the following conten
 - soma:secretagent
 - di:psychill
 - soma:lush
+- slayradio:slayradio
 ```
 
 You can then start somadic with the preset's name:

data/bin/curses/somadic

@@ -11,10 +11,7 @@ require 'yaml'
 SOMADIC_PATH = ENV['HOME'] + '/.somadic'
 
 base_path = File.expand_path(File.dirname(__FILE__))
-Dir["#{base_path}/curses/lib/*.rb"].each do |file|
-  Somadic::Logger.debug("require #{file}")
-  require file
-end
+Dir["#{base_path}/curses/lib/*.rb"].each { |file| require file }
 
 Signal.trap("INT") do |sig|
   @channel.stop
@@ -29,8 +26,9 @@ end
 @optparser = OptionParser.new do |o|
   o.banner = 'Usage: somadic [options] site:channel [site:channel]'
   o.separator ''
-  o.separator 'The `site` parameter can be di or soma. `channel` should be'
-  o.separator 'a valid channel on that site.'
+  o.separator 'The `site` parameter can be di, soma, or slayradio. `channel`'
+  o.separator "should be a valid channel on that site except when it's slayradio,"
+  o.separator 'when `channel` should also be slayradio (slayradio:slayradio).'
   o.separator ''
   o.separator 'DI premium channels require an environment variable: ' \
               'DI_FM_PREMIUM_ID.'
@@ -69,8 +67,10 @@ def start_playing
   @options[:premium_id] = ENV['DI_FM_PREMIUM_ID']
   if who == 'di'
     @channel = Somadic::Channel::DI.new(@options)
-  else
+  elsif who == 'soma'
     @channel = Somadic::Channel::Soma.new(@options)
+  else
+    @channel = Somadic::Channel::SlayRadio.new(@options)
   end
   @channel.start
 end
@@ -151,8 +151,10 @@ def goto_channel(channel)
   @options[:channel] = what
   if who == 'di'
     @channel = Somadic::Channel::DI.new(@options)
-  else
+  elsif who == 'soma'
     @channel = Somadic::Channel::Soma.new(@options)
+  else
+    @channel = Somadic::Channel::SlayRadio.new(@options)
   end
   @channel.start
 end
@@ -162,8 +164,18 @@ def goto_next_channel
 end
 
 def goto_next_channel_random
-  who = @channel.is_a?(Somadic::Channel::DI) ? 'di' : 'soma'
-  what = @channel.channels.reject { |c| c[:name] == @display.channel[:name] }.sample[:name]
+  who = if @channel.is_a?(Somadic::Channel::DI)
+          'di'
+        elsif @channel.is_a?(Somadic::Channel::Soma)
+          'soma'
+        else
+          'slayradio'
+        end
+  what = if who == 'slayradio'
+    'slayradio'
+  else
+    @channel.channels.reject { |c| c[:name] == @display.channel[:name] }.sample[:name]
+  end
   goto_channel("#{who}:#{what}")
 end
 

data/bin/somadic

@@ -11,10 +11,7 @@ require 'yaml'
 SOMADIC_PATH = ENV['HOME'] + '/.somadic'
 
 base_path = File.expand_path(File.dirname(__FILE__))
-Dir["#{base_path}/curses/lib/*.rb"].each do |file|
-  Somadic::Logger.debug("require #{file}")
-  require file
-end
+Dir["#{base_path}/curses/lib/*.rb"].each { |file| require file }
 
 Signal.trap("INT") do |sig|
   @channel.stop
@@ -29,8 +26,9 @@ end
 @optparser = OptionParser.new do |o|
   o.banner = 'Usage: somadic [options] site:channel [site:channel]'
   o.separator ''
-  o.separator 'The `site` parameter can be di or soma. `channel` should be'
-  o.separator 'a valid channel on that site.'
+  o.separator 'The `site` parameter can be di, soma, or slayradio. `channel`'
+  o.separator "should be a valid channel on that site except when it's slayradio,"
+  o.separator 'when `channel` should also be slayradio (slayradio:slayradio).'
   o.separator ''
   o.separator 'DI premium channels require an environment variable: ' \
               'DI_FM_PREMIUM_ID.'
@@ -69,8 +67,10 @@ def start_playing
   @options[:premium_id] = ENV['DI_FM_PREMIUM_ID']
   if who == 'di'
     @channel = Somadic::Channel::DI.new(@options)
-  else
+  elsif who == 'soma'
     @channel = Somadic::Channel::Soma.new(@options)
+  else
+    @channel = Somadic::Channel::SlayRadio.new(@options)
   end
   @channel.start
 end
@@ -151,8 +151,10 @@ def goto_channel(channel)
   @options[:channel] = what
   if who == 'di'
     @channel = Somadic::Channel::DI.new(@options)
-  else
+  elsif who == 'soma'
     @channel = Somadic::Channel::Soma.new(@options)
+  else
+    @channel = Somadic::Channel::SlayRadio.new(@options)
   end
   @channel.start
 end
@@ -162,8 +164,18 @@ def goto_next_channel
 end
 
 def goto_next_channel_random
-  who = @channel.is_a?(Somadic::Channel::DI) ? 'di' : 'soma'
-  what = @channel.channels.reject { |c| c[:name] == @display.channel[:name] }.sample[:name]
+  who = if @channel.is_a?(Somadic::Channel::DI)
+          'di'
+        elsif @channel.is_a?(Somadic::Channel::Soma)
+          'soma'
+        else
+          'slayradio'
+        end
+  what = if who == 'slayradio'
+    'slayradio'
+  else
+    @channel.channels.reject { |c| c[:name] == @display.channel[:name] }.sample[:name]
+  end
   goto_channel("#{who}:#{what}")
 end
 

data/lib/somadic/base_channel.rb

@@ -8,7 +8,14 @@ module Somadic
     def initialize(options)
       @url = options[:url]
       playlist = @url.split('/').last
-      name = playlist[0..playlist.index('.pls') - 1]
+      if playlist.end_with?('.pls')
+        name = playlist[0..playlist.index('.pls') - 1]
+      elsif playlist.end_with?('.m3u')
+        name = playlist[0..playlist.index('.m3u') - 1]
+      else
+        Somadic::Logger.error("BaseChannel#initialize: bad playlist #{playlist}")
+        return
+      end
       @channel = find_channel(name)
 
       @mp = Mplayer.new(options)

data/lib/somadic/channel/slay_radio.rb

@@ -0,0 +1,66 @@
+# A wrapper around a SLAYradio channel.
+module Somadic
+  module Channel
+    class SlayRadio < Somadic::BaseChannel
+      CHANNEL_NAME = 'slayradio'
+
+      def initialize(options)
+        @options = options
+        @options[:channel] = CHANNEL_NAME
+        @channels = load_channels
+        super(options.merge({ url: 'http://www.slayradio.org/tune_in.php/128kbps/slayradio.128.m3u' }))
+      end
+
+      # Overrides BaseChannel
+      def find_channel(name)
+        Somadic::Logger.debug("SlayRadio#find_channel(#{name})")
+        { id: 0, name: name, display_name: name }
+      end
+
+      # Observer callback.
+      def update(time, song)
+        @song = song if song
+        songs = refresh_playlist
+        channel = { id: 0, name: @options[:channel], display_name: @options[:channel] }
+        @listeners.each do |l|
+          l.update(channel, songs) if l.respond_to?(:update)
+        end
+      end
+
+      private
+
+      def load_channels
+        [{id: 0, name: @options[:channel], display_name: @options[:channel]}]
+      end
+
+      def refresh_playlist
+        url = 'https://www.slayradio.org/api.php?query=rotationalhistory'
+        page = open(url).read
+        json = JSON.parse(page)
+        songs = []
+        json['data'].each do |song|
+          artist = song['artist']
+          title = song['title']
+          if artist == title
+            track = artist
+          else
+            track = "#{artist} - #{title}"
+          end
+          songs << { started: Time.at(song['nowplaying'].to_i),
+                     votes: {up: 0, down: 0},
+                     duration: duration(song['duration'].to_i),
+                     artist: artist,
+                     title: title,
+                     track: track }
+        end
+        songs
+      rescue => e
+        Somadic::Logger.error("SlayRadio#refresh_playlist: error #{e}")
+      end
+
+      def duration(val)
+        Time.at(val/1000).to_i
+      end
+    end
+  end
+end

data/lib/somadic/version.rb

@@ -1,3 +1,3 @@
 module Somadic
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: somadic
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Shane Thomas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mono_logger
@@ -174,6 +174,7 @@ files:
 - lib/somadic/audio_addict.rb
 - lib/somadic/base_channel.rb
 - lib/somadic/channel/di.rb
+- lib/somadic/channel/slay_radio.rb
 - lib/somadic/channel/soma.rb
 - lib/somadic/logger.rb
 - lib/somadic/mplayer.rb