dhun 0.7.0 → 0.8.1

data/README.md

@@ -19,7 +19,15 @@ 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
+    
+Or to install the bleeding edge, git pull from the repository and run:
+
+    $ sudo rake gem install
+
+For notifications, you will need [Growl](http://growl.info) installed along
+with the [growlnotify](http://growl.info/documentation/growlnotify.php) tool
+that comes with Growl (but needs to be installed separately).
 
 ### Starting Dhun
 
@@ -44,25 +52,23 @@ You can also query the Spotlight database before playing the files, with the
 
     $ dhun query deadmau5
 
-    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
-    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
-
-
+    Querying: deadmau5 | 6 Results
+    1 : /Volumes/Storage/Music/Grand.Theft.Auto.IV-Radio.Station.Rips-AiTB/Electro-Choc/03 One + One - No Pressure (Deadmau5 Remix).mp3
+    2 : /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
+    3 : Deadmau5 - Alone With You
+    4 : Deadmau5 - Arguru (EDX's 5un5hine Remix)
+    5 : Deadmau5 - Bye Friend
+    6 : Deadmau5 - Clockwork
 
 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
-     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
-
+    Querying: [nil] | artist:Paul van Dyk title:in genre:trance file:Paul
+    3 Results
+    1 : Paul van Dyk - Talk In Grey
+    2 : Paul van Dyk - In Circles
+    3 : Paul van Dyk - In Between
 
 YOu can mix filters with regular queries as well.
 
@@ -70,20 +76,26 @@ YOu can mix filters with regular queries as well.
 
     Querying: paul | title:haunted
     1 Results
-    1 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/01 - Paul van Dyk - Haunted.mp3
+    1 : Paul van Dyk - Haunted
 
 You can also pass in multiple regular expressions too. they just need to be seperated by commas (,)
 
     $ dhun query paul,trance
 
-    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
-    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
-
+    Querying: paul,trance | 13 Results
+    1 : Paul van Dyk - Volume (Productions)
+    2 : Paul van Dyk - Volume (Remixes Part 1)
+    3 : Paul van Dyk - Volume (Remixes Part 2)
+    4 : Paul van Dyk - Complicated (Feat. Ashley Tomberlin)
+    5 : Paul van Dyk - Haunted
+    6 : Paul van Dyk - White Lies (Feat. Jessica Sutta)
+    7 : Paul van Dyk - Sabotage
+    8 : Paul van Dyk - Get Back (Feat. Ashley Tomberlin)
+    9 : Paul van Dyk - Far Away
+    10 : Paul van Dyk - Another Sunday
+    11 : Paul van Dyk - Talk In Grey
+    12 : Paul van Dyk - In Circles
+    13 : Paul van Dyk - In Between
 
 Now lets put it all together and go crazy.
 
@@ -91,8 +103,7 @@ Now lets put it all together and go crazy.
 
     Querying: paul van,dyk | title:haunted genre:trance
     1 Results
-    1 : /Volumes/Storage/Music/Paul van Dyk - In Between (2007)/01 - Paul van Dyk - Haunted.mp3
-
+    1 : Paul van Dyk - Haunted
 
 ### Playing Files
 
@@ -104,13 +115,20 @@ this can also be done by
 
     $ dhun enqueue paul,trance
 
-    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
-    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
+    Querying: paul,trance | 13 Results
+    1 : Paul van Dyk - Volume (Productions)
+    2 : Paul van Dyk - Volume (Remixes Part 1)
+    3 : Paul van Dyk - Volume (Remixes Part 2)
+    4 : Paul van Dyk - Complicated (Feat. Ashley Tomberlin)
+    5 : Paul van Dyk - Haunted
+    6 : Paul van Dyk - White Lies (Feat. Jessica Sutta)
+    7 : Paul van Dyk - Sabotage
+    8 : Paul van Dyk - Get Back (Feat. Ashley Tomberlin)
+    9 : Paul van Dyk - Far Away
+    10 : Paul van Dyk - Another Sunday
+    11 : Paul van Dyk - Talk In Grey
+    12 : Paul van Dyk - In Circles
+    13 : Paul van Dyk - In Between
     Enter index to queue: 
 
 It will prompt you to enter the index of the songs you want queued.(numbers on the left side)
@@ -119,16 +137,14 @@ If you leave the prompt blank and enter, it will queue ALL the resulting songs.
 
     Enter index to queue 4 5
     selected:
-    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
+    1 : Paul van Dyk - Complicated (Feat. Ashley Tomberlin)
+    2 : Paul van Dyk - Haunted
     2 files queued
 
-
 Once queued, the songs will begin playing. You can continue to enqueue more songs using `enqueue` command.
     
 ### Controlling Playback
 
-
 Starting Playback(needs to have songs in queue)
 
     $ dhun play
@@ -169,9 +185,12 @@ 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
+    Queue:
+    1 : Deadmau5 - I Remember (Vocal Mix)
+    2 : Paul van Dyk - Haunted
+    3 : Above & Beyond - I Am What I Am
+    4 : Above & Beyond - Sirens Of The Sea
+    5 : Paul van Dyk - Haunted
 
 ### Other commands
 
@@ -180,22 +199,23 @@ Status
     $ dhun status
     Dhun is running
     Currently Playing:
-    /Volumes/Storage/Music/Hydeout Productions (Second Collection)/02 Sky is Falling (feat. C.L. Smooth).mp3
+    Deadmau5 - I Remember (Vocal Mix)
     Queue:
-    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
+    1 : Paul van Dyk - Haunted
+    2 : Above & Beyond - I Am What I Am
+    3 : Above & Beyond - Sirens Of The Sea
     
 History
 
     $ dhun history
     1 files in history
     History:
-    0 : /Volumes/Storage/Music/Hydeout Productions (Second Collection)/04 Imaginary Folklore.mp3
+    1 : Deadmau5 - I Remember Feat Kaskade (Instrumental Mix)
     
 Saving Playlist
 
     $ dhun save_playlist /tmp/playlist.pls
-    created /tmp/playlist
+    created /tmp/playlist.plsg
     
 Loading Playlist
 
@@ -210,18 +230,13 @@ This will exit the dhun server.
 
     $ dhun stop_server
 
-## Coming Soon
-
-There are some features planned in the short run. Please file an issue with a
-feature request, if you have one.
+## New Features
 
-* Saving/Loading playlists
-* Growl Notifications using `growlnotify`
+Please file an issue with a feature request, if you have one.
 
-And someday..
+These things are planned someday:
 
 * iTunes integration
-* Displaying IDv3 information instead of just file names
 
 ## Feedback
 

data/TODO.md

@@ -1,8 +1,6 @@
 TODO
 ====
 
-* Display info from idv3 tags
-
 * iTunes support
 
 

data/dhun.gemspec

@@ -1,8 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'dhun'
-  s.version = '0.7.0'
+  s.version = '0.8.1'
   s.summary = "Minimalist music player for OS X"
-  s.date = '2010-01-24'
   s.email = 'deepak.jois@gmail.com'
   s.homepage = 'http://github.com/deepakjois/dhun'
   s.has_rdoc = false
@@ -12,6 +11,8 @@ Gem::Specification.new do |s|
   s.add_dependency('json_pure', '>=1.2.0')
   s.add_dependency('daemons', '>=1.0.10')
   s.add_dependency('thor', '>=0.12.0')
+  s.add_dependency('ruby-mp3info','>=0.6.13')
+  s.add_dependency('visionmedia-growl','>=1.0.3')
   s.authors = ["Deepak Jois"]
   # = MANIFEST =
   s.files = %w[

data/lib/dhun.rb

@@ -1,5 +1,5 @@
 module Dhun
-  VERSION = '0.7.0'
+  VERSION = '0.8.1'
 
   autoload :Runner, 'dhun/runner'
   autoload :Server, 'dhun/server'

data/lib/dhun/handler.rb

@@ -90,7 +90,7 @@ module Dhun
     #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 [:success, track] if track
       return [:error, "Not enough tracks in #{message}"]
     end
 

data/lib/dhun/player.rb

@@ -1,8 +1,11 @@
 require 'singleton'
 require 'dhun_ext'
+require 'growl'
+require 'mp3info'
 module Dhun
   class Player
     include Singleton
+    include Growl
 
     attr_accessor :queue,:history,:status,:current
 
@@ -51,6 +54,7 @@ module Dhun
       if @status == :paused
         @status = :playing
         DhunExt.resume
+        notify mp3_tag(@current),:sticky => false
         return true
       end
       return false
@@ -115,11 +119,23 @@ module Dhun
     
     private
     
+    # returns song in Artist - Title format
+    # if no tags or non-existent, return its input
+    # TODO
+    def mp3_tag(song)
+      return song unless File.exists?(song)
+      Mp3Info.open(song) do |mp3| 
+        artist = mp3.tag.artist ; title = mp3.tag.title
+        (artist and title) ? "#{artist} - #{title}" : song
+      end
+    end
+    
     # play method's player thread
     def play_thread
       Thread.new do
         while  @status == :playing and !@queue.empty?
           @current = @queue.shift
+          notify mp3_tag(@current),:sticky => false
           DhunExt.play_file @current
           @history.unshift @current
         end

data/lib/dhun/runner.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'json'
+require 'mp3info'
 
 module Dhun
 
@@ -116,7 +117,7 @@ module Dhun
       response = return_response(:status,[:current,:queue])
       return false unless response
       say "Currently Playing:",:magenta
-      say response[:current],:white
+      say mp3_tag(response[:current]),:white
       say "Queue:",:cyan
       say_list response[:queue]
     end
@@ -160,7 +161,7 @@ module Dhun
       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?
@@ -173,24 +174,24 @@ module Dhun
 
     no_tasks do
 
-      # Writes the queue to the playlist. 
+      # 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
+          say mp3_tag(response[:message]), color
           if keys
             return keys.inject({}) {|base,key| base[key.to_sym] = response[key.to_sym] ; base}
           end
@@ -243,9 +244,21 @@ module Dhun
       # prints out list with each index value
       # in pretty format! (contrasting colors)
       def say_list(list)
+        return "empty" if (list.nil? or list.empty?)
         list.each_with_index do |item,index|
           color = index.even? ? :white : :cyan
-          say("#{index+1} : #{item}",color)
+          say("#{index+1} : #{mp3_tag(item)}",color)
+        end
+      end
+
+      # returns song in Artist - Title format
+      # if no tags or non-existent, return its input
+      def mp3_tag(song)
+        return "" if song.nil?
+        return song unless File.exists?(song)
+        Mp3Info.open(song) do |mp3| 
+          artist = mp3.tag.artist ; title = mp3.tag.title
+          (artist and title) ? "#{artist} - #{title}" : song
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dhun
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Deepak Jois
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 -08:00
+date: 2010-01-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.12.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-mp3info
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.13
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: visionmedia-growl
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.3
+    version: 
 description: 
 email: deepak.jois@gmail.com
 executables: