dhun 0.6.0 → 0.7.0

data/README.md

@@ -29,7 +29,7 @@ the `gem` command to compile the native extensions.
 this runs the Dhun server as a daemon by default. to not run it as a daemon:
 
     $ dhun start_server --foreground
-    or
+or
     $ dhun start_server -f
 
 See `dhun help start_server for more information`
@@ -44,8 +44,7 @@ You can also query the Spotlight database before playing the files, with the
 
     $ 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
+    Querying: deadmau5 | 5 Results
     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
@@ -60,9 +59,9 @@ you can query based on certain filters such as artist,albums, title, genre and f
 
      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
+     1 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/08 - Paul van Dyk - Talk In Grey.mp3
+     2 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/09 - Paul van Dyk - In Circles.mp3
+     3 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/10 - Paul van Dyk - In Between.mp3
 
 
 YOu can mix filters with regular queries as well.
@@ -71,14 +70,13 @@ YOu can mix filters with regular queries as well.
 
     Querying: paul | title:haunted
     1 Results
-    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)/01 - Paul van Dyk - Haunted.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
+    Querying: paul,trance | 6 Results
     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
@@ -93,7 +91,7 @@ Now lets put it all together and go crazy.
 
     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
+    1 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/01 - Paul van Dyk - Haunted.mp3
 
 
 ### Playing Files
@@ -106,8 +104,7 @@ 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
+    Querying: paul,trance | 6 Results
     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
@@ -122,12 +119,12 @@ 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
+    1 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/01 - Paul van Dyk - Haunted.mp3
+    2 : /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.
+Once queued, the songs will begin playing. You can continue to enqueue more songs using `enqueue` command.
     
 ### Controlling Playback
 
@@ -185,8 +182,8 @@ Status
     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
+    1 : /Volumes/Storage/Music/Hydeout Productions (Second Collection)/04 Imaginary Folklore.mp3
+    2 : /Volumes/Storage/Music/Hydeout Productions (Second Collection)/05 Hikari(feat. Substantial).mp3
     
 History
 
@@ -195,6 +192,17 @@ History
     History:
     0 : /Volumes/Storage/Music/Hydeout Productions (Second Collection)/04 Imaginary Folklore.mp3
     
+Saving Playlist
+
+    $ dhun save_playlist /tmp/playlist.pls
+    created /tmp/playlist
+    
+Loading Playlist
+
+    $ dhun load_playlist /tmp/playlist.pls
+    14 files queued
+    loaded playlist
+
 
 ### Stopping Dhun
 

data/dhun.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'dhun'
-  s.version = '0.6.0'
+  s.version = '0.7.0'
   s.summary = "Minimalist music player for OS X"
-  s.date = '2010-01-12'
+  s.date = '2010-01-24'
   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.6.0'
+  VERSION = '0.7.0'
 
   autoload :Runner, 'dhun/runner'
   autoload :Server, 'dhun/server'

data/lib/dhun/handler.rb

@@ -2,10 +2,10 @@ require 'json'
 module Dhun
   # Handling commands sent by Dhun client
   class Handler
-    attr_reader :player
+    attr_accessor :player
 
-    def initialize
-      @player = Dhun::Player.instance
+    def initialize(player = Dhun::Player.instance)
+      @player = player
     end
 
     def play

data/lib/dhun/player.rb

@@ -4,11 +4,10 @@ module Dhun
   class Player
     include Singleton
 
-    attr_accessor :queue,:history,:status,:current,:logger
+    attr_accessor :queue,:history,:status,:current
 
     def initialize
       @queue,@history = [],[]
-      @logger = Logger.instance
       @status = :stopped
     end
 
@@ -41,7 +40,6 @@ module Dhun
       if @status == :playing
         @status = :paused
         DhunExt.pause
-        @logger.debug "pause"
         return true
       end
       return false
@@ -53,7 +51,6 @@ module Dhun
       if @status == :paused
         @status = :playing
         DhunExt.resume
-        @logger.debug "resume"
         return true
       end
       return false
@@ -67,7 +64,6 @@ module Dhun
         DhunExt.stop
         # Wait for @player_thread to exit cleanly
         @player_thread.join unless @player_thread.nil?
-        @logger.debug "Stopped"
         return true
       end
       return false
@@ -77,7 +73,6 @@ module Dhun
     # returns next_track or false if invalid
     def next(skip_length = 1)
       unless skip_length > @queue.size
