somadic 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca4d0b5f1262c05f4c93871065843f3a08b16da5
-  data.tar.gz: dd8035445c3828512c2acfe0a80faf62e68020d7
+  metadata.gz: e781f2967b238c8b0babce28ff7688a48bf01ce9
+  data.tar.gz: b35d981810b5b6f87dabaebf1155892d239935dd
 SHA512:
-  metadata.gz: 824df614dc6f57756a05a79e1fc3e149e9e7ed78c14c2d852f81d1b517ebaac14e590b51f115a4b7d1715369df7b4316fa29b7bda4e7329e04d077196af75202
-  data.tar.gz: 3e1fb4eafd3569ed18942bc4c483041593209aa405df7c0da4cb6cae2f60452069515bf75b00a98f7f1bd59d43e44437ec105923b98dab15e3619ff830faf3c7
+  metadata.gz: c68b44cbae2e7bff1a956bf78cb43a00dabf092a58ecd6f52acf25a71408a4c1702b47bd566124d5059dc153033860065ad491a965860005a5ddba7589ef017e
+  data.tar.gz: 370cce2131766c31daa4b96f8e0f3e09b013500a71b384c0ff01fd0190b032ab20b8cdab87f3c9452cecbe0fba26e7fb164c57bfeaa5d70cf19805f3310e0373

data/README.md

@@ -1,10 +1,10 @@
 # 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 uses `mplayer` to do the heavy lifting. It's a hot Curses mess, but it works on my machine.
 
 ```
-$ somadic-curses di:breaks
+$ somadic di:breaks
 
 [ breaks ][ Rave Channel - Te Quiero (Amase Breaks Mix)                 ][ 00:25 / 07:38 ]
 [######..................................................................................]
@@ -41,6 +41,7 @@ DI premium channels require an environment variable: DI_FM_PREMIUM_ID.
 #### Valid keys
 
 ```
+c       - List channels for `site`
 n       - Next site:channel in list
 N       - Pick a random channel from `site`
 q       - Quit

data/bin/curses/lib/display.rb

