dhun 0.5.3 → 0.5.4

data/FIX.md

@@ -0,0 +1,5 @@
+## Fixes/Improvements required
+
+* Better Argument Handling. For e.g. `dhun play` w/o any arguments still works
+
+* Maintaining history of all files played in the session

data/README.md

@@ -26,9 +26,8 @@ the `gem` command to compile the native extensions.
     $ dhun start
     Starting Dhun
 
-Currently it runs in the foreground and displays a lot of random output. There
-are plans to daemonize the service once the codebase has stabilized a bit, and
-I have implemented some logging capabilities.
+Pass the `-d` option to run the server as a daemon in the background. See
+`dhun -h` for more options.
 
 ### Playing Files
 
@@ -49,7 +48,9 @@ You can also query the Spotlight database before playing the files.
     /Users/deepak/Dropbox/shared/music/Here Comes/01 - 40 Day Dream.mp3
     /Users/deepak/Dropbox/shared/music/Here Comes/03 - Carries On.mp3
 
-And then, when you are ready to play the files.
+And then, when you are ready to play the files. Note that the `play` command
+will remove anything that may be already there on your queue. To add files,
+use `enqueue`.
 
     $ dhun play here
     9 files queued for playing
@@ -70,14 +71,12 @@ More advanced querying support is coming soon.
 Pausing playback.
 
     $ dhun pause
-    Dhun is paused. Next track is /Users/deepak/Music/iTunes/iTunes Media/Music/Edward Sharpe & The Magnetic Zeros/Here Comes/02 Janglin.mp3
+    Dhun is paused at /Users/deepak/Dropbox/shared/music/Coke Studio/Jo-Meray.mp3
 
-Resuming playback. Currently, playback resumes from the next track in the
-queue. Ability to pause and play from the middle of a track is a bit tricky to
-implement, so it will be there in a future version.
+Resuming playback.
 
     $ dhun resume
-    Dhun is playing. Next track is /Users/deepak/Music/iTunes/iTunes Media/Music/Edward Sharpe & The Magnetic Zeros/Here Comes/02 Janglin.mp3
+    Dhun is playing /Users/deepak/Dropbox/shared/music/Coke Studio/Jo-Meray.mp3
 
 Skipping to next file
 
@@ -115,12 +114,9 @@ This will exit the process.
 
 These features are planned in the next few releases
 
-* Option to run Dhun server as a daemon
-* Logging
 * Playing previous song, using something like `dhun prev`
 * Skipping ahead by more than one file, like `dhun next 2` or `dhun prev 2`
 * Advanced querying support with filters, like `dhun play "artist:Rahman"`
-* Ability to pause and play in the middle of music files.
 
 And someday..
 

data/dhun.gemspec

@@ -1,16 +1,18 @@
 Gem::Specification.new do |s|
   s.name = 'dhun'
-  s.version = '0.5.3'
+  s.version = '0.5.4'
   s.summary = "Minimalist music player for OS X"
-  s.date = '2009-12-08'
+  s.date = '2009-12-10'
   s.email = 'deepak.jois@gmail.com'
   s.homepage = 'http://github.com/deepakjois/dhun'
   s.has_rdoc = false
   s.add_dependency('eventmachine', '>=0.12.10')
   s.add_dependency('json_pure', '>=1.2.0')
