dhun 0.5.5 → 0.5.6

data/FIX.md

@@ -1,4 +1,6 @@
 ## Fixes/Improvements required
 
 * Refactor multiple calls to result.to_json
-* Refactor handler calls by converting it from module to subclass of EventMachine::Connection object
+* 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

data/README.md

@@ -76,6 +76,13 @@ your queue. To append files to queue, use `enqueue`.
     /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
+    
+Enqueuing more files.
+
+    $ dhun enqueue chup
+    1 files queued for playing.
+    /Users/deepak/Dropbox/shared/music/Coke Studio/Chup.mp3
+    
 
 ### Controlling Playback
 
@@ -94,6 +101,27 @@ Skipping to next file
     $ dhun next
     Dhun is playing /Users/deepak/Music/iTunes/iTunes Media/Music/Edward Sharpe & The Magnetic Zeros/Here Comes/03 Carries On.mp3
 
+You can use a numeric argument to specify the number of tracks to skip ahead,
+like `dhun next 2`.
+
+Skipping to previous file in history.
+
+    $ dhun prev 
+    Dhun is playing /Users/deepak/Music/iTunes/iTunes Media/Music/Edward Sharpe & The Magnetic Zeros/Here Comes/02 Janglin.mp3
+
+You can use a numeric argument to specify the number of tracks to skip ahead,
+like `dhun prev 2`.
+
+Shuffling the queue
+
+    $ dhun shuffle
+    Queue is shuffled
+    /Users/deepak/Dropbox/shared/music/3 idiots/35634_Give Me Some Sunshine.mp3
+    /Users/deepak/Dropbox/shared/music/Aao Wish Karen/35612_Kuch Aisa.mp3
+    /Users/deepak/Dropbox/shared/music/Coke Studio/Jo-Meray.mp3
+
+### Other commands
+
 Status
 
     $ dhun status
@@ -108,11 +136,13 @@ Status
     /Users/deepak/Dropbox/shared/music/Here Comes/01 - 40 Day Dream.mp3
     /Users/deepak/Dropbox/shared/music/Here Comes/03 - Carries On.mp3
 
-Enqueuing more files.
+History
 
-    $ dhun enqueue chup
-    1 files queued for playing.
-    /Users/deepak/Dropbox/shared/music/Coke Studio/Chup.mp3
+    $ 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
 
 ### Stopping Dhun
 
@@ -122,10 +152,11 @@ This will exit the process.
 
 ## Coming Soon
 
-These features are planned in the next few releases
+There are some features planned in the short run. Please file an issue with a
+feature request, if you have one.
 
-* Playing previous song, using something like `dhun prev`
-* Skipping ahead by more than one file, like `dhun next 2` or `dhun prev 2`
+* Saving/Loading playlists
+* Growl Notifications using `growlnotify`
 
 And someday..
 

data/dhun.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'dhun'
-  s.version = '0.5.5'
+  s.version = '0.5.6'
   s.summary = "Minimalist music player for OS X"
-  s.date = '2009-12-14'
+  s.date = '2009-12-18'
   s.email = 'deepak.jois@gmail.com'
   s.homepage = 'http://github.com/deepakjois/dhun'
   s.has_rdoc = false

data/lib/dhun.rb

@@ -1,5 +1,5 @@
 module Dhun
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 
   autoload :Runner, 'dhun/runner'
   autoload :Controller, 'dhun/controller'

data/lib/dhun/controller.rb

@@ -3,7 +3,7 @@ module Dhun
   class Controller
 
     attr_accessor :options,:logger
-    
+
     def initialize(options)
       @options = options
       @logger = Logger.instance
@@ -17,11 +17,11 @@ module Dhun
         server.start
       end
     end
-    
+
     def stop
       send_command("stop")
     end
-    
+
     def query(*args)
       abort_if_empty_args(args)
       q = Query.new(args)
@@ -71,9 +71,9 @@ module Dhun
         now_playing = resp[:now_playing]
         queue = resp[:queue]
         puts "Now playing #{now_playing}" if now_playing
-        if queue.empty? 
-          puts "Queue is empty" 
-        else 
+        if queue.empty?
+          puts "Queue is empty"
+        else
           print_list(queue)
         end
       end
@@ -86,11 +86,27 @@ module Dhun
       print_list(resp[:history]) unless resp[:history].empty?
     end
 
-    def next(*args)
-      resp = get_json_response("next")
+    def next(skip_length=1)
+      begin
+        skip_length = Integer(skip_length)
+      rescue ArgumentError => ex # Not a valid integer
+        abort ex.message
+      end
+      resp = get_json_response("next",[skip_length])
       puts resp[:message] if resp
     end
 