@@ -0,0 +1,259 @@
+# A curses display.
+class Display
+  include Curses
+
+  attr_reader :channel
+  attr_accessor :kp_queue, :stopped, :search_phrase, :inputting
+
+  def initialize
+    curses_init
+    @bar = ProgressBar.new(1, :bar)
+
+    @kp_queue = Queue.new
+    start_keypress_thread
+  end
+
+  # Refreshes the display.
+  def refresh
+    Somadic::Logger.debug('Display#refresh')
+    Curses.clear
+    Curses.refresh
+  end
+
+  def search(channel)
+    #cpos Curses.lines - 1, 0
+    @inputting = true
+    Curses.close_screen
+    @search_phrase = Readline.readline('Go to channel: ', true)
+    @search_phrase = '' unless @search_phrase[':']
+    cwrite Curses.lines - 1, 0, ''
+    @inputting = false
+  end
+
+  def clear_search
+    cwrite Curses.lines - 1, 0, ''
+  end
+
+  # Updates the display.
+  def update(channel = nil, songs = nil)
+    @channel = channel if channel
+    @songs = songs if songs
+    return if @channel.nil? || @songs.nil?
+
+    cur_song = @songs.first
+    return if cur_song.nil?
+
+    # times
+    start_time = Time.at(cur_song[:started]) rescue Time.now
+    duration = cur_song[:duration]
+    if @stopped
+      end_time = nil
+      elapsed = (Time.now - start_time).to_i
+      remains = '][ Paused ]'
+    elsif duration <= 0
+      end_time = nil
+      elapsed = (Time.now - start_time).to_i
+      remains = duration < 0 ?
+                '][ Updating ]' :
+                "][ #{format_secs(elapsed)} ]"
+    else
+      end_time = start_time + duration
+      remains = "][ #{format_secs((Time.now - start_time).to_i)} " \
+                "/ #{format_secs(duration)} ]"
+    end
+
+    # current song
+    track = cur_song[:track]
+    channel_and_track = "[ #{clean_channel_name(@channel[:display_name])} > #{track}"
+
+    up = cur_song[:votes][:up]
+    down = cur_song[:votes][:down]
+    votes = up + down != 0 ? "+#{up}/-#{down}" : ''
+
+    space_len = Curses.cols - votes.length - channel_and_track.length - remains.length - 1
+    spaces = space_len > 0 ? ' ' * space_len : ' '
+
+    line = "#{channel_and_track}#{spaces}#{votes} #{remains}"
+    over = Curses.cols - line.length
+    if over < 0
+      channel_and_track = channel_and_track[0..over - 1]
+      line = "#{channel_and_track}#{spaces}#{votes} #{remains}"
+    end
+    cwrite 0, 0, line, curses_reverse
+
+    # current song progress
+    unless @stopped
+      if duration <= 0
+        @bar.max = @bar.count = 100
+      else
+        @bar.max = duration
+        @bar.count = (Time.now - start_time).to_i
+      end
+      cwrite 1, 0, @bar.to_s, curses_bold
+    end
+
+    # song history
+    row = 2
+    @songs[1..-1].each do |song|
+      up = song[:votes][:up]
+      down = song[:votes][:down]
+      votes = up + down != 0 ? " +#{up}/-#{down} :" : ''
+
+      if song[:duration] == 0
+        duration = Time.at(song[:started]).strftime('%H:%M:%S')
+      else
+        duration = format_secs(song[:duration])
+      end
+
+      track = ": #{song[:track]}"
+      votes_and_duration = "#{votes} #{duration} :"
+
+      space_len = Curses.cols - track.length - votes_and_duration.length
+      spaces = space_len > 0 ? ' ' * space_len : ''
+
+      line = "#{track}#{spaces}#{votes_and_duration}"
+      if space_len < 0
+        spaces = ' '
+        track = track[0..space_len - 2]
+        line = "#{track}#{spaces}#{votes_and_duration}"
+      end
+      cwrite row, 0, line, curses_dim
+      row += 1
+    end
+
+    while row < Curses.lines - 1
+      clear_line row
+      row += 1
+    end
+
+    # TODO: this works around the dupe thing @startup, but it shouldn't be
+    # necessary
+    cwrite row, 0, ''
+    cpos Curses.lines - 1, 0
+  end
+
+  def show_channels(list)
+    container = Curses::Window.new(0, 0, 0, 0)
+    w = container.subwin(Curses.lines, Curses.cols, 0, 0)
+    w.addstr("[ Channels ]\n\n")
+    #w.setscrreg(0, Curses.lines)
+    #w.scrollok(true)
+    w.addstr("#{in_columns(list)}\n")
+    w.addstr("Press q to close channel list.")
+    w.getch
+    w.close
+
+    refresh
+  end
+
+  private
+
+  # Breaks a channel list up into columns.
+  def in_columns(list)
+    longest = 0
+    list.each { |l| longest = l[:name].length if l[:name].length > longest }
+    chan_list = list.map do |l|
+      ll = longest - l[:name].length
+      pad = if ll > 0
+              ' ' * ll
+            else
+              ''
+            end
+      "#{l[:name]}#{pad}"
+    end.sort
+
+    cols = Curses.cols / (longest + 1)
+    groups = chan_list.each_slice(cols).to_a
+    chans = ''
+    groups.each { |g| chans << "#{g.join(' ')}\n" }
+
+    chans
+  end
+
+  def start_keypress_thread
+    Thread.new do
+      loop do
+        unless @inputting
+          ch = Curses.getch
+          @kp_queue << ch if ch
+        end
+        sleep 0.1
+      end
+    end
+  end
+
+  # Curses init
+  def curses_init
+    #Curses.noecho
+    #Curses.curs_set(0)
+    Curses.timeout = -1
+
+    Curses.init_screen
+    Curses.start_color
+
+    Curses.init_pair(COLOR_WHITE, COLOR_WHITE, COLOR_BLACK)
+  end
+
+  # Curses write
+  def cwrite(row, col, message, color = nil)
+    Curses.setpos(row, col)
+    Curses.clrtoeol
+
+    if color
+      Curses.attron(color) { Curses.addstr(message) }
+    else
+      Curses.addstr(message)
+    end
+
+    Curses.refresh
+  end
+
+  # Cursor pos
+  def cpos(row, col)
+    Curses.setpos(row, col)
+    Curses.refresh
+  end
+
+  # Colors/styles.
+  def curses_bold
+    curses_white|A_BOLD
+  end
+
+  def curses_reverse
+    curses_white|A_REVERSE
+  end
+
+  def curses_dim
+    curses_white|A_DIM
+  end
+
+  def curses_white
+    color_pair(COLOR_WHITE)
+  end
+
+  def clear_line(row)
+    Curses.setpos(row, 0)
+    Curses.clrtoeol
+  end
+
+  # Formats `seconds` to hours, mins, secs.
+  def format_secs(seconds)
+    secs = seconds.abs
+    hours = 0
+    if secs > 3600
+      hours = secs / 3600
+      secs -= 3600 * hours
+    end
+    mins = secs / 60
+    secs = secs % 60
+    h = hours > 0 ? "#{"%1d" % hours}:" : "  "
+    "#{h}#{"%02d" % mins}:#{"%02d" % secs}"
+  end
+
+  # Cleans up soma channel names.
+  def clean_channel_name(name)
+    cname = name.gsub(/130$/, '')
+    cname.gsub!(/64$/, '')
+    cname
+  end
+end