-        @logger.debug "next invoked"
         stop
         @queue.shift(skip_length - 1) #skip_length returns starting with first on queue.
         next_track = @queue.first
@@ -97,7 +92,6 @@ module Dhun
         stop ; skip_length += 1
       end
       unless skip_length > @history.size
-        @logger.debug "previous invoked"
         tracks = @history.shift skip_length
         tracks.each { |track| @queue.unshift track }
         previous = @queue.first
@@ -116,7 +110,6 @@ module Dhun
       while q == @queue
         @queue.size.downto(1) { |n| @queue.push @queue.delete_at(rand(n)) }
       end
-      @logger.debug @queue
       return true
     end
     
@@ -127,7 +120,6 @@ module Dhun
       Thread.new do
         while  @status == :playing and !@queue.empty?
           @current = @queue.shift
-          @logger.log "Playing #{@current}"
           DhunExt.play_file @current
           @history.unshift @current
         end

data/lib/dhun/runner.rb

@@ -11,6 +11,7 @@ module Dhun
       task.formatted_usage(self).gsub("dhun:runner:","dhun ")
     end
 
+
     desc "start_server","Starts the Dhun Server."
     method_option :socket, :type => :string, :default => "/tmp/dhun.sock", :aliases => '-s'
     method_option :log, :type => :string, :default => "/tmp/dhun.log", :aliases => '-l'
@@ -45,7 +46,7 @@ module Dhun
       search = search.nil? ? nil : search.split(',')
       query = Dhun::Query.new(search,options)
       if query.is_valid?
-        
+
         #make the prompt pretty. i think.
         opts = options.collect {|field,value| "#{field}:#{value}" }.join(" ")
         term = search.nil? ? '[nil]' : search.join(",")
@@ -86,29 +87,16 @@ module Dhun
     method_option :file, :type => :string, :aliases => '-f'
     method_option :title, :type => :string, :aliases => '-t'
     def enqueue(search=nil)
-      
+
       # invoke query command and return us all the files found.
       files = invoke :query, [search], options
       if files and !files.empty?
-        #prompt for index of song to play and return it in pretty format. cough.
-        if files.size == 1 # Dont prompt if result size is 1
-          indexes = [0]
-        else
-          answer = ask "Enter index to queue (ENTER to select all): ",:yellow
-
-          indexes ||=
-          case
-          when answer.include?(',') then answer.split(',')
-          when answer.include?(' ') then answer.split(' ')
-          when answer.size >= 1 then answer.to_a
-          else
-            0..(files.size - 1)
-          end
-        end
-        selected = indexes.map { |index| files[index.to_i] }
-        say "selected:",:green
+        indexes = files.size == 1 ? [1] : enqueue_prompt(files.size)
+
+        selected = indexes.map { |index| files[index.to_i-1] }
+        say "selected:",:magenta
         say_list selected
-        
+
         return_response(:enqueue,nil,selected)
       end
     end
@@ -117,7 +105,7 @@ module Dhun
     def next(count=1)
       return_response(:next,[],count.to_i)
     end
-    
+
     desc "prev COUNT", "Skips to previous song by COUNT"
     def prev(count=1)
       return_response(:prev,[],count.to_i)
@@ -125,8 +113,8 @@ module Dhun
 
     desc "status", "Shows the status"
     def status
-      return unless server_running?
       response = return_response(:status,[:current,:queue])
+      return false unless response
       say "Currently Playing:",:magenta
       say response[:current],:white
       say "Queue:",:cyan
@@ -136,86 +124,131 @@ module Dhun
     desc "history", "Shows the previously played songs"
     def history
       response = return_response(:history,[:history])
-      if response[:history]
-        say "History:",:cyan
-        say_list response[:history]
-      end
+      return false unless response
+      say "History:",:cyan
+      say_list response[:history]
     end
-    
+
     desc "shuffle", "Shuffles the queue"
     def shuffle
       response = return_response(:shuffle,[:queue])
-      if response[:queue]
-        say "Queue:",:cyan
-        say_list response[:queue]
-      end
+      return false unless response
+      say "Queue:",:cyan
+      say_list response[:queue]
     end
 
     desc "pause", "Pauses playing"
     def pause
       return_response(:pause,[])
     end
-    
+
     desc "resume", "Resumes playing"
     def resume
       return_response(:resume,[])
     end
-    
+
     desc "stop", "Stops playing"
     def stop
       return_response(:stop,[])
     end
 
