radiodan 0.0.4 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 98308159d0c67a5989de555035862e73754604f0
+  data.tar.gz: 7d5e7f602adc3f0223524e97debd9f1a38280b7f
+SHA512:
+  metadata.gz: 9fbdab2af2852649db310b85489318dc0e9c3ac88826223fa938369699463379e9a88a39310bdc2a81d8392126d5e42eb5cb782ece3a23808892daf1b1f3ce98
+  data.tar.gz: 55076df49a6d487c6b4f3dda9922e941e9f91c840375cc4d52c2a460aaf220f7395994b8d89b5c4c6a51bab2964ece92c40bb86c052fe2112a33052d460bc9b4

data/Gemfile.lock

@@ -1,13 +1,16 @@
 PATH
   remote: .
   specs:
-    radiodan (0.0.4)
+    radiodan (1.0.0)
       active_support (~> 3.0.0)
       em-http-request (~> 1.0.3)
       em-simple_telnet (~> 0.0.6)
       em-synchrony (~> 1.0.3)
       eventmachine (~> 1.0.3)
       i18n (~> 0.6.4)
+      sinatra (~> 1.4.2)
+      sinatra-synchrony (~> 0.4.1)
+      thin (~> 1.5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -18,6 +21,7 @@ GEM
     addressable (2.3.5)
     coderay (1.0.9)
     cookiejar (0.3.0)
+    daemons (1.1.9)
     diff-lcs (1.2.4)
     em-http-request (1.0.3)
       addressable (>= 2.2.3)
@@ -25,7 +29,8 @@ GEM
       em-socksify
       eventmachine (>= 1.0.0.beta.4)
       http_parser.rb (>= 0.5.3)
-    em-simple_telnet (0.0.9)
+    em-resolv-replace (1.1.3)
+    em-simple_telnet (0.0.14)
       eventmachine (>= 1.0.0)
     em-socksify (0.3.0)
       eventmachine (>= 1.0.0.beta.4)
@@ -44,7 +49,7 @@ GEM
       guard (>= 1.8)
       rspec (~> 2.13)
     http_parser.rb (0.5.3)
-    i18n (0.6.4)
+    i18n (0.6.5)
     listen (1.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -55,6 +60,10 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
+    rack (1.5.2)
+    rack-fiber_pool (0.9.3)
+    rack-protection (1.5.1)
+      rack
     rake (10.1.0)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
@@ -69,9 +78,25 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
+    sinatra (1.4.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    sinatra-synchrony (0.4.1)
+      em-http-request (~> 1.0)
+      em-resolv-replace (~> 1.1)
+      em-synchrony (~> 1.0.1)
+      eventmachine (~> 1.0.0)
+      rack-fiber_pool (~> 0.9)
+      sinatra (~> 1.0)
     slop (3.4.4)
     terminal-notifier-guard (1.5.3)
+    thin (1.5.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
     thor (0.18.1)
+    tilt (1.4.1)
 
 PLATFORMS
   ruby

data/TODO

@@ -1,10 +1,13 @@
 * Player
   - #sync determines which events to trigger under which circumstances
-  - Set random / repeat flags in MPD
-  - Resume playlists from last position / seek point
-* Search for music in library, return playlist / array of tracks
+* Playlist
+  - Resume mode updates seek mode on syc
 * MPD Adapter
   - Figure out a way of testing interface with playlist object
+* MPD::Response
+  - Add tests
 * Panic Mode
   - Add tests
-* Remove eventmachine?
+* Event binding
+  - Replace event_binding with EM::Channel?
+  - Add a :all event, call block every time any event is triggered.

data/lib/radiodan/adapter/mpd/ack.rb

@@ -1,11 +1,11 @@
 class Radiodan::MPD
   class Ack
     FORMAT = /ACK \[(\d)+@(\d)+\] \{(.*)\} (.*)/
-    attr_accessor :error_id, :position, :command, :description
+    attr_reader :error_id, :position, :command, :description
     
-    def intialize
+    def initialize(ack)
       matches = FORMAT.match(ack)
-      error_id, position, command, description = *matches[1..-1].join
+      @error_id, @position, @command, @description = *matches[1..-1]
     end
   end
 end

data/lib/radiodan/adapter/mpd/connection.rb

@@ -15,27 +15,16 @@ class Connection
   
   def cmd(command, options={})
     options = {match: /^(OK|ACK)/}.merge(options)
-    response = false
+    response = nil
     
-    connect do |c|
-      begin
-        logger.debug command
-        response = c.cmd(command, options).strip
-      rescue Exception => e
-        logger.error "#{command}, #{options} - #{e.to_s}"
-        raise
-      end
-    end
-    
-    Response.new(response, command)
-  end
-
-  private
-  def connect(&blk)
     EM::P::SimpleTelnet.new(host: @host, port: @port, prompt: /^(OK|ACK)(.*)$/) do |host|
       host.waitfor(/^OK MPD \d{1,2}\.\d{1,2}\.\d{1,2}$/)
-      yield(host)
+      logger.debug command
+      result = host.cmd(command, options).strip
+      response = Response.new(result, command)
     end
+    
+    response
   end
 end
 end

data/lib/radiodan/adapter/mpd/playlist_parser.rb

@@ -13,18 +13,25 @@ module PlaylistParser
   private
   def self.parse_attributes(attributes)
     options = {}
-    options[:state]     = attributes['state'].to_sym
-    options[:mode]      = parse_mode(attributes)
-    options[:repeat]    = attributes['repeat'] == '1'
-    options[:position]  = attributes['song'].to_i
-    options[:seek]      = attributes['elapsed'].to_f
-    options[:volume]    = attributes['volume'].to_i
     
-    options
+    begin
+      options[:state]     = attributes['state'].to_sym
+      options[:mode]      = parse_mode(attributes)
+      options[:repeat]    = attributes['repeat'] == '1'
+      options[:position]  = attributes['song'].to_i
+      options[:seek]      = attributes['elapsed'].to_f
+      options[:volume]    = attributes['volume'].to_i
+    ensure
+      return options
+    end
   end
   
   def self.parse_tracks(tracks)
-    tracks.collect{ |t| Track.new(t) } rescue []
+    if tracks.respond_to?(:collect)
+      tracks.collect{ |t| Track.new(t) }
+    else
+      []
+    end
   end
 
   def self.parse_mode(attributes)

data/lib/radiodan/adapter/mpd/response.rb

@@ -1,23 +1,32 @@
+require 'logging'
 require_relative 'ack'
 
-class Radiodan::MPD
+class Radiodan
+  class MPD
   class Response
+    include Logging
     attr_accessor :value, :string
     alias_method  :to_s, :string
     
-    MULTILINE_COMMANDS = %w{playlistinfo}
+    MULTILINE_COMMANDS = %w{playlistinfo search find}
     
     def initialize(response_string, command=nil)
-      @string = response_string
+      @string  = response_string
       @command = command
+      @value   = parse(@string, @command)
+            
+      if ack?
+        logger.error "ACK #{@command}, #{@value.inspect}"
+        raise AckError, @value.description
+      end
     end
     
-    def value
-      @value ||= parse(@string, @command)
+    def ack?
+      value.is_a?(Ack)
     end
     
-    def is_ack?
-      value.is_a?(Ack)
+    def ==(other)
+      self.value == other
     end
     
     def method_missing(method, *args, &block)
@@ -44,11 +53,11 @@ class Radiodan::MPD
       when response == 'OK'
         true
       when response =~ /^ACK/
-        parse_ack(response)
+        Ack.new(response)
       when response.split.size == 1
         # set value -> value
         Hash[*(response.split.*2)]
-      when MULTILINE_COMMANDS.include?(command)
+      when MULTILINE_COMMANDS.include?(command.split.first)
         # create array of hash values
         parse_multiline(response)
       else
@@ -57,23 +66,16 @@ class Radiodan::MPD
       end
     end
     
-    def parse_ack(response)
-      ack = Ack.new(response)
-      logger.warn ack
-    
-      ack
-    end
-    
     def parse_multiline(response)
       multiline = []
       values = {}
       
       split_response(response) do |key, value|
-        if values.include?(key)
+        if key == 'file' && values.has_key?('file')
           multiline << values
           values = {}
         end
-        
+                
         values[key] = value
       end
       
@@ -82,10 +84,11 @@ class Radiodan::MPD
     
     def split_response(response)
       response = response.split("\n")
-      # remove first response: "OK"
-      response.pop
       
       response.collect do |r| 
+        # remove "OK" responses
+        next if r == 'OK'
+        
         split = r.split(':')
         key   = split.shift.strip
         value = split.join(':').strip
@@ -93,7 +96,8 @@ class Radiodan::MPD
         yield(key, value) if block_given?
         
         [key, value]
-      end
+      end.compact
     end
   end
 end
+end

data/lib/radiodan/adapter/mpd.rb

@@ -5,22 +5,26 @@ require_relative './mpd/playlist_parser'
 
 class Radiodan
 class MPD
+  class AckError < Exception; end
   include Logging
   extend  Forwardable
   
   def_delegators :@connection, :cmd
 
-  COMMANDS = %w{stop pause clear play next previous}  
+  COMMANDS = %w{stop pause clear play next previous enqueue search update}  
+  SEARCH_SCOPE = %w{artist album title track name genre date composer performer comment disc filename any}
   attr_reader :player
 
   def initialize(options={})
     @connection = Connection.new(options)
+    @connection.cmd('clear')
+    @connection.cmd('update')
   end
-    
+  
   def player=(player)
     @player = player
     
-    # register typical player commands
+    # register available player commands
     COMMANDS.each do |command|
       @player.register_event command do |data|
         if data
@@ -35,21 +39,47 @@ class MPD
     @player.register_event :playlist do |playlist|
       self.playlist = playlist
     end
+    
+    # register volume changes
+    @player.register_event :volume do |volume|
+      self.volume = volume
+    end
   end
 
   def playlist=(playlist)
     # get rid of current playlist, stop playback
     clear
+    
+    # set random & repeat
+    cmd(%Q{random #{boolean_to_s(playlist.random?)}})
+    cmd(%Q{repeat #{boolean_to_s(playlist.repeat?)}})
+    
+    # set volume
+    begin
+      volume = playlist.volume
+    rescue AckError => e
+      logger.error e.msg
+    end
+
+    if playlist.empty?
+      logger.error 'Playlist empty, nothing to do'
+      return false
+    end
 
-    if enqueue playlist
-      play playlist.position
+    if enqueue playlist.tracks
+      # set for seek position (will play from seek point)
+      cmd(%Q{seek #{playlist.position} #{Integer(playlist.seek)}})
     else
       raise "Cannot load playlist #{playlist}" 
     end
   end
+  
+  def volume=(new_volume)
+    cmd(%Q{setvol #{Integer(new_volume)}})
+  end
 
-  def enqueue(playlist)
-    playlist.tracks.each do |track|
+  def enqueue(tracks)
+    tracks.each do |track|
       cmd(%Q{add "#{track[:file]}"})
     end
   end
@@ -59,10 +89,61 @@ class MPD
   end
   
   def playlist
-    status = cmd("status")
-    tracks = cmd("playlistinfo")
+    begin
+      status = cmd('status')
+      tracks = cmd('playlistinfo')
     
-    PlaylistParser.parse(status, tracks)
+      playlist = PlaylistParser.parse(status, tracks)
+      playlist
+    rescue  Playlist::StateError,
+            Playlist::ModeError,
+            Playlist::PositionError,
+            Playlist::SeekError,
+            Playlist::VolumeError => e
+      logger.warn("Playlist parsing raised error: #{e}")
+      retry
+    end
+  end
+  
+  # search :artist => "Bob Marley", :exact => true
+  # search :filename => './bob.mp3'
+  # search "Bob Marley"
+  def search(args)
+    if args.nil?
+      logger.error 'no query found' 
+      return []
+    end
+    
+    if args.to_s == args
+      args = {'any' => args}
+    end
+    
+    if args.delete(:exact)
+      command = 'find'
+    else
+      command = 'search'
+    end
+    
+    if args.keys.size > 1
+      raise 'Too many arguments for search'
+    end
+    
+    scope = args.keys.first.to_s
+    term  = args.values.first
+    
+    unless SEARCH_SCOPE.include?(scope)
+      raise "Unknown search scope #{scope}"
+    end
+    
+    cmd_string = %Q{#{command} #{scope} "#{term}"}
+        
+    tracks = cmd(cmd_string)
+
+    if tracks.respond_to?(:collect)
+      tracks.collect { |t| Track.new(t) }
+    else
+      []
+    end
   end
 
   def respond_to?(method)
@@ -73,7 +154,6 @@ class MPD
     end
   end
   
-  private
   def method_missing(method, *args, &block)
     if COMMANDS.include?(method.to_s)
       cmd(method.to_s, *args, &block)
@@ -81,5 +161,10 @@ class MPD
       super
     end
   end
+  
+  private
+  def boolean_to_s(bool)
+    bool == true ? '1' : '0'
+  end
 end
 end

data/lib/radiodan/builder.rb

@@ -8,30 +8,31 @@ require 'player'
 class Radiodan
 class Builder
   attr_reader :middleware, :player
-    
+
   def initialize(&blk)
     @middleware = []
     @player = Player.new
-    
+
     yield(self) if block_given?
   end
 
   def use(klass, *config)
     @middleware << register(klass, 'middleware', *config)
   end
-  
+
   def adapter(klass, *config)
     player.adapter = register(klass, 'adapter', *config)
   end
-  
+
   def playlist(new_playlist)
-    player.playlist = new_playlist if player
+    use :playlist_to_start, new_playlist
   end
-  
-  def log(log)
+
+  def log(log, level=nil)
     Logging.output = log
+    Logging.level  = level unless level.nil?
   end
-  
+
   def call_middleware!
     middleware.each{ |m| m.call(@player) }
   end
@@ -45,14 +46,14 @@ class Builder
     rescue NameError => e
       klass_path ||= false
       raise if klass_path
-      
+
       # attempt to require from given path
       klass_path = Pathname.new(File.join(File.dirname(__FILE__), klass_type, "#{klass.underscore}.rb"))
       require klass_path if klass_path.exist?
 
       retry
     end
-    
+
     if config.empty?
       radio_klass.new
     else

data/lib/radiodan/em_additions.rb

@@ -7,24 +7,26 @@
   seconds.
 =end
 
-module EventMachine
+module EventMachine::Synchrony
   def self.now_and_every(period, &blk)
     seconds = case
       when period.respond_to?(:to_f)
-        period.to_f
+        period
       when period.include?(:hours)
         period[:hours]*60*60
       when period.include?(:minutes)
         period[:minutes]*60
       else
         period[:seconds]
-    end
+    end.to_f
+    
+    raise "Period must be higher than 0" if period == 0.0
     
-    EM::Synchrony.next_tick do
+    next_tick do
       yield
     end
     
-    EM::Synchrony.add_periodic_timer(seconds) do
+    add_periodic_timer(seconds) do
       yield
     end
   end

data/lib/radiodan/event_binding.rb

@@ -16,8 +16,11 @@ module EventBinding
       logger.error "Event #{event} triggered but not found" 
     end
     
+    # also, run the events bound to :all, no matter the event
+    bindings += event_bindings[:all]
+    
     bindings.each do |blk|
-      EM.next_tick { blk.call(data) }
+      EM::Synchrony.next_tick { blk.call(data) }
     end
   end
   

data/lib/radiodan/logging.rb

@@ -3,15 +3,17 @@ require 'logger'
 class Radiodan
 module Logging
   @@output = '/dev/null'
-  
+  @@level  = :DEBUG
+
   def self.included(klass)
     klass.extend ClassMethods
   end
-  
+
   def self.output=(output)
     @@output = output
+    STDOUT.sync = true if @@output == STDOUT
   end
-  
+
   def self.output
     @@output
   end
@@ -20,17 +22,26 @@ module Logging
     self.class.logger
   end
 
-  module ClassMethods    
+  def self.level=(level)
+    @@level = Logger.const_get(level.to_sym.upcase)
+  end
+
+  def self.level
+    @@level
+  end
+
+  module ClassMethods
     @@logs = {}
-    
+
     def logger
       unless @@logs.include? self.name
         new_log = Logger.new(Logging.output)
         new_log.progname = self.name
-        
+        new_log.level = Logging.level
+
         @@logs[self.name] = new_log
       end
-      
+
       @@logs[self.name]
     end
   end

data/lib/radiodan/middleware/panic.rb

@@ -26,18 +26,12 @@ class Panic
     @panic = true
     
     original_state = @player.playlist
-  
-    EM.defer \
-      proc {
-        logger.debug "panic for #{@timeout} seconds"
-        @player.playlist = @playlist
-        sleep(@timeout)
-      }, 
-      proc {
-        return_to_state original_state
-      }
-  
-    @panic
+    logger.debug "panic for #{@timeout} seconds"
+    @player.playlist = @playlist
+    
+    EM::Synchrony.add_timer(@timeout) do
+      return_to_state original_state
+    end
   end
 
   def return_to_state(playlist)

data/lib/radiodan/middleware/playlist_to_start.rb

@@ -0,0 +1,11 @@
+class Radiodan
+class PlaylistToStart
+  def initialize(*config)
+    @playlist = config.shift
+  end
+  
+  def call(player)
+    player.playlist = @playlist
+  end
+end
+end

data/lib/radiodan/middleware/toggle_playlist.rb

@@ -0,0 +1,19 @@
+class Radiodan
+class TogglePlaylist
+  include Logging
+  
+  def initialize(main_playlist, toggle_playlist)
+    @playlists = [main_playlist, toggle_playlist]
+  end
+  
+  def call(player)
+    @player = player
+    @player.playlist = @playlists.shift
+    
+    @player.register_event :toggle do
+      logger.info "Toggling playlist"
+      @player.playlist, @playlists = @playlists.shift, [@player.playlist]
+    end
+  end
+end
+end

data/lib/radiodan/middleware/touch_file.rb

@@ -15,7 +15,7 @@ class TouchFile
   end
 
   def call(player)
-    EM.now_and_every(0.5) do
+    EM::Synchrony.now_and_every(0.5) do
       player.events.each do |event|
         file = event.to_s
         p = Pathname.new(File.join(@path, file))