hearken 0.0.3 → 0.0.4

data/HISTORY.rdoc

@@ -1,6 +1,12 @@
-= next
+= 0.0.4
 
-* Fixed bug in setup_scrobbling command
+* Partially fixed bug with growl (correctly escaping characters in message)
+* moved all configuration, queues and index to a .hearken directory
+
+= 0.0.3
+
+* Fixed bug in setup_scrobbling command (using $stdin directly - 'gets' seems to have been aliased by thor)
+* Added growl notification
 
 = 0.0.2
 

data/README.rdoc

@@ -46,5 +46,6 @@ will describe the use and purpose of a particular command
 
 = Future plans for world domination
 
+* Fix or remove 'recent' - it should sort library based on file modification date
 * Get working on linux
 * Get working on windows

data/lib/hearken.rb

@@ -1,3 +1,3 @@
 module Hearken
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/hearken/console.rb

@@ -28,7 +28,7 @@ module Hearken
       with :show_properties, 'show'
       with :restart, 'next'
       with :enqueue, '+'
-      with_all *%w{reload search start stop scrobbling shuffle list setup_scrobbling recent flush}
+      with_all *%w{reload search start stop scrobbling shuffle list setup_scrobbling recent flush }
     end
   end
 end

data/lib/hearken/indexing.rb

@@ -1,6 +1,5 @@
 module Hearken
   module Indexing
-    PATH = File.expand_path('~')+'/.music'
   end
 end
 

data/lib/hearken/indexing/executor.rb

@@ -1,14 +1,5 @@
 require 'hearken/tagged'
-
-class String
-  def escape char
-    gsub(char, "\\#{char}")
-  end
-
-  def escape2 char
-    split(char).join("\\#{char}")
-  end
-end
+require 'hearken/monkey_violence'
 
 module Hearken::Indexing::Executor
   include Hearken::Tagged
@@ -18,10 +9,6 @@ module Hearken::Indexing::Executor
     @timestamp = path.timestamp
   end
 
-  def clean_path path
-    path.escape(" ").escape2("'").escape("!").escape2("`").escape("(").escape(")").escape2("&").escape2(";")
-  end
-
   def execute command
     debug command
     `#{command} 2>&1`

data/lib/hearken/indexing/ffmpeg_file.rb

@@ -1,11 +1,12 @@
 require 'hearken/indexing/executor'
+require 'hearken/monkey_violence'
 
 class Hearken::Indexing::FfmpegFile
   include Hearken::Indexing::Executor
 
   def initialize path
     extract_file_attributes path
-    content = execute "ffmpeg -i #{clean_path @path}"
+    content = execute "ffmpeg -i #{@path.escape_for_sh}"
     state = :draining
     @meta = {}
     content.each_line do |line|

data/lib/hearken/indexing/indexer.rb

@@ -1,15 +1,19 @@
 require 'splat'
+require 'hearken/paths'
 require 'hearken/indexing/persistant_traverser'
 
 class Hearken::Indexing::Indexer
+  include Hearken::Paths
+
   def initialize path
+    create_paths
     @path = path
   end
 
   def execute
     start = Time.now
     count = 0
-    traverser = Hearken::Indexing::PersistantTraverser.new @path, Hearken::Indexing::PATH
+    traverser = Hearken::Indexing::PersistantTraverser.new @path, index_path
 
     traverser.each do |audio_file|
       count += 1

data/lib/hearken/library.rb

@@ -1,6 +1,9 @@
 require 'hearken/track'
+require 'hearken/paths'
 
 class Hearken::Library
+  include Hearken::Paths
+
   FILE_FIELDS = %w{path timestamp}
   TAG_FIELDS = %w{album track title artist time date albumartist puid mbartistid mbalbumid mbalbumartistid asin}
   FIELDS = FILE_FIELDS + TAG_FIELDS
@@ -9,6 +12,7 @@ class Hearken::Library
   attr_reader :tracks
 
   def initialize preferences
+    create_paths
   end
 
   def count
@@ -28,10 +32,8 @@ class Hearken::Library
   end
 
   def reload
-    s = Time.now.to_i
-    path = File.expand_path('~')+'/.music'
     @tracks = []
-    File.open path do |file|
+    File.open index_path do |file|
       id = 0
       while line = file.gets
         row = line.chomp.split '<->'
@@ -40,7 +42,6 @@ class Hearken::Library
         @tracks << track
         id += 1
       end
-    end if File.exist? path
-    puts "Reloaded db with #{@tracks.size} tracks in #{Time.now.to_i-s} seconds"
+    end if File.exist? index_path
   end
 end

data/lib/hearken/monkey_violence.rb

@@ -0,0 +1,21 @@
+class String
+  def from_home
+    File.expand_path('~')+'/'+self
+  end
+
+  def escape char
+    gsub(char, "\\#{char}")
+  end
+
+  def escape2 char
+    split(char).join("\\#{char}")
+  end
+
+  def escape_for_sh
+    self.escape2("\`").escape(" ").escape2("&").escape2(";").escape("!").escape("(").escape(")").escape2("'")
+  end
+
+  def escape_for_sh_quoted
+    self.escape2("\`")
+  end
+end