+    desc "save_playlist PATH", "saves the playlist"
+    def save_playlist(path=nil)
+      unless path
+        say "Please include a path for the playlist", :red
+        return false
+      end
+      create_file path, playlist_save
+    end
+    
+    desc "load_playlist PATH", "loads the playlist"
+    def load_playlist(path=nil)
+      unless File.exists?(path) or path.nil?
+        say "invalid path! please include a valid path.", :red
+        return false
+      end
+      return_response(:enqueue,nil,playlist_load(path))
+      say "loaded playlist", :cyan
+    end
 
-    private
+    no_tasks do
 
-    # sends command to dhun client
-    def send_command(command,arguments=[])
-      cmd = { "command" => command.to_s, "arguments" => arguments }.to_json
-      send_message(cmd,"/tmp/dhun.sock")
-    end
+      # Writes the queue to the playlist. 
+      # This will be overloaded by other playlist modules
+      def playlist_save
+        return_response(:status,[:queue])[:queue].collect { |song| song }.join("\n")
+      end
+      
+      # Loads the playlist to the queue.
+      # This will be overloaded by other playlist modules.
+      def playlist_load(path)
+        File.read(path).split("\n")
+      end
+      
+      # send out the command to server and see what it has to say.
+      def return_response(action,keys,argument=[])
+        response = get_response(action,argument)
+        if response
+          color = response.success? ? :green : :red
+          say response[:message], color
+          if keys
+            return keys.inject({}) {|base,key| base[key.to_sym] = response[key.to_sym] ; base}
+          end
+        end
+      end
 
-    # send command to the server and retrieve response.
-    def get_response(command,arguments=[])
-      if server_running?
+      # send command to the server and retrieve response.
+      def get_response(command,arguments=[])
+        if server_running?
           resp = send_command(command,arguments)
           return Dhun::Result.from_json_str(resp)
+        end
       end
-    end
-    
-    # prints out list with each index value
-    # in pretty format! (contrasting colors)
-    def say_list(list)
-      list.each_with_index do |item,index|
-        color = index.even? ? :white : :cyan
-        say("#{index} : #{item}",color)
+
+      # sends command to dhun client
+      def send_command(command,arguments=[])
+        cmd = { "command" => command.to_s, "arguments" => arguments }.to_json
+        send_message(cmd,"/tmp/dhun.sock")
       end
-    end
 
-    # check to see if Dhun Server is running.
-    # asks to start Dhun server if not
-    # takes argument :silent to quiet its output.
-    # need to make the socket choices more flexible
-    def server_running?(socket = "/tmp/dhun.sock",verbose = :verbose)
-      socket ||= "/tmp/dhun.sock"
-      if is_server?(socket)
-        return true
-      else
-        say("Please start Dhun server first with : dhun start_server", :red) unless verbose == :silent
-        return false
+      # check to see if Dhun Server is running.
+      # asks to start Dhun server if not
+      # takes argument :silent to quiet its output.
+      # need to make the socket choices more flexible
+      def server_running?(socket = "/tmp/dhun.sock",verbose = :verbose)
+        socket ||= "/tmp/dhun.sock"
+        if is_server?(socket)
+          return true
+        else
+          say("Please start Dhun server first with : dhun start_server", :red) unless verbose == :silent
+          return false
+        end
       end
-    end
-    
-    #send out the command to server and see what it has to say.
-    def return_response(action,keys,argument=[])
-      response = get_response(action,argument)
-      if response
-        color = response.success? ? :red : :cyan
-        say response[:message], color
-        if keys
-          return keys.inject({}) {|base,key| base[key.to_sym] = response[key.to_sym] ; base}
+
+      #prompt for enqueue
+      def enqueue_prompt(size)
+        answer = ask "Enter index to queue (ENTER to select all): ",:yellow
+        case
+        when answer.include?(',')
+          return answer.split(',')
+        when answer.include?(' ')
+          return answer.split(' ')
+        when answer.size >= 1
+          return answer.to_a
+        else
+          return 0..(size - 1)
+        end
+      end
+
+      # prints out list with each index value
+      # in pretty format! (contrasting colors)
+      def say_list(list)
+        list.each_with_index do |item,index|
+          color = index.even? ? :white : :cyan
+          say("#{index+1} : #{item}",color)
         end
       end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dhun
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Deepak Jois
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 -08:00
+date: 2010-01-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency