mr_eko 0.3.1 → 0.3.2

data/README.md

@@ -4,8 +4,11 @@ MrEko analyzes your music and lets you ask him in-depth questions about it.  He
 
 Example:
 --------
-    # Scan all your music
-    mreko scan ~/Music/*.mp3
+    # Scan a directory, recursively:
+    mreko scan ~/Music/iTunes
+
+    # Scan a set of files
+    mreko scan jakob-semaphore.mp3 pelican-drought.mp3
 
     # Output a PLS playlist of fast, minor-key music
     mreko playlist --tempo '>120' --mode minor --format pls > rainy_day_suicidal_playlist.pls
@@ -16,7 +19,7 @@ Example:
 Requirements:
 -------------
 * [ffmpeg](http://www.ffmpeg.org/download.htmlr) in your path.
-* an [Echonest API token](http://developer.echonest.com/) which goes here: ~/.mr_eko/echonest_api.key
+* an [Echonest API token](http://developer.echonest.com/) which goes here: ~/.mreko/echonest_api.key
 
 Notes:
 ------

data/bin/mreko

@@ -13,10 +13,11 @@ def parse_options
   options = { :format => :text }
 
   OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} [options]"
+    opts.banner = "Usage: #{$0} scan|playlist [options]"
 
     opts.separator ""
-    opts.separator "Specific options:"
+    opts.separator "Playlist options:"
+
     opts.on("-p", "--preset NAME", String, "Select a preset.  Options are (#{MrEko::Presets::FACTORY.keys.join(', ')})") do |preset|
       options[:preset] = preset
     end
@@ -65,7 +66,6 @@ def parse_options
     end
 
     opts.separator ""
-    opts.separator "Common options:"
 
     # No argument, shows at tail.  This will print an options summary.
     opts.on_tail("-h", "--help", "Show this message") do
@@ -84,7 +84,17 @@ options = parse_options
 case ARGV[0]
 when 'scan'
   ARGV.shift
-  ARGV.each do |file|
+
+  files = ARGV.map do |arg|
+    if File.directory?(arg)
+      Dir.glob("#{arg}/**/*.mp3")
+    else
+      File.expand_path arg
+    end
+  end.flatten
+
+  puts "Found #{files.length} MP3s to process..."
+  files.each do |file|
     MrEko::Song.create_from_file!(file, options)
   end
 when 'playlist'

data/lib/mr_eko/song.rb

@@ -196,8 +196,8 @@ class MrEko::Song < Sequel::Model
     File.expand_path File.join(MrEko::FINGERPRINTS_DIR, "#{md5}.json")
   end
 
-  # @param [ID3Lib::Tag]
-  # @return [ID3Lib::Tag]
+  # @param [Array<ID3Lib::Tag>]
+  # @return [Array<ID3Lib::Tag>]
   def self.clean_tags(tags)
     ic = Iconv.new("utf-8", "ucs-2")
 

data/lib/mr_eko.rb

@@ -19,7 +19,7 @@ EKO_ENV = ENV['EKO_ENV'] || 'development'
 Sequel.default_timezone = :utc
 
 module MrEko
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
   USER_DIR = File.join(ENV['HOME'], ".mreko")
   FINGERPRINTS_DIR = File.join(USER_DIR, 'fingerprints')
   LOG_DIR = File.join(USER_DIR, 'logs')

data/mr_eko.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'mr_eko'
-  s.version           = '0.3.1'
+  s.version           = '0.3.2'
   s.date              = '2011-11-30'
   s.rubyforge_project = 'mr_eko'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mr_eko
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Ed Hickey