+    def prev(skip_length=1)
+      begin
+        skip_length = Integer(skip_length)
+      rescue ArgumentError => ex # Not a valid integer
+        abort ex.message
+      end
+      resp = get_json_response("prev",[skip_length])
+      puts resp[:message] if resp
+    end
+
+
     def pause
       resp = get_json_response("pause")
       puts resp[:message] if resp
@@ -123,10 +139,10 @@ module Dhun
     end
 
     def get_json_response(command,args=[])
-      begin 
+      begin
          resp = send_command(command,args)
          return Result.from_json_str(resp)
-      rescue 
+      rescue
         puts "Invalid Response From Server"
         logger.debug $!
         return nil
@@ -134,7 +150,7 @@ module Dhun
     end
 
     def abort_if_empty_args(args)
-      abort "You must pass in atleast one argument" if args.empty? 
+      abort "You must pass in atleast one argument" if args.empty?
     end
 
     def print_list(list)

data/lib/dhun/handler.rb

@@ -50,7 +50,7 @@ module Dhun
       status_msg = case @player.status
                    when :playing then "Dhun is running" 
                    when :paused  then "Dhun is paused"
-                   when :stopped then "Dhun is stopped"
+                   when :stopped then "Dhun has stopped"
                    end
       now_playing = @player.current
       queue = @player.queue
@@ -65,10 +65,19 @@ module Dhun
       result.to_json
     end
     
-    def next(*args)
+    def next(skip_length=1)
       @player = Player.instance
-      next_track = @player.next
-      result = Result.new :success, (next_track ?  "Dhun is playing #{next_track}" : "No More Tracks")
+      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
+    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
     end
 
@@ -79,7 +88,7 @@ module Dhun
       when :paused
         result = Result.new :success, "Dhun is paused at #{@player.current}"
       when :stopped
-        result = Result.new :error, "Dhun is already stopped"
+        result = Result.new :error, "Dhun has already stopped"
       end
       return result.to_json
     end
@@ -91,7 +100,7 @@ module Dhun
       when :playing
         result = Result.new :success, "Dhun is playing #{@player.current}"
       when :stopped
-        result = Result.new :error, "Dhun is already stopped"
+        result = Result.new :error, "Dhun has already stopped"
       end
       return result.to_json
     end

data/lib/dhun/player.rb

@@ -23,7 +23,7 @@ module Dhun
       @queue.clear
     end
 
-    
+
     def play_files(files)
       if files.empty?
         logger.log "Empty Queue"
@@ -44,14 +44,13 @@ module Dhun
       return unless self.status == :stopped
       @status = :playing
       @player_thread = Thread.new do
-        while  @status == :playing and !queue.empty?          
+        while  @status == :playing and !queue.empty?
           @current = @queue.shift
           logger.log "Playing #{@current}"
           DhunExt.play_file @current
           @history.unshift @current
         end
         @status = :stopped
-        logger.log "Finished playing #{@current}"
         @current = nil
       end
     end
@@ -78,14 +77,34 @@ module Dhun
       logger.debug "Stopped"
     end
 
-    def next
+    def next(skip_length = 1)
       logger.debug "Switching to next"
-      stop # stops current track
-      next_track = @queue.first
-      play # start playing with the next track
+      unless @queue.size < skip_length
+        stop # stops current track
+        @queue.shift skip_length-1 # Remove skip_length-1 tracks
+        next_track = @queue.first
+        play # start playing with the next track
+      end
       return next_track
     end
 
+    def prev(skip_length = 1)
+      logger.debug "Switching to prev"
+      unless @history.size < skip_length
+        unless @status == :stopped
+          stop
+          # history has increased by one
+          skip_length = skip_length + 1
+        end
+        tracks = @history.shift skip_length
+        logger.debug tracks
+        tracks.each { |t| @queue.unshift t }
+        prev_track = @queue.first
+        play # start playing with the next track
+      end
+      return prev_track
+    end
+
     def shuffle
       return if @queue.empty?
       s = @queue.size

data/lib/dhun/runner.rb

@@ -5,7 +5,7 @@ module Dhun
   # Heavily lifted from Thin codebase
   class Runner
     COMMANDS = %w(start query)
-    CLIENT_COMMANDS = %w(stop play pause resume next enqueue status shuffle history)
+    CLIENT_COMMANDS = %w(stop play pause resume next prev enqueue status shuffle history)
     # Parsed options
     attr_accessor :options
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dhun
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Deepak Jois
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -08:00
+date: 2009-12-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency