songbirdsh 0.0.1 → 0.0.2

data/HISTORY.rdoc

@@ -0,0 +1,13 @@
+= 0.0.2
+
+Enhanced search
+
+* Improved search (breaks string into terms and returns tracks with all terms)
+* Adds search results to clipboard to make it fast and easy to enqueue
+
+= 0.0.1
+
+Initial release
+
+* Plays tracks
+* Searches database (pretty unusable - searches by substring of 'artist album track')

data/gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = 'songbirdsh'
-  spec.version = '0.0.1'
+  spec.version = '0.0.2'
   spec.summary = 'command line jukebox music player'
   spec.description = <<-EOF
 A command line jukebox music player that uses your songbird music player database
@@ -8,7 +8,7 @@ EOF
   spec.authors << 'Mark Ryall'
   spec.email = 'mark@ryall.name'
   spec.homepage = 'http://github.com/markryall/songbirdsh'
-  spec.files = Dir['lib/**/*'] + Dir['bin/*'] + ['README.rdoc', 'MIT-LICENSE', 'gemspec']
+  spec.files = Dir['lib/**/*'] + Dir['bin/*'] + ['README.rdoc', 'HISTORY.rdoc','MIT-LICENSE', 'gemspec']
   spec.executables << 'songbirdsh'
 
   spec.add_dependency 'splat', '~>0.1'
@@ -19,4 +19,4 @@ EOF
 
   spec.add_development_dependency 'rake', '~>0.8.7'
   spec.add_development_dependency 'gemesis', '~>0.0.4'
-end
+end

data/lib/songbirdsh/cli.rb

@@ -18,15 +18,15 @@ class Songbirdsh::Cli
     library = Songbirdsh::Library.new
     player = Songbirdsh::Player.new library
     at_exit { player.stop }
-    @prompt_text = "sbsh > "
+    @prompt = "songbirdsh > "
     @commands = {
       'show' => Songbirdsh::Command::ShowProperties.new(library),
-      '+' => Songbirdsh::Command::Enqueue.new(library),
-      'start' => Songbirdsh::Command::Start.new(player),
-      'stop' => Songbirdsh::Command::Stop.new(player),
       'next' => Songbirdsh::Command::Restart.new(player),
       'reload' => Songbirdsh::Command::Reload.new(library),
-      'search' => Songbirdsh::Command::Search.new(library)
+      'search' => Songbirdsh::Command::Search.new(library),
+      '+' => Songbirdsh::Command::Enqueue.new(player),
+      'start' => Songbirdsh::Command::Start.new(player),
+      'stop' => Songbirdsh::Command::Stop.new(player)
     }
   end
 end

data/lib/songbirdsh/command/enqueue.rb

@@ -1,16 +1,11 @@
 require 'yaml'
 
 class Songbirdsh::Command::Enqueue
-  def initialize library
-    @library = library
+  def initialize player
+    @player = player
   end
 
   def execute text
-    ids = text.split(/\W/)
-    @library.with_db do |db|
-      ids.each do |id|
-        File.open("#{Time.now.to_i}-#{(rand*1000).to_i}.song", 'w') {|f| f.print db[:media_items][:media_item_id=>id].to_yaml }
-      end
-    end
+    text.split(/\W/).each {|id| @player.enqueue id }
   end
 end

data/lib/songbirdsh/command/search.rb

@@ -4,8 +4,16 @@ class Songbirdsh::Command::Search
   end
 
   def execute text
+    terms = text.split(/\W/)
+    matches = []
+    @library.reload unless @library.tracks
     @library.tracks.each do |track|
-      puts track[:display] if track[:search_string].include? text
+      if terms.all? {|term| track[:search_string].include? term }
+        puts track[:display]
+        matches << track[:id]
+      end
     end
+    puts "Found #{matches.size} matches (ids have been placed on clipboard)"
+    matches.join(' ').to_clipboard
   end
 end

data/lib/songbirdsh/queue.rb

@@ -1,7 +1,7 @@
 module Songbirdsh::Queue
   def enqueue id
-    with_db do |db|
-      File.open("#{Time.now.to_i}-#{(rand*1000).to_i}.song", 'w') {|f| f.print db[:media_items][:media_item_id=>id].to_yaml }
+    @library.with_db do |db|
+      File.open("#{Time.now.to_i}-#{id}.song", 'w') {|f| f.print db[:media_items][:media_item_id=>id].to_yaml }
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Mark Ryall
@@ -141,6 +141,7 @@ files:
 - lib/songbirdsh.rb
 - bin/songbirdsh
 - README.rdoc
+- HISTORY.rdoc
 - MIT-LICENSE
 - gemspec
 has_rdoc: true