data/bin/curses/lib/os.rb

@@ -0,0 +1,17 @@
+module OS
+  def OS.windows?
+    (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+  end
+
+  def OS.mac?
+   (/darwin/ =~ RUBY_PLATFORM) != nil
+  end
+
+  def OS.unix?
+    !OS.windows?
+  end
+
+  def OS.linux?
+    OS.unix? and not OS.mac?
+  end
+end

data/bin/curses/lib/progress_bar_patch.rb

@@ -0,0 +1,11 @@
+# Monkey-patches ProgressBar so that it displays periods instead of blank
+# spaces.
+class ProgressBar
+  def render_bar
+    return '' if bar_width < 2
+    "[" +
+      "#" * (ratio * (bar_width - 2)).ceil +
+      "." * ((1-ratio) * (bar_width - 2)).floor +
+      "]"
+  end
+end

data/bin/curses/somadic

@@ -0,0 +1,180 @@
+#!/usr/bin/env ruby
+require 'optparse'
+require 'somadic'
+require 'curses'
+require 'progress_bar'
+require 'thread'
+require 'chronic'
+require 'readline'
+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
+
+Signal.trap("INT") do |sig|
+  @channel.stop
+  exit
+end
+
+@display = Display.new
+@options = { cache: nil,
+             cache_min: nil,
+             listeners: [@display] }
+
+@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 ''
+  o.separator 'DI premium channels require an environment variable: ' \
+              'DI_FM_PREMIUM_ID.'
+  o.separator ''
+
+  o.on('-c CACHE_SIZE', '--cache CACHE_SIZE', 'Set the cache size (KB)') do |c|
+    @options[:cache] = c
+  end
+  o.on('-m CACHE_MIN', '--cache-min CACHE_MIN',
+       'Set the minimum cache threshold (percent)') do |m|
+    @options[:cache_min] = m
+  end
+  o.on('-h', '--help', 'Display this message') { puts o; exit }
+
+  o.parse!
+end
+
+def usage
+  puts @optparser
+  puts
+  exit
+end
+
+def next_channel
+  @cur_chan ||= 0
+
+  rv = @channels[@cur_chan]
+  @cur_chan += 1
+  @cur_chan = 0 if @cur_chan == @channels.count
+  rv
+end
+
+def start_playing
+  who, what = next_channel.split(':')
+  @options[:channel] = what
+  @options[:premium_id] = ENV['DI_FM_PREMIUM_ID']
+  if who == 'di'
+    @channel = Somadic::Channel::DI.new(@options)
+  else
+    @channel = Somadic::Channel::Soma.new(@options)
+  end
+  @channel.start
+end
+
+def start(channels)
+  Somadic::Logger.debug("somadic-curses, started with #{channels}")
+
+  @channels = []
+  channels.each do |channel|
+    if channel[':']
+      @channels << channel
+    else
+      # is there a preset file?
+      fn = File.join(SOMADIC_PATH, 'presets', "#{channel}.yaml")
+      if File.exist?(fn)
+        YAML.load_file(fn).each { |c| @channels << c }
+      else
+        fail ArgumentError, "`#{channel}` is not a valid channel or preset."
+      end
+    end
+  end
+
+  start_playing
+
+  # keypresses are handled thru a Queue
+  keypresses = []
+  quitting = false
+  stopped = false
+  while !quitting
+    begin
+      keypresses << @display.kp_queue.pop(non_block: true)
+    rescue ThreadError => te
+      unless te.to_s == "queue empty"
+        Somadic::Logger.error("kp_queue.pop error: #{te}")
+      end
+    end
+    unless keypresses.empty?
+      keypresses.each do |kp|
+        case kp
+        when ' '
+          @channel.send(stopped ? :start : :stop)
+          stopped = !stopped
+        when 'c'
+          chanlist = @channel.channel_list
+          @display.show_channels(chanlist)
+        when 'n'
+          goto_next_channel
+        when 'N'
+          goto_next_channel_random
+        when 'q'
+          @channel.stop
+          quitting = true
+        when 'r'
+          @display.refresh
+        when 's'
+          search
+        when '/'
+          @display.search(@channel)
+          if @display.search_phrase
+            Somadic::Logger.debug("searching: #{@display.search_phrase}")
+            goto_channel(@display.search_phrase)
+          end
+        end
+        keypresses.delete(kp)
+      end
+    end
+
+    @display.stopped = stopped
+    @display.update
+    sleep 0.1
+  end
+end
+
+def goto_channel(channel)
+  @channel.stop
+  who, what = channel.split(':')
+  Somadic::Logger.debug("goto_channel: going to #{who}:#{what}")
+  @options[:channel] = what
+  if who == 'di'
+    @channel = Somadic::Channel::DI.new(@options)
+  else
+    @channel = Somadic::Channel::Soma.new(@options)
+  end
+  @channel.start
+end
+
+def goto_next_channel
+  goto_channel(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]
+  goto_channel("#{who}:#{what}")
+end
+
+def search
+  Somadic::Logger.debug("searching for '#{@channel.song}'")
+  if OS.mac?
+    `open "https://www.google.com/search?safe=off&q=#{@channel.song}"`
+  elsif OS.linux?
+    `xdg-open "https://www.google.com/search?safe=off&q=#{@channel.song}"`
+  end
+end
+
+usage if ARGV[0].nil?
+start(ARGV)

data/bin/somadic

@@ -10,248 +10,10 @@ require 'yaml'
 
 SOMADIC_PATH = ENV['HOME'] + '/.somadic'
 
-module OS
-  def OS.windows?
-    (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
-  end
-
-  def OS.mac?
-   (/darwin/ =~ RUBY_PLATFORM) != nil
-  end
-
-  def OS.unix?
-    !OS.windows?
-  end
-
-  def OS.linux?
-    OS.unix? and not OS.mac?
-  end
-end
-
-# Monkey-patches ProgressBar so that it displays periods instead of blank
-# spaces.
-class ProgressBar
-  def render_bar
-    return '' if bar_width < 2
-    "[" +
-      "#" * (ratio * (bar_width - 2)).ceil +
-      "." * ((1-ratio) * (bar_width - 2)).floor +
-      "]"
-  end
-end
-
-# A curses display.
-class Display
-  include Curses
-
-  attr_reader :channel
-  attr_accessor :kp_queue, :stopped, :search_phrase, :inputting
-
-  def initialize
-    curses_init
-    @bar = ProgressBar.new(1, :bar)
-
-    @kp_queue = Queue.new
-    start_keypress_thread
-  end
-
-  # Refreshes the display.
-  def refresh
-    Somadic::Logger.debug('Display#refresh')
-    Curses.clear
-    Curses.refresh
-  end
-
-  def search(channel)
-    #cpos Curses.lines - 1, 0
-    @inputting = true
-    Curses.close_screen
-    @search_phrase = Readline.readline('Go to channel: ', true)
-    @search_phrase = '' unless @search_phrase[':']
-    cwrite Curses.lines - 1, 0, ''
-    @inputting = false
-  end
-
-  def clear_search
-    cwrite Curses.lines - 1, 0, ''
-  end
-
-  # Updates the display.
-  def update(channel = nil, songs = nil)
-    @channel = channel if channel
-    @songs = songs if songs
-
-    return if @channel.nil? || @songs.nil?
-
-    cur_song = @songs.first
-    return if cur_song.nil?
-
-    # times
-    start_time = Time.at(cur_song[:started]) rescue Time.now
-    duration = cur_song[:duration]
-    if @stopped
-      end_time = nil
-      elapsed = (Time.now - start_time).to_i
-      remains = '][ Paused ]'
-    elsif duration <= 0
-      end_time = nil
-      elapsed = (Time.now - start_time).to_i
-      remains = duration < 0 ?
-                '][ Updating ]' :
-                "][ #{format_secs(elapsed)} ]"
-    else
-      end_time = start_time + duration
-      remains = "][ #{format_secs((Time.now - start_time).to_i)} " \
-                "/ #{format_secs(duration)} ]"
-    end
-
-    # current song
-    track = cur_song[:track]
-    channel_and_track = "[ #{clean_channel_name(@channel[:name])} > #{track}"
-
-    up = cur_song[:votes][:up]
-    down = cur_song[:votes][:down]
-    votes = up + down != 0 ? "+#{up}/-#{down}" : ''
-
-    space_len = Curses.cols - votes.length - channel_and_track.length - remains.length - 1
-    spaces = space_len > 0 ? ' ' * space_len : ' '
-
-    line = "#{channel_and_track}#{spaces}#{votes} #{remains}"
-    over = Curses.cols - line.length
-    if over < 0
-      channel_and_track = channel_and_track[0..over - 1]
-      line = "#{channel_and_track}#{spaces}#{votes} #{remains}"
-    end
-    cwrite 0, 0, line, curses_reverse
-
-    # current song progress
-    unless @stopped
-      if duration <= 0
-        @bar.max = @bar.count = 100
-      else
-        @bar.max = duration
-        @bar.count = (Time.now - start_time).to_i
-      end
-      cwrite 1, 0, @bar.to_s, curses_bold
-    end
-
-    # song history
-    row = 2
-    @songs[1..6].each do |song|
-      up = song[:votes][:up]
-      down = song[:votes][:down]
-      votes = up + down != 0 ? " +#{up}/-#{down} :" : ''
-
-      if song[:duration] == 0
-        duration = Time.at(song[:started]).strftime('%H:%M:%S')
-      else
-        duration = format_secs(song[:duration])
-      end
-
-      track = ": #{song[:track]}"
-      votes_and_duration = "#{votes} #{duration} :"
-
-      space_len = Curses.cols - track.length - votes_and_duration.length
-      spaces = space_len > 0 ? ' ' * space_len : ''
-
-      line = "#{track}#{spaces}#{votes_and_duration}"
-      if space_len < 0
-        spaces = ' '
-        track = track[0..space_len - 2]
-        line = "#{track}#{spaces}#{votes_and_duration}"
-      end
-      cwrite row, 0, line, curses_dim
-      row += 1
-    end
-    # TODO: this works around the dupe thing @startup, but it shouldn't be
-    # necessary
-    cwrite row, 0, ''
-    cpos Curses.lines - 1, 0
-  end
-
-  private
-
-  def start_keypress_thread
-    Thread.new do
-      loop do
-        unless @inputting
-          ch = Curses.getch
-          @kp_queue << ch if ch
-        end
-        sleep 0.1
-      end
-    end
-  end
-
-  # Curses init
-  def curses_init
-    #Curses.noecho
-    #Curses.curs_set(0)
-    Curses.timeout = -1
-
-    Curses.init_screen
-    Curses.start_color
-
-    Curses.init_pair(COLOR_WHITE, COLOR_WHITE, COLOR_BLACK)
-  end
-
-  # Curses write
-  def cwrite(row, col, message, color = nil)
-    Curses.setpos(row, col)
-    Curses.clrtoeol
-
-    if color
-      Curses.attron(color) { Curses.addstr(message) }
-    else
-      Curses.addstr(message)
-    end
-
-    Curses.refresh
-  end
-
-  # Cursor pos
-  def cpos(row, col)
-    Curses.setpos(row, col)
-    Curses.refresh
-  end
-
-  # Colors/styles.
-  def curses_bold
-    curses_white|A_BOLD
-  end
-
-  def curses_reverse
-    curses_white|A_REVERSE
-  end
-
-  def curses_dim
-    curses_white|A_DIM
-  end
-
-  def curses_white
-    color_pair(COLOR_WHITE)
-  end
-
-  # Formats `seconds` to hours, mins, secs.
-  def format_secs(seconds)
-    secs = seconds.abs
-    hours = 0
-    if secs > 3600
-      hours = secs / 3600
-      secs -= 3600 * hours
-    end
-    mins = secs / 60
-    secs = secs % 60
-    h = hours > 0 ? "#{"%1d" % hours}:" : "  "
-    "#{h}#{"%02d" % mins}:#{"%02d" % secs}"
-  end
-
-  # Cleans up soma channel names.
-  def clean_channel_name(name)
-    cname = name.gsub(/130$/, '')
-    cname.gsub!(/64$/, '')
-    cname
-  end
+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
 
 Signal.trap("INT") do |sig|
@@ -347,13 +109,13 @@ def start(channels)
     end
     unless keypresses.empty?
       keypresses.each do |kp|
-        # Somadic::Logger.debug("kp: #{kp} (a #{kp.class}) (searching=#{searching})")
         case kp
         when ' '
           @channel.send(stopped ? :start : :stop)
           stopped = !stopped
         when 'c'
-          dump_channels
+          chanlist = @channel.channel_list
+          @display.show_channels(chanlist)
         when 'n'
           goto_next_channel
         when 'N'
@@ -382,12 +144,6 @@ def start(channels)
   end
 end
 
-def dump_channels
-  @channel.channels.each do |c|
-    Somadic::Logger.debug("channel: #{c}")
-  end
-end
-
 def goto_channel(channel)
   @channel.stop
   who, what = channel.split(':')

data/lib/somadic/audio_addict.rb

@@ -7,9 +7,7 @@ module Somadic
 
     def refresh_playlist
       page = open(@url).read
-      Somadic::Logger.debug("page=#{page}")
       data = JSON.parse(page[page.index("(") + 1..-3])
-
       symbolized_data = []
       data.each { |d| symbolized_data << symbolize_keys(d) }
       @songs = symbolized_data.keep_if { |d| d[:title] }

data/lib/somadic/base_channel.rb

@@ -49,5 +49,9 @@ module Somadic
     def find_channel(name)
       raise NotImplementedError
     end
+
+    def channel_list
+      @channels
+    end
   end
 end

data/lib/somadic/channel/di.rb

@@ -1,5 +1,91 @@
-require 'pp'
-
+# A wrapper around a DI.fm channel.
+#
+# Channel filters (not currently used, analogous to presets):
+#
+#    "channel_filters": [
+#        {
+#            "channels": [
+#                348,
+#                346,
+#                291,
+#                347
+#            ],
+#            "display": true,
+#            "id": 20,
+#            "key": "new",
+#            "meta": false,
+#            "name": "New",
+#            "network_id": 1,
+#            "position": 1,
+#            "sprite": "//api.audioaddict.com/v1/assets/channel_sprite/di/new{/digest}{.format}{?width,height,quality}"
+#        },
+#        {
+#            "channels": [
+#                1,
+#                2,
+#                175,
+#                7,
+#                8,
+#                346,
+#                90,
+#                125,
+#                178,
+#                176,
+#                10
+#            ],
+#            "display": true,
+#            "id": 5,
+#            "key": "trance",
+#            "meta": false,
+#            "name": "Trance",
+#            "network_id": 1,
+#            "position": 2,
+#            "sprite": "//api.audioaddict.com/v1/assets/channel_sprite/di/trance{/digest}{.format}{?width,height,quality}"
+#        },
+#        ...
+#
+# Each channel:
+#
+#    "channels": [
+#        {
+#            "ad_channels": "",
+#            "asset_id": 54679,
+#            "asset_url": "//static.audioaddict.com/e/4/b/3/4/6/e4b346b193c1adec01f8489b98a2bf3f.png",
+#            "banner_url": null,
+#            "channel_director": "takito jockey",
+#            "created_at": "2014-12-02T10:03:54-05:00",
+#            "description": "An emphasis on the bass and drums, delayed effects, sampled vocals and smokey Reggae inspired vibes.",
+#            "description_long": "",
+#            "description_short": "An emphasis on the bass and drums, delayed effects, sampled vocals and smokey Reggae inspired vibes.",
+#            "favorite": false,
+#            "forum_id": null,
+#            "id": 348,
+#            "images": {
+#                "default": "//api.audioaddict.com/v1/assets/image/e4b346b193c1adec01f8489b98a2bf3f.png{?size,height,width,quality}"
+#            },
+#            "key": "dub",
+#            "name": "Dub",
+#            "network_id": 1,
+#            "old_id": 729,
+#            "premium_id": null,
+#            "similar_channels": [
+#                {
+#                    "id": 666,
+#                    "similar_channel_id": 91
+#                },
+#                {
+#                    "id": 667,
+#                    "similar_channel_id": 13
+#                },
+#                {
+#                    "id": 668,
+#                    "similar_channel_id": 15
+#                }
+#            ],
+#            "tracklist_server_id": 25235,
+#            "tunein_url": "http://www.di.fm/dub",
+#            "updated_at": "2015-02-17T13:04:14-05:00"
+#        },
 module Somadic
   module Channel
     class DI < Somadic::BaseChannel
@@ -59,6 +145,7 @@ module Somadic
           sleep one_minute_from_now - Time.now < 15 ? 2 : 5
           songs = aa.refresh_playlist
         end
+
         songs
       end
 
@@ -71,7 +158,9 @@ module Somadic
           page = open('http://www.di.fm').read
           app_start = page.scan(/di\.app\.start\((.*?)\);/).flatten[0]
           json = JSON.parse(app_start)
-          json['channels'].each { |c| channels << {id: c['id'], name: c['key']} }
+          json['channels'].each do |c|
+            channels << {id: c['id'], name: c['key'], display_name: c['name']}
+          end
 
           channels
         end

data/lib/somadic/channel/soma.rb

@@ -1,3 +1,4 @@
+# A wrapper around a soma.fm channel.
 module Somadic
   module Channel
     class Soma < Somadic::BaseChannel
@@ -10,14 +11,14 @@ module Somadic
       # Overrides BaseChannel
       def find_channel(name)
         Somadic::Logger.debug("Soma#find_channel(#{name})")
-        { id: 0, name: 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] }
+        channel = { id: 0, name: @options[:channel], display_name: @options[:channel] }
         @listeners.each do |l|
           l.update(channel, songs) if l.respond_to?(:update)
         end
@@ -30,16 +31,17 @@ module Somadic
         APICache.get('soma_fm_chanel_list', cache: ONE_DAY, timeout: API_TIMEOUT) do
           Somadic::Logger.debug('Soma#load_channels')
           channels = []
-          f = open('http://somafm.com/listen')
-          page = f.read
-          chans = page.scan(/\/play\/(.*?)"/).flatten
+          page = open('http://somafm.com/listen').read
+          chans = page.scan(/href="http:\/\/somafm.com\/(.*?)\.pls/).flatten
           chans.each do |c|
             unless c.start_with?('fw/') || c.gsub(/\d+$/, '') != c
-              channels << {id: 0, name: c}
+              channels << {id: 0, name: c, display_name: c}
             end
           end
           channels.sort_by! {|k, _| k[:name]}
           channels.uniq! {|k, _| k[:name]}
+
+          channels
         end
       end
 
@@ -62,10 +64,11 @@ module Somadic
           next if song[3].scan(/<a.*?>(.*?)<\/a>/).empty?
 
           d = {}
-          song[0] = song[0][0..song[0].index('&')-1]if song[0]['&'] # clean hh:mm:ss&nbsp; (Now)
+          song[0] = song[0][0..song[0].index('&')-1] if song[0]['&'] # clean hh:mm:ss&nbsp; (Now)
 
+          # TODO: ugh
           pt = Time.parse(song[0])
-          local = Chronic.parse(pt.to_s.gsub(/-\d+$/, '-0700'))
+          local = Chronic.parse(pt.to_s.gsub(/-\d+$/, '-0800'))
           d[:started] = local.to_i
 
           d[:votes] = {up: 0, down: 0}

data/lib/somadic/version.rb

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

data/somadic.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^bin/curses/somadic}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: somadic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Shane Thomas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mono_logger
@@ -165,6 +165,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/curses/lib/display.rb
+- bin/curses/lib/os.rb
+- bin/curses/lib/progress_bar_patch.rb
+- bin/curses/somadic
 - bin/somadic
 - lib/somadic.rb
 - lib/somadic/audio_addict.rb