dhun 0.5.6 → 0.6.0

data/CONTRIBUTORS

@@ -0,0 +1 @@
+* achiu - http://github.com/achiu

data/FIX.md

@@ -1,6 +1,7 @@
 ## Fixes/Improvements required
 
-* Refactor multiple calls to result.to_json
 * Refactor handler calls by converting it from module to subclass of EventMachine::Connection object
-* Put querying code in play and enqueue methods inside the player
-* Clean up parser to avoid any SQL-injection style errors in args
+
+* store the socket information somehow so the runner remembers?
+
+* have play jump to queue number

data/README.md

@@ -19,16 +19,20 @@ put the binaries in the right place. You will need to have XCode installed for
 the `gem` command to compile the native extensions.
 
     $ gem sources -a http://gemcutter.org
-    $ gem install dhun
+    $ gem install dhun    
 
 ### Starting Dhun
 
-    $ dhun start
+    $ dhun start_server
     Starting Dhun
 
-Pass the `-d` option to run the server as a daemon in the background. See
-`dhun -h` for more options.
+this runs the Dhun server as a daemon by default. to not run it as a daemon:
 
+    $ dhun start_server --foreground
+    or
+    $ dhun start_server -f
+
+See `dhun help start_server for more information`
 
 ### Querying for files
 
@@ -38,53 +42,105 @@ will look for files matching that keyword and start playing them.
 You can also query the Spotlight database before playing the files, with the 
 `query` command.
 