+  s.add_dependency('daemons', '>=1.0.10')
   s.authors = ["Deepak Jois"]
   # = MANIFEST =
   s.files = %w[
+    FIX.md
     LICENSE.txt
     README.md
     Rakefile
@@ -29,6 +31,7 @@ Gem::Specification.new do |s|
     lib/dhun/dhun_client.rb
     lib/dhun/dhun_server.rb
     lib/dhun/handler.rb
+    lib/dhun/logger.rb
     lib/dhun/player.rb
     lib/dhun/query.rb
     lib/dhun/result.rb

data/ext/dhun_ext.c

@@ -18,17 +18,22 @@ static pthread_t       posixThreadID;
 void Init_dhunruby();
 
 static VALUE method_play_file(VALUE self, VALUE fileName);
-static VALUE method_pause_play(VALUE self);
+static VALUE method_stop_play(VALUE self);
 static VALUE method_query_spotlight(VALUE self, VALUE query);
 static VALUE method_is_playing(VALUE self);
+static VALUE method_pause_play(VALUE self);
+static VALUE method_resume_play(VALUE self);
 
 // The initialization method for this module
 void Init_dhun_ext() {
   DhunExt = rb_define_class("DhunExt", rb_cObject);
   rb_define_singleton_method(DhunExt, "play_file", method_play_file, 1);
   rb_define_singleton_method(DhunExt, "query_spotlight", method_query_spotlight, 1);
-  rb_define_singleton_method(DhunExt, "pause_play", method_pause_play, 0);
+  rb_define_singleton_method(DhunExt, "stop", method_stop_play, 0);
   rb_define_singleton_method(DhunExt, "is_playing?", method_is_playing, 0);
+
+  rb_define_singleton_method(DhunExt, "pause",  method_pause_play,0);
+  rb_define_singleton_method(DhunExt, "resume", method_resume_play,0);
 }
 
 static VALUE method_play_file(VALUE self, VALUE filename) {
@@ -51,6 +56,18 @@ static VALUE method_play_file(VALUE self, VALUE filename) {
 }
 
 static VALUE method_pause_play(VALUE self) {
+  if (aqData.mIsRunning == true)
+    AudioQueuePause(aqData.mQueue);
+  return Qnil;
+}
+
+static VALUE method_resume_play(VALUE self) {
+  if (aqData.mIsRunning == true)
+    AudioQueueStart(aqData.mQueue,NULL);
+  return Qnil;
+}
+
+static VALUE method_stop_play(VALUE self) {
   aqData.mIsRunning = false;
   return Qnil;
 }

data/lib/dhun.rb

@@ -1,6 +1,6 @@
 module Dhun
-  VERSION = '0.5.3'
-  
+  VERSION = '0.5.4'
+
   autoload :Runner, 'dhun/runner'
   autoload :Controller, 'dhun/controller'
   autoload :Server, 'dhun/server'
@@ -10,4 +10,5 @@ module Dhun
   autoload :Player, 'dhun/player'
   autoload :Query, 'dhun/query'
   autoload :Result, 'dhun/result'
+  autoload :Logger, 'dhun/logger'
 end

data/lib/dhun/controller.rb

@@ -2,10 +2,11 @@ require 'json'
 module Dhun
   class Controller
 
-    attr_accessor :options
+    attr_accessor :options,:logger
     
     def initialize(options)
       @options = options
+      @logger = Logger.instance
     end
 
     def start
@@ -90,6 +91,19 @@ module Dhun
       puts resp[:message] if resp
     end
 
+    def shuffle
+      resp = get_json_response("shuffle")
+      return unless resp
+      # Process response
+      case resp.success?
+      when true
+        puts resp[:message]
+        # Print list of files
+        print_list resp[:queue]
+      else
+        puts resp[:message]
+      end
+    end
 
     protected
     def send_command(command,arguments=[])
@@ -104,7 +118,7 @@ module Dhun
          return Result.from_json_str(resp)
       rescue 
         puts "Invalid Response From Server"
-        puts $!
+        logger.debug $!
         return nil
       end
     end

data/lib/dhun/dhun_server.rb

@@ -7,32 +7,34 @@ module Dhun
     end
 
     def receive_data data
+      @logger ||= Logger.instance
       begin
-       puts data
+       @logger.debug data
        cmd = JSON.parse(data)
        @command = cmd["command"]
        @arguments = cmd["arguments"]
        handle_client_request
       rescue StandardError => ex
-        puts "Error parsing command : #{ex.message}"
-        puts ex.backtrace
+        @logger.log "Error parsing command : #{ex.message}"
+        @logger.log ex.backtrace
       ensure
         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)
-        puts "Sending #{result}"
+        @logger.debug "Sending #{result}"
         send_data result
       rescue StandardError => ex
-        puts "-- error : #{ex.message}"
-        puts ex.backtrace
+        @logger.log "-- error : #{ex.message}"
+        @logger.log ex.backtrace
       end
     end
 

data/lib/dhun/handler.rb

@@ -47,7 +47,11 @@ module Dhun
 
     def status
       @player = Player.instance
-      status_msg = (@player.status == :playing) ? "Dhun is running" : "Dhun is paused"
+      status_msg = case @player.status
+                   when :playing then "Dhun is running" 
+                   when :paused  then "Dhun is paused"
+                   when :stopped then "Dhun is stopped"
+                   end
       now_playing = @player.current
       queue = @player.queue
       result = Result.new :success, status_msg, :now_playing => now_playing, :queue => queue
@@ -63,17 +67,36 @@ module Dhun
 
     def pause
       @player = Player.instance
-      @player.stop
-      track = @player.queue.first
-      result = Result.new :success, "Dhun is paused. " + (track ? "Next track is #{track}" : "No more tracks in queue.")
+      @player.pause
+      case @player.status 
+      when :paused
+        result = Result.new :success, "Dhun is paused at #{@player.current}"
+      when :stopped
+        result = Result.new :error, "Dhun is already stopped"
+      end
       return result.to_json
     end
 
     def resume
       @player = Player.instance
-      track = @player.queue.first
-      @player.play
-      result = Result.new :success,  (track ? "Dhun is playing #{track}" : "No more tracks in queue.")
+      @player.resume
+      case @player.status
+      when :playing
+        result = Result.new :success, "Dhun is playing #{@player.current}"
+      when :stopped
+        result = Result.new :error, "Dhun is already stopped"
+      end
+      return result.to_json
+    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
     end
   end

data/lib/dhun/logger.rb

@@ -0,0 +1,25 @@
+require 'singleton'
+module Dhun
+  class Logger
+    include Singleton
+    
+    attr_accessor :log_level,:file
+    
+    def initialize
+      @file = STDOUT
+    end
+
+    def file=(f)
+      @file = File.open(f,'w')
+    end
+
+    def log(msg)
+      @file.puts "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} #{msg}" unless self.log_level == :silent
+      @file.flush
+    end
+
+    def debug(msg)
+      log(msg) if self.log_level == :debug
+    end
+  end
+end

data/lib/dhun/player.rb

@@ -8,8 +8,12 @@ module Dhun
     attr_reader :status
     attr_reader :current
 
+    attr_reader :logger
+
     def initialize
       @queue = []
+      @logger = Logger.instance
+      @status = :stopped
     end
 
     def empty_queue
@@ -20,7 +24,7 @@ module Dhun
     
     def play_files(files)
       if files.empty?
-        puts "Empty List"
+        logger.log "Empty Queue"
       else
         stop
         empty_queue
@@ -35,23 +39,38 @@ module Dhun
     end
 
     def play
-      return if @status == :playing
+      return unless self.status == :stopped
       @status = :playing
       @player_thread = Thread.new do
         while  @status == :playing and !queue.empty?          
           @current = @queue.shift
-          puts "playing #{@current}"
+          logger.log "Playing #{@current}"
           DhunExt.play_file @current
         end
         @status = :stopped
-        puts "Player is stopped"
+        logger.log "Finished playing #{@current}"
+        @current = nil
+      end
+    end
+
+    def pause
+      if @status == :playing
+        @status = :paused
+        DhunExt.pause
+      end
+    end
+
+    def resume
+      if @status == :paused
+        @status = :playing
+        DhunExt.resume
       end
     end
 
     def stop
       @status = :stopped
       @current = nil
-      DhunExt.pause_play
+      DhunExt.stop
       # Wait for @player_thread to exit cleanly
       @player_thread.join unless @player_thread.nil?
     end
@@ -62,5 +81,12 @@ module Dhun
       play # start playing with the next track
       return next_track
     end
+
+    def shuffle
+      return if @queue.empty?
+      s = @queue.size
+      s.downto(1) { |n| @queue.push @queue.delete_at(rand(n)) }
+      logger.debug @queue
+    end
   end
 end

data/lib/dhun/runner.rb

@@ -5,16 +5,16 @@ module Dhun
   # Heavily lifted from Thin codebase
   class Runner
     COMMANDS = %w(start query)
-    CLIENT_COMMANDS = %w(stop play pause resume next enqueue status)
+    CLIENT_COMMANDS = %w(stop play pause resume next enqueue status shuffle)
     # Parsed options
     attr_accessor :options
-    
+
     # Name of the command to be runned.
     attr_accessor :command
-    
+
     # Arguments to be passed to the command.
     attr_accessor :arguments
-    
+
     # Return all available commands
     def self.commands
       commands  = COMMANDS + CLIENT_COMMANDS
@@ -26,7 +26,7 @@ module Dhun
       # Default options values
       @options = {
         :socket => "/tmp/dhun.sock",
-        :pid    => 'tmp/pids/dhun.pid',
+        :default_log       => "/tmp/dhun.log"
       }
       parse!
     end
@@ -37,7 +37,7 @@ module Dhun
       # +option+ keys are used to build the command line to launch other processes,
       # see <tt>lib/dhun/command.rb</tt>.
       @parser ||= OptionParser.new do |opts|
-        opts.banner =  <<-EOF 
+        opts.banner =  <<-EOF
 Usage:
    dhun start
    dhun play spirit
@@ -45,16 +45,25 @@ Usage:
    dhun resume
    dhun enqueue rahman
    dhun status
+   dhun shuffle
    dhun stop
-   
+
    For more details see README at http://github.com/deepakjois/dhun
 EOF
         opts.separator ""
-        opts.separator "Options:"
+        opts.on("-d", "--daemonize", "Run daemonized in the background")                { @options[:daemonize] = true }
+        opts.on("-l", "--log FILE", "File to redirect output " +
+                                      "(default: #{@options[:default_log]})")                   { |file| @options[:log] = file }
+
+        opts.separator "Common options:"
         opts.on_tail("-h", "--help", "Show this message")  { puts opts; exit }
+        opts.on_tail("-D", "--debug", "Set debugging on")                               { @options[:debug] = true }
+        opts.on_tail("-h", "--help", "Show this message")                               { puts opts; exit }
+        opts.on_tail('-v', '--version', "Show version")                                 { puts "Dhun " + Dhun::VERSION; exit }
+
       end
     end
-    
+
     def parse!
       parser.parse! @argv
       @command   = @argv.shift
@@ -64,6 +73,8 @@ EOF
     # Parse the current shell arguments and run the command.
     # Exits on error.
     def run!
+      logger = Logger.instance
+      logger.log_level = :debug if @options[:debug]
       if self.class.commands.include?(@command)
         if CLIENT_COMMANDS.include?(@command)
            unless DhunClient.is_dhun_server_running?(@options[:socket])
@@ -75,7 +86,7 @@ EOF
       elsif @command.nil?
         puts "Command required"
         puts @parser
-        exit 1  
+        exit 1
       else
         abort "Unknown command: #{@command}. Use one of #{self.class.commands.join(', ')}"
       end

data/lib/dhun/server.rb

@@ -1,15 +1,27 @@
 require 'eventmachine'
+require 'daemons'
 module Dhun
   class Server
     
+    attr_reader :logger
+
     def initialize(options)
       @options = options
       @socket = options[:socket]
+      @logger = Logger.instance
       setup_signals
     end
 
     def start
-      puts "Starting Dhun"
+      if @options[:daemonize]
+         logger.log "Starting Dhun"
+        exit if fork
+        Process.setsid
+        log_file = @options[:log] || @options[:default_log]
+        exec("#{ENV['_']} start -l #{log_file} #{@options[:debug] ? "-D" : ""}")
+      end
+      logger.file = @options[:log] if @options[:log]
+      logger.log "Starting Dhun"
       at_exit { remove_socket_file }
       EventMachine::run {
         EventMachine::start_server @socket, DhunServer
@@ -17,12 +29,11 @@ module Dhun
     end
 
     def self.stop
-      puts "Stopping Dhun"
+      Logger.instance.log "Stopping Dhun"
       EventMachine.stop if EventMachine.reactor_running?
       exit
     end
 
-
     protected
     # Register signals:
     # * calls +stop+ to shutdown gracefully.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dhun
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Deepak Jois
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 -08:00
+date: 2009-12-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: daemons
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.10
+    version: 
 description: 
 email: deepak.jois@gmail.com
 executables: 
@@ -41,6 +51,7 @@ extensions:
 extra_rdoc_files: []
 
 files: 
+- FIX.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -59,6 +70,7 @@ files:
 - lib/dhun/dhun_client.rb
 - lib/dhun/dhun_server.rb
 - lib/dhun/handler.rb
+- lib/dhun/logger.rb
 - lib/dhun/player.rb
 - lib/dhun/query.rb
 - lib/dhun/result.rb