data/lib/hearken/notification/growl_notifier.rb

@@ -1,3 +1,5 @@
+require 'hearken/monkey_violence'
+
 module Hearken::Notification
 end
 
@@ -8,6 +10,6 @@ class Hearken::Notification::GrowlNotifier
   end
 
   def started track
-    `growlnotify -t "Hearken" --image #{@image_path} -m '#{track.to_short_s}'` if @growlnotify
+    `growlnotify -t "Hearken unto ..." --image #{@image_path} -m \"#{track.to_short_s.escape_for_sh_quoted}\"` if @growlnotify
   end
 end

data/lib/hearken/paths.rb

@@ -0,0 +1,19 @@
+require 'fileutils'
+
+module Hearken::Paths
+  attr_reader :preferences_path, :queue_path, :index_path
+
+  def create_paths
+    @preferences_path = '.hearken/config'.from_home
+    @queue_path = '.hearken/queue'.from_home
+    @index_path = '.hearken/music'.from_home
+    FileUtils.mv '.hearken'.from_home, '.hearken.tmp'.from_home if File.exist?('.hearken'.from_home) && File.file?('.hearken'.from_home)
+    FileUtils.mkdir_p '.hearken/queue'.from_home
+    FileUtils.mv '.hearken.tmp'.from_home, @preferences_path if File.exist? '.hearken.tmp'.from_home
+    FileUtils.mv '.music'.from_home, @index_path if File.exist? '.music'.from_home
+  end
+
+  def in_queue_dir
+    Dir.chdir(queue_path) { yield }
+  end
+end

data/lib/hearken/player.rb

@@ -1,4 +1,5 @@
 require 'splat'
+require 'fileutils'
 
 require 'hearken/queue'
 require 'hearken/scrobbler'
@@ -17,6 +18,7 @@ module Hearken
       @notifiers = [@scrobbler, @growl]
       @library = Library.new preferences
       @library.reload
+      create_paths
     end
 
     def c text,colour
@@ -79,7 +81,7 @@ module Hearken
           @library.with_track(id) do |track|
             notify_started track
             register track
-            player_pid = path.to_player
+            player_pid = path.escape2("\`").to_player
             Process.wait player_pid
             notify_finished track
           end

data/lib/hearken/preferences.rb

@@ -1,18 +1,19 @@
+require 'hearken/paths'
+require 'hearken/monkey_violence'
+
 module Hearken
   class Preferences
+    include Hearken::Paths
+
     def initialize
-      @preference_path = home_path '.hearken'
-      if File.exists? @preference_path
-        @preferences = YAML.load File.read(@preference_path)
+      create_paths
+      if File.exists? preferences_path
+        @preferences = YAML.load_file preferences_path
       else
         @preferences = {}
       end
     end
 
-    def home_path *paths
-      File.join File.expand_path('~'), *paths
-    end
-
     def [] key
       @preferences[key]
     end
@@ -23,7 +24,7 @@ module Hearken
     end
 
     def persist
-      File.open(@preference_path, 'w') {|f| f.puts @preferences.to_yaml}
+      File.open(preferences_path, 'w') {|f| f.puts @preferences.to_yaml}
     end
   end
 end

data/lib/hearken/queue.rb

@@ -1,23 +1,31 @@
-module Hearken
-  module Queue
-    def enqueue id
+require 'hearken/paths'
+
+module Hearken::Queue
+  include Hearken::Paths
+
+  def enqueue id
+    in_queue_dir do 
       @sequence ||= 0
       @library.with_track id do |track|
         File.open("#{Time.now.to_i}-#{@sequence.to_s.rjust(8,'0')}.song", 'w') {|f| f.print track.to_yaml }
         @sequence += 1
       end
     end
+  end
 
-    def each
+  def each
+    in_queue_dir do
       Dir.glob('*.song').sort.each do |file|
-        yield YAML.load File.read(file)
+        yield YAML.load_file file
       end
     end
+  end
 
-    def dequeue
+  def dequeue
+    in_queue_dir do
       file = Dir.glob('*.song').sort.first
       return nil unless file
-      hash = YAML.load(File.read(file))
+      hash = YAML.load_file file
       id = hash[:id] if hash
       FileUtils.rm file
       id

data/spec/hearken/player_spec.rb

@@ -11,6 +11,7 @@ describe Hearken::Player do
     Hearken::Scrobbler.stub!(:new).and_return scrobbler
     Hearken::Library.stub!(:new).and_return library
     library.stub! :reload
+    scrobbler.stub! :enabled=
   end
 
   describe '#current' do

metadata

@@ -2,7 +2,7 @@
 name: hearken
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Mark Ryall
@@ -155,7 +155,9 @@ files:
 - lib/hearken/indexing/persistant_traverser.rb
 - lib/hearken/indexing/persisted_traverser.rb
 - lib/hearken/library.rb
+- lib/hearken/monkey_violence.rb
 - lib/hearken/notification/growl_notifier.rb
+- lib/hearken/paths.rb
 - lib/hearken/player.rb
 - lib/hearken/preferences.rb
 - lib/hearken/queue.rb