-    $ dhun query here
-    3 Results
-    /Users/deepak/Music/iTunes/iTunes Media/Music/Edward Sharpe & The Magnetic Zeros/Here Comes/01 40 Day Dream.mp3
-    /Users/deepak/Music/iTunes/iTunes Media/Music/Edward Sharpe & The Magnetic Zeros/Here Comes/02 Janglin.mp3
-    /Users/deepak/Music/iTunes/iTunes Media/Music/Edward Sharpe & The Magnetic Zeros/Here Comes/03 Carries On.mp3
+    $ dhun query deadmau5
+
+    Querying: deadmau5 | 6 Results
+    0 : /Volumes/Storage/Music/Grand.Theft.Auto.IV-Radio.Station.Rips-AiTB/Electro-Choc/03 One + One - No Pressure (Deadmau5 Remix).mp3
+    1 : /Volumes/Storage/Music/Grand.Theft.Auto.IV-Radio.Station.Rips-AiTB/Electro-Choc/09 Chris Lake vs. Deadmau5 - I Thought Inside Out (Original Mix).mp3
+    2 : /Volumes/Storage/Music/Deadmau5 - It Sounds Like (MP3, 320bps) [2009]/01 Alone With You.mp3
+    3 : /Volumes/Storage/Music/Deadmau5 - It Sounds Like (MP3, 320bps) [2009]/02 Arguru (EDX's 5un5hine Remix).mp3
+    4 : /Volumes/Storage/Music/Deadmau5 - It Sounds Like (MP3, 320bps) [2009]/03 Bye Friend.mp3
+    5 : /Volumes/Storage/Music/Deadmau5 - It Sounds Like (MP3, 320bps) [2009]/04 Clockwork.mp3
+
+
+
+you can query based on certain filters such as artist,albums, title, genre and file.
+
+    $ dhun query --artist="Paul van Dyk" --genre=trance --file 'Paul' --title in
+
+     Querying: [nil] | artist:Paul van Dyk title:in genre:trance file:Paul
+     3 Results
+     0 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/08 - Paul van Dyk - Talk In Grey.mp3
+     1 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/09 - Paul van Dyk - In Circles.mp3
+     2 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/10 - Paul van Dyk - In Between.mp3
+
 
-You can use query filters like `album:sid` or `artist:rahman`. Currently
-`album`, `artist`, `title`, `genre` and `file` filters are supported. 
+YOu can mix filters with regular queries as well.
 
-    $ dhun query genre:world album:gypsy
-    5 results
-    /Users/deepak/Dropbox/shared/music/gypsy/Putumayo - Gypsy Groove - 11 - Eastenders - Vino Iubirea Mea (!DelaDap Remix) (Germany).mp3
-    /Users/deepak/Dropbox/shared/music/gypsy/Putumayo - Gypsy Groove - 10 - Luminescent Orchestrii - Amari Szi, Amari (Amon Remix)  (USA).mp3
-    /Users/deepak/Dropbox/shared/music/gypsy/Putumayo - Gypsy Groove - 09 - Kistehén Tánczenekar - Virágok a Réten (Romano Drom Remix) (Hungary).mp3
-    /Users/deepak/Dropbox/shared/music/gypsy/Putumayo - Gypsy Groove - 08 - Anselmo Crew - Süt Ictim Dilim Yandi (Hungary).mp3
-    /Users/deepak/Dropbox/shared/music/gypsy/Putumayo - Gypsy Groove - 07 - Magnifico & Turbolentza - Zh Ne Sui Pa Pur Tua (Slovenia).mp3
+    $ dhun query paul --title=haunted
 
-You can even mix the filters with a regular query like.
+    Querying: paul | title:haunted
+    1 Results
+    0 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/01 - Paul van Dyk - Haunted.mp3
 
-    $ dhun query genre:world album:gypsy Czech
-    2 Results
-    /Users/deepak/Dropbox/shared/music/gypsy/Putumayo - Gypsy Groove - 01 - !DelaDap - Zsa Manca (Czech Republic-Hungary).mp3
-    /Users/deepak/Dropbox/shared/music/gypsy/Putumayo - Gypsy Groove - 03 - Gipsy.cz - Jednou (Czech Republic).mp3
+You can also pass in multiple regular expressions too. they just need to be seperated by commas (,)
+
+    $ dhun query paul,trance
+
+    Querying: paul,trance | 7 Results
+    0 : /Volumes/Storage/Music/Paul_Van_Dyk-Volume-3CD-2009-TSP/101-paul_van_dyk-volume__the_productions.mp3
+    1 : /Volumes/Storage/Music/Paul_Van_Dyk-Volume-3CD-2009-TSP/201-paul_van_dyk-volume__the_remixes_part_1.mp3
+    2 : /Volumes/Storage/Music/Paul_Van_Dyk-Volume-3CD-2009-TSP/301-paul_van_dyk-volume__the_remixes_part_2.mp3
+    3 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/04 - Paul van Dyk - Complicated (Feat. Ashley Tomberlin).mp3
+    4 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/01 - Paul van Dyk - Haunted.mp3
+    5 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/02 - Paul van Dyk - White Lies (Feat. Jessica Sutta).mp3
+    6 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/03 - Paul van Dyk - Sabotage.mp3
+
+
+Now lets put it all together and go crazy.
+
+    $ dhun query 'paul van',dyk --genre=trance --title=haunted
+
+    Querying: paul van,dyk | title:haunted genre:trance
+    1 Results
+    0 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/01 - Paul van Dyk - Haunted.mp3
 
-Note that if you want to pass filters longer than a word, you will need to
-enclose the argument in double quotes, like `dhun query "artist:akli d"`
 
 ### Playing Files
 
-When you are ready to play the files, pass the query to the `play` command.
-Note that the `play` command will remove anything that may be already there on
-your queue. To append files to queue, use `enqueue`.
+To play the files, first enqueue the songs.
+
+    $ dhun play paul,trance
 
-    $ dhun play here
-    3 files queued for playing
-    /Users/deepak/Music/iTunes/iTunes Media/Music/Edward Sharpe & The Magnetic Zeros/Here Comes/01 40 Day Dream.mp3
-    /Users/deepak/Music/iTunes/iTunes Media/Music/Edward Sharpe & The Magnetic Zeros/Here Comes/02 Janglin.mp3
-    /Users/deepak/Music/iTunes/iTunes Media/Music/Edward Sharpe & The Magnetic Zeros/Here Comes/03 Carries On.mp3
+this can also be done by
+
+    $ dhun enqueue paul,trance
+
+    Querying: paul,trance | 7 Results
+    0 : /Volumes/Storage/Music/Paul_Van_Dyk-Volume-3CD-2009-TSP/101-paul_van_dyk-volume__the_productions.mp3
+    1 : /Volumes/Storage/Music/Paul_Van_Dyk-Volume-3CD-2009-TSP/201-paul_van_dyk-volume__the_remixes_part_1.mp3
+    2 : /Volumes/Storage/Music/Paul_Van_Dyk-Volume-3CD-2009-TSP/301-paul_van_dyk-volume__the_remixes_part_2.mp3
+    3 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/04 - Paul van Dyk - Complicated (Feat. Ashley Tomberlin).mp3
+    4 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/01 - Paul van Dyk - Haunted.mp3
+    5 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/02 - Paul van Dyk - White Lies (Feat. Jessica Sutta).mp3
+    6 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/03 - Paul van Dyk - Sabotage.mp3
+    Enter index to queue: 
+
+It will prompt you to enter the index of the songs you want queued.(numbers on the left side)
+You can enter them separated by commas(1,2,3,4) or spaces(1 2 3 4) or a single song if you like.
+If you leave the prompt blank and enter, it will queue ALL the resulting songs.
+
+    Enter index to queue 4 5
+    selected:
+    0 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/01 - Paul van Dyk - Haunted.mp3
+    1 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/02 - Paul van Dyk - White Lies (Feat. Jessica     Sutta).mp3
+    2 files queued
+
+
+Once queued, the songs will begin playing. you can continue to enqueue more songs via enqueue and play.
     
-Enqueuing more files.
+### Controlling Playback
+
 
-    $ dhun enqueue chup
-    1 files queued for playing.
-    /Users/deepak/Dropbox/shared/music/Coke Studio/Chup.mp3
+Starting Playback(needs to have songs in queue)
+
+    $ dhun play
+    resuming playback
     
+Stopping playback.
 
-### Controlling Playback
+    $ dhun stop
+    Dhun has stopped
 
 Pausing playback.
 
@@ -126,29 +182,25 @@ Status
 
     $ dhun status
     Dhun is running
-    Now playing /Users/deepak/Music/iTunes/iTunes Media/Music/Edward Sharpe & The Magnetic Zeros/Here Comes/03 Carries On.mp3
-    /Users/deepak/Music/iTunes/iTunes Media/Music/Edward Sharpe & The Magnetic Zeros/Here Comes/02 Janglin.mp3
-    /Users/deepak/Music/iTunes/iTunes Media/Music/Edward Sharpe & The Magnetic Zeros/Here Comes/03 Carries On.mp3
-    /Users/deepak/Music/Amazon MP3/Edward Sharpe & The Magnetic Zeros/Here Comes/01 - 40 Day Dream.mp3
-    /Users/deepak/Music/Amazon MP3/Edward Sharpe & The Magnetic Zeros/Here Comes/02 - Janglin.mp3
-    /Users/deepak/Music/Amazon MP3/Edward Sharpe & The Magnetic Zeros/Here Comes/03 - Carries On.mp3
-    /Users/deepak/Dropbox/shared/music/Here Comes/02 - Janglin.mp3
-    /Users/deepak/Dropbox/shared/music/Here Comes/01 - 40 Day Dream.mp3
-    /Users/deepak/Dropbox/shared/music/Here Comes/03 - Carries On.mp3
-
+    Currently Playing:
+    /Volumes/Storage/Music/Hydeout Productions (Second Collection)/02 Sky is Falling (feat. C.L. Smooth).mp3
+    Queue:
+    0 : /Volumes/Storage/Music/Hydeout Productions (Second Collection)/04 Imaginary Folklore.mp3
+    1 : /Volumes/Storage/Music/Hydeout Productions (Second Collection)/05 Hikari(feat. Substantial).mp3
+    
 History
 
     $ dhun history
-    3 files in history
-    /Users/deepak/Dropbox/shared/music/Coke Studio/Bari-Barsi.mp3
-    /Users/deepak/Dropbox/shared/music/Coke Studio/Aankhon-Kay-Sagar.mp3
-    /Users/deepak/Dropbox/shared/music/Coke Studio/Paimona.mp3
+    1 files in history
+    History:
+    0 : /Volumes/Storage/Music/Hydeout Productions (Second Collection)/04 Imaginary Folklore.mp3
+    
 
 ### Stopping Dhun
 
-This will exit the process.
+This will exit the dhun server.
 
-    $ dhun stop
+    $ dhun stop_server
 
 ## Coming Soon
 

data/Rakefile

@@ -81,3 +81,15 @@ end
 desc 'Build the dhun extension'
 task :build => "lib/dhun_ext.#{DLEXT}"
 
+# ==========================================================
+# Riot Testing
+# ==========================================================
+
+desc 'Default task: run all tests'
+task :default => [:test]
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = false
+end

data/TODO.md

@@ -1,17 +1,8 @@
 TODO
 ====
 
-* Daemonizing/Logging of Server
-
-* Better querying mechanism using a treetop parser
-
-* Prev, by keeping a history
-
 * Display info from idv3 tags
 
-* Advanced Querying Support
-
 * iTunes support
 
-* Pause and Skip functionality
 

data/bin/dhun

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 # Thin command line interface script.
 # Run <tt>dhun -h</tt> to get more usage.
+require 'rubygems'
 $: << File.expand_path(File.dirname(__FILE__) + "/../lib")
 require 'dhun'
-Dhun::Runner.new(ARGV).run!
+Dhun::Runner.start(ARGV)
 

data/dhun.gemspec

@@ -1,17 +1,21 @@
 Gem::Specification.new do |s|
   s.name = 'dhun'
-  s.version = '0.5.6'
+  s.version = '0.6.0'
   s.summary = "Minimalist music player for OS X"
-  s.date = '2009-12-18'
+  s.date = '2010-01-12'
   s.email = 'deepak.jois@gmail.com'
   s.homepage = 'http://github.com/deepakjois/dhun'
   s.has_rdoc = false
+  s.add_development_dependency('riot', '>=0.10.11')
+  s.add_development_dependency('rr', '>=0.10.5')
   s.add_dependency('eventmachine', '>=0.12.10')
   s.add_dependency('json_pure', '>=1.2.0')
   s.add_dependency('daemons', '>=1.0.10')
+  s.add_dependency('thor', '>=0.12.0')
   s.authors = ["Deepak Jois"]
   # = MANIFEST =
   s.files = %w[
+    CONTRIBUTORS
     FIX.md
     LICENSE.txt
     README.md
@@ -26,9 +30,7 @@ Gem::Specification.new do |s|
     ext/player.c
     ext/query.c
     lib/dhun.rb
-    lib/dhun/command.rb
-    lib/dhun/controller.rb
-    lib/dhun/dhun_client.rb
+    lib/dhun/client.rb
     lib/dhun/dhun_server.rb
     lib/dhun/handler.rb
     lib/dhun/logger.rb

data/lib/dhun.rb

@@ -1,11 +1,10 @@
 module Dhun
-  VERSION = '0.5.6'
+  VERSION = '0.6.0'
 
   autoload :Runner, 'dhun/runner'
-  autoload :Controller, 'dhun/controller'
   autoload :Server, 'dhun/server'
   autoload :DhunServer, 'dhun/dhun_server'
-  autoload :DhunClient, 'dhun/dhun_client'
+  autoload :Client, 'dhun/client'
   autoload :Handler, 'dhun/handler'
   autoload :Player, 'dhun/player'
   autoload :Query, 'dhun/query'

data/lib/dhun/client.rb

@@ -0,0 +1,25 @@
+require 'socket'
+require 'json'
+module Dhun
+  module Client
+
+    def send_message(message,socket)
+      response = nil
+      UNIXSocket.open(socket) do |unix|
+        unix.puts message
+        response = unix.read
+      end
+      response
+    end
+
+    def is_server?(socket)
+      begin
+        UNIXSocket.open(socket) { |socket| }
+        return true
+      rescue StandardError
+        return false
+      end
+    end
+    
+  end
+end

data/lib/dhun/dhun_server.rb

@@ -1,41 +1,50 @@
+require 'rubygems'
+require 'eventmachine'
 require 'json'
+%w[handler logger player query result].each {|lib| require File.dirname(__FILE__) + "/#{lib}"}
 module Dhun
   # Handler for commands sent from client
   module DhunServer
+    @@logger = Dhun::Logger.instance
+
     def post_init
       #puts "-- client connected"
+      @data = ""
     end
 
-    def receive_data data
-      @logger ||= Logger.instance
+    def receive_data(data)
       begin
-       @logger.debug data
-       cmd = JSON.parse(data)
-       @command = cmd["command"]
-       @arguments = cmd["arguments"]
-       handle_client_request
+        @@logger.debug data
+        @data << data
+        # puts data.inspect.to_s
+        cmd = begin 
+                JSON.parse(@data)
+              rescue
+                @@logger.log $!
+                nil
+              end
+        handle_client_request cmd["command"], cmd["arguments"] if cmd
       rescue StandardError => ex
-        @logger.log "Error parsing command : #{ex.message}"
-        @logger.log ex.backtrace
-      ensure
+        @@logger.log ex.message
+        @@logger.log ex.backtrace
+        send_data Dhun::Result.new(:error,ex.message).to_json
         close_connection true
       end
     end
 
-    def handle_client_request
-      @logger ||= Logger.instance
-      handler = Handler.new
-      begin
-        if @command.nil?
-          raise "Command Not Found"
-        end
-        result = handler.send(@command,*@arguments)
-        @logger.debug "Sending #{result}"
-        send_data result
-      rescue StandardError => ex
-        @logger.log "-- error : #{ex.message}"
-        @logger.log ex.backtrace
+    def handle_client_request(command,arguments)
+      handler = Dhun::Handler.new
+      raise "No Command!" if command.nil?
+      result =
+      if arguments and arguments != [] # this check is on the sloppy side...
+        handler.send command, arguments
+      else
+        handler.send command
       end
+      @@logger.debug "Sending #{result}"
+      puts (result ? result.inspect.to_s : 'nil')
+      send_data Dhun::Result.new(*result).to_json
+      close_connection true
     end
 
     def unbind
@@ -43,3 +52,27 @@ module Dhun
     end
   end
 end
+
+def remove_socket_file(socket)
+  File.delete(socket) if File.exist?(socket)
+end
+
+def stop!
+  Dhun::Player.instance.stop
+  Dhun::Logger.instance.log "Stopping Dhun"
+  EventMachine.stop if EventMachine.reactor_running?
+  exit
+end
+
+if ARGV
+  Dhun::Logger.instance.file = ARGV[1]
+  Dhun::Logger.instance.log "Starting Dhun"
+  at_exit { remove_socket_file(ARGV[0]); stop! }
+  EventMachine::run do
+    puts "Dhun Server at: #{ARGV[0]}"
+    trap('QUIT') { stop! }
+    trap('INT')  { stop! }
+    trap('TERM') { stop! }
+    EventMachine::start_server ARGV[0], Dhun::DhunServer
+  end
+end

data/lib/dhun/handler.rb

@@ -2,118 +2,97 @@ require 'json'
 module Dhun
   # Handling commands sent by Dhun client
   class Handler
-    def stop
-      result = Result.new :success, "Dhun is stopping"
-      Server.stop
-      Player.instance.stop
-      return result.to_json
+    attr_reader :player
+
+    def initialize
+      @player = Dhun::Player.instance
     end
-    
-    def play(*args)
-      @player = Player.instance
-      q = Query.new(args)
-      if q.is_valid?
-        files = q.execute_spotlight_query
-        if files.empty?
-          result = Result.new :error, "No Results Found"
-        else
-          @player.play_files files
-          result = Result.new :success, "#{files.size} files queued for playing",
-                              :files => files
-        end
-      else
-          result = Result.new :error, "Invalid query syntax. See dhun -h for correct syntax"                              
+
+    def play
+      response =
+      case @player.play
+      when false then [:error,"already playing"]
+      when true then [:success, "resuming playback"]
+      when :empty then [:error, 'no file in queue']
       end
-      result.to_json
+      response
     end
 
-    def enqueue(*args)
-      @player = Player.instance
-      q = Query.new(args.join(" "))
-      if q.is_valid?
-        files = q.execute_spotlight_query
-        if files.empty?
-          result = Result.new :error, "No Results Found"
-        else
-          @player.enqueue files
-          result = Result.new :success, "#{files.size} files queued for playing.",
-                              :files => files
-        end
-      else
-          result = Result.new :error, "Invalid query syntax. See dhun -h for correct syntax"                              
-      end
-      result.to_json
+    def enqueue(files)
+      perform_action :enqueue, files, 
+      :success => ["#{files.size} files queued", {:files => files}],
+      :error => ["No files queued"]
     end
 
-    def status
-      @player = Player.instance
-      status_msg = case @player.status
-                   when :playing then "Dhun is running" 
-                   when :paused  then "Dhun is paused"
-                   when :stopped then "Dhun has stopped"
-                   end
-      now_playing = @player.current
-      queue = @player.queue
-      result = Result.new :success, status_msg, :now_playing => now_playing, :queue => queue
-      result.to_json
+    def pause
+      perform_action :pause,nil, 
+      :success => "Dhun is paused at #{@player.current}",
+      :error => "Dhun has already paused or stopped"
     end
 
-    def history
-      @player = Player.instance
-      status_msg = @player.history.empty? ? "No files in history" : "#{@player.history.size} files in history"
-      result = Result.new :success, status_msg, :history => @player.history
-      result.to_json
+    def resume
+      perform_action :resume,nil,
+      :success => "Dhun is resumed at #{@player.current}",
+      :error => "Dhun has already resumed or stopped"
+    end
+
+    def stop
+      perform_action :stop,nil,
+      :success => "Dhun has stopped",
+      :error => "Dhun has already stopped"
     end
     
     def next(skip_length=1)
-      @player = Player.instance
-      next_track = @player.next skip_length
-      msg = next_track ?  "Dhun is playing #{next_track}" : "Not enough tracks in queue"
-      result = Result.new :success, msg
-      return result.to_json
+      next_prev :next, 'queue',skip_length
     end
 
     def prev(skip_length=1)
-      @player = Player.instance
-      prev_track = @player.prev skip_length
-      msg = prev_track ?  "Dhun is playing #{prev_track}" : "Not enough tracks in history"
-      result = Result.new :success, msg
-      return result.to_json
+      next_prev :prev, 'history',skip_length
+    end
+    
+    def shuffle
+      perform_action :shuffle,nil,
+      :success => ['Queue is shuffled', { :queue => @player.queue }],
+      :error => 'Dhun cannot shuffle(queue empty, same songs)'
     end
 
-    def pause
-      @player = Player.instance
-      @player.pause
-      case @player.status 
-      when :paused
-        result = Result.new :success, "Dhun is paused at #{@player.current}"
-      when :stopped
-        result = Result.new :error, "Dhun has already stopped"
-      end
-      return result.to_json
+    def clear
+      perform_action :clear,nil,
+      :success => "Queue is cleared",
+      :error => "Queue is not cleared"
     end
 
-    def resume
-      @player = Player.instance
-      @player.resume
+
+    def status
+      status_msg =
       case @player.status
-      when :playing
-        result = Result.new :success, "Dhun is playing #{@player.current}"
-      when :stopped
-        result = Result.new :error, "Dhun has already stopped"
+      when :playing then "Dhun is running"
+      when :paused  then "Dhun is paused"
+      when :stopped then "Dhun has stopped"
       end
-      return result.to_json
+      [:success, status_msg, {:current => @player.current, :queue => @player.queue}]
     end
 
-    def shuffle
-      @player = Player.instance
-      @player.shuffle
-      if @player.queue.empty?
-        result = Result.new :error, "Queue is empty"
-      else
-        result = Result.new :success, "Queue is shuffled", :queue => @player.queue
-      end
-      return result.to_json
+    def history
+      return [:success, "#{@player.history.size} files in history",{:history => @player.history}] unless @player.history.empty?
+      return [:error, "No files in history"]
+    end
+
+    private
+
+    # get response
+    def perform_action(action, arg=nil, message={})
+      result = arg.nil? ? @player.send(action) : @player.send(action,arg)
+      return [:error,message[:error]].flatten unless result
+      return [:success,message[:success]].flatten
     end
+
+    #next and previous method
+    def next_prev(action,message,skip_length)
+      track = @player.send(action,skip_length)
+      return [:success, "Dhun is playing #{track}"] if track
+      return [:error, "Not enough tracks in #{message}"]
+    end
+
   end
 end