mr_eko 0.2.4.1 → 0.3.0

data/Gemfile

@@ -1,5 +1,4 @@
 source "http://rubygems.org"
 
-gem "ruby-echonest", :git => "http://github.com/bassnode/ruby-echonest.git"
-#gem "ruby-echonest", :path => "../ruby-echonest"
+# gem "bassnode-ruby-echonest", :path => "../ruby-echonest"
 gemspec

data/README.md

@@ -7,8 +7,8 @@ Example:
     # Scan all your music
     mreko scan ~/Music/*.mp3
 
-    # Output a PLS playlist of mid-tempo, minor-key music
-    mreko playlist --min-tempo 100 --max-tempo 120 --mode minor --format pls > rainy_day_suicidal_playlist.pls
+    # Output a PLS playlist of fast, minor-key music
+    mreko playlist --tempo '>120' --mode minor --format pls > rainy_day_suicidal_playlist.pls
 
     # Output a playlist of shorter,  up-tempo, danceable, major-keyed songs
     mreko playlist --preset gym --format pls > sweaty_playlist.pls

data/Rakefile

@@ -63,7 +63,7 @@ task :coverage do
   sh "open coverage/index.html"
 end
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "#{name} #{version}"
@@ -155,7 +155,7 @@ end
 
 desc 'Launch an IRB console'
 task :console do
-  libs = "-rlib/mr_eko -rirb/completion"
+  libs = "-rlib/mr_eko -rirb/completion -rruby-debug"
   exec "irb #{libs}"
 end
 

data/TODO

@@ -1 +1,2 @@
 * Figure out how to get FFMPEG included in gem (possible w/ licensing?)
+* Create a 'setup' routine that migrates the DB, creates the ~/.mr_eko dir, etc.  Doing it every time mr_eko runs is lame.

data/bin/mreko

@@ -21,23 +21,31 @@ def parse_options
       options[:preset] = preset
     end
 
-    opts.on("-m", "--min-tempo BPM", Integer, "Specify minimum tempo") do |bpm|
-      options[:min_tempo] = bpm
+    opts.on("-t", "--tempo BPM", "Specify tempo") do |bpm|
+      options[:tempo] = bpm
     end
 
-    opts.on("-M", "--max-tempo BPM", Integer, "Specify maximum tempo") do |bpm|
-      options[:max_tempo] = bpm
+    opts.on("-s", "--time-sig SIG", Integer, "Specify time signature") do |ts|
+      options[:time_signature] = ts
     end
 
-    opts.on("-t", "--time-sig SIG", Integer, "Specify time signature") do |ts|
-      options[:time_signature] = ts
+    opts.on("-l", "--duration SEC", "Specify song length (in seconds)") do |sec|
+      options[:duration] = sec
+    end
+
+    opts.on("-d", "--danceability NUM", "Specify danceability (from 1 to 100)") do |num|
+      options[:danceability] = num
     end
 
-    opts.on("-l", "--max-length SEC", Integer, "Specify maximum song length (in seconds)") do |sec|
-      options[:max_duration] = sec
+    opts.on("-e", "--energy NUM", "Specify energy (from 1 to 100)") do |num|
+      options[:energy] = num
     end
 
-    opts.on("-d", "--mode MODE", String, "Specify mode (minor or major)") do |mode|
+    opts.on("-w", "--loudness NUM", "Specify loudness (from 1 to 100)") do |num|
+      options[:loudness] = num
+    end
+
+    opts.on("-o", "--mode MODE", String, "Specify mode (minor or major)") do |mode|
       unless MrEko::MODES.include?(mode)
         raise ArgumentError.new("Mode must be #{MrEko::MODES.join(' or ')}")
       end
@@ -52,36 +60,34 @@ def parse_options
       options[:format] = format
     end
 
+    opts.on("-x", "--tags-only", "Only perform lookups using ID3 tags (no analyzing)") do
+      options[:tags_only] = true
+    end
 
     opts.separator ""
     opts.separator "Common options:"
 
     # No argument, shows at tail.  This will print an options summary.
-    # Try it and see!
     opts.on_tail("-h", "--help", "Show this message") do
       puts opts
       exit
     end
 
-    # Another typical switch to print the version.
-    # opts.on_tail("--version", "Show version") do
-    #   puts OptionParser::Version.join('.')
-    #   exit
-    # end
   end.parse!
 
   options
 end
 
 
+options = parse_options
+
 case ARGV[0]
 when 'scan'
   ARGV.shift
   ARGV.each do |file|
-    MrEko::Song.create_from_file!(file)
+    MrEko::Song.create_from_file!(file, options)
   end
 when 'playlist'
-  options = parse_options
   format = options.delete(:format)
   playlist = MrEko::Playlist.create_from_options(options)
   puts playlist.output(format)

data/ext/enmfp/README

@@ -10,7 +10,9 @@ Read more:
 http://notes.variogr.am/post/544559482/the-echo-nest-musical-fingerprint-enmfp
 http://developer.echonest.com/docs/v4/song.html#identify
 
-The ENMFP is a musical fingerprint that uses portions of the Echo Nest Analyze "machine listening" toolkit to extract musical features that allow copies of songs to be identified. This allows you to resolve an unknown song against a database of songs. The Echo Nest currently maintains the only song database compatible with ENMFP codes, however, the design of the service is such that anyone can run and maintain a mirror of the code database to avoid "lock in" to a specific vendor.
+The ENMFP is a musical fingerprint that uses portions of the Echo Nest Analyze "machine listening" toolkit to extract musical features that allow copies of songs to be identified.
+This allows you to resolve an unknown song against a database of songs. The Echo Nest currently maintains the only song database compatible with ENMFP codes, however, the design
+of the service is such that anyone can run and maintain a mirror of the code database to avoid "lock in" to a specific vendor.
 
 The ENMFP is robust to time and pitch modification, is resilient to drastic reductions in fidelity and can even detect uses of audio in remixes, samples and sometimes even cover songs. 
 
@@ -18,14 +20,18 @@ You only need to query for 20 seconds of audio (or less sometimes) to get a resu
 
 The server component of the ENMFP is open source and will be released shortly.
 
-The code generator component of the ENMFP is under the Echo Nest Community Music Code License, which allows free use for all applications provided that the codes are queried for and sent to an authorized server. The authorized servers mirror with each other to share all data. 
+The code generator component of the ENMFP is under the Echo Nest Community Music Code License, which allows free use for all applications provided that the codes are queried for
+and sent to an authorized server. The authorized servers mirror with each other to share all data. 
 
-There are two ways to use the code generator: link the provided shared libraries with your application and pass it pointers to PCM data from songs, or use a precompiled binary that accepts a filename as an argument and outputs JSON suitable for querying the ENFMP servers.
+There are two ways to use the code generator: link the provided shared libraries with your application and pass it pointers to PCM data from songs, or use a precompiled binary that accepts
+a filename as an argument and outputs JSON suitable for querying the ENFMP servers.
 
 
 ###### Dynamic library -- libcodegen
 
-The package contains binary libraries for Linux (i686 and x86_64), Mac (10.6 only) and Windows. You can compile these libraries into your app to generate codes suitable for querying the ENMFP API based on PCM data. See test.cxx for a very simple test program that links with libcodegen. Put libcodegen somewhere that LD_LIBRARY_PATH knows about and compile the test program:
+The package contains binary libraries for Linux (i686 and x86_64), Mac (10.6 only) and Windows. You can compile these libraries into your app to generate codes suitable for querying
+the ENMFP API based on PCM data. See test.cxx for a very simple test program that links with libcodegen. Put libcodegen somewhere that LD_LIBRARY_PATH knows about and compile the test
+program:
 
 (this is an example for Linux i686, for other platforms change the library name accordingly)
 
@@ -55,14 +61,18 @@ Code generation takes a buffer of floating point PCM data sampled at 22050 Hz an
 
 Codegen * pCodegen = new Codegen(_pSamples, _NumberSamples, offset);
 
-the "offset" parameter creates a hint to the server on where the sample is taken from in the original file. If you know this (for example, if you are automatically scanning a large library of audio, choosing specific 20 seconds chunks of audio) the server will use this information but it is not required.
+the "offset" parameter creates a hint to the server on where the sample is taken from in the original file. If you know this (for example, if you are automatically scanning a
+large library of audio, choosing specific 20 seconds chunks of audio) the server will use this information but it is not required.
 
-After compute, you want to call pCodegen->getCodeString() to get the code string. (The code string is just a base64 encoding of a zlib compression of the original code string, which is a series of ASCII numbers.)
+After compute, you want to call pCodegen->getCodeString() to get the code string. (The code string is just a base64 encoding of a zlib compression of the original code string,
+which is a series of ASCII numbers.)
 
 
 ###### Example code generator
 
-This package also contains an example code generator binary for all 3 platforms (Mac 10.6/10.5, Windows, Linux 64-bit & 32-bit.) This code generator has more features -- it will output ID3 tag information and uses ffmpeg to decode any type of file. If you don't need to compile libcodegen into your app you can rely on this. Note that you need to have ffmpeg installed and accessible on your path for this to work.
+This package also contains an example code generator binary for all 3 platforms (Mac 10.5/10.6/10.7, Windows, Linux 64-bit & 32-bit.) This code generator has
+more features -- it will output ID3 tag information and uses ffmpeg to decode any type of file. If you don't need to compile libcodegen into your app you can
+rely on this. Note that you need to have ffmpeg installed and accessible on your path for this to work. You will also need taglib installed.
 
 ./codegen.Linux-x86_64 billie_jean.mp3 10 10
 
@@ -72,7 +82,7 @@ Will take 10 seconds of audio from 10 seconds into the file and output JSON suit
 "sample_rate":44100, "seconds":294, "filename":"billie_jean.mp3", "samples_decoded":220598, "given_duration":10, "start_offset":10, 
 "version":3.14}, "code_count":76, "codes":"JxVlIuNwzAMQ1fxCDL133+xo1rnGqNAEcWy/ERa2aKeZmW...
 
-You can POST this JSON directly to alpha_identify_song, for example:
+You can POST this JSON directly to song/identify, for example:
 
 # curl -F "query=@post_string" http://beta.developer.echonest.com/api/v4/song/identify?api_key=YOUR_KEY
 {"fp_lookup_time_ms": 21, "results": [{"songID": "SOAFVGQ1280ED4E371", "match_type": "fp", "title": "Billie Jean", "artist": "Michael Jackson", 
@@ -84,13 +94,15 @@ You can POST this JSON directly to alpha_identify_song, for example:
 
 Q: I get "Couldn't decode any samples with: ffmpeg" when running the example code generator.
 
-A1: When running the example code generator (codegen.$(PLATFORM)) make sure ffmpeg is accessible to your path. Try running ffmpeg filename.mp3 on the file you are testing the code generator with. If it doesn't work, codegen won't work.
+A1: When running the example code generator (codegen.$(PLATFORM)) make sure ffmpeg is accessible to your path. Try running ffmpeg filename.mp3 on the file you are
+testing the code generator with. If it doesn't work, codegen won't work.
 
-A2: Are you trying to decode billie.raw with the example code generator? billie.raw is only for test.cxx; it is just packed PCM, not a playable file. It is meant to illustrate how to use libcodegen.
+A2: Are you trying to decode billie.raw with the example code generator? billie.raw is only for test.cxx; it is just packed PCM, not a playable file. It is meant to
+illustrate how to use libcodegen.
 
 
 ###### Questions, comments
 
-Send to enmfp@googlecode.com
+Send to echoprint@googlegroups.com
 
 

data/ext/enmfp/RELEASE_NOTES

@@ -29,6 +29,6 @@ Fixed memory leak in FFT routine
 Use Accelerate on iOS 4
 "Too few events detected" no longer throws exception but returns empty codestring
 
-
-
-
+3.16 Aug 18 2011
+Compile without debug symbols
+OSX version is now 32/64bit fat binary, compatible with OSX 10.5-up

data/lib/mr_eko/ext/numeric.rb

@@ -0,0 +1,11 @@
+class Numeric
+
+  def in_minutes
+    self.to_f / 60
+  end
+
+  def minutes
+    self.to_f * 60
+  end
+
+end

data/lib/mr_eko/ext/object.rb

@@ -0,0 +1,5 @@
+class Object
+  def blank?
+    self.nil? || self.size == 0
+  end
+end

data/lib/mr_eko/playlist.rb

@@ -7,50 +7,59 @@ class MrEko::Playlist < Sequel::Model
 
   plugin :validation_helpers
   many_to_many :songs
-  FORMATS = [:pls, :m3u, :text]
+  FORMATS = [:pls, :m3u, :text].freeze
+  DEFAULT_OPTIONS = [ {:tempo => 0..500}, {:duration => 10..1200} ].freeze
+
 
   # Creates and returns a new Playlist from the passed <tt>options</tt>.
   # <tt>options</tt> should be finder options you pass to Song plus (optionally) :name.
   def self.create_from_options(options)
     # TODO: Is a name (or persisting) even necessary?
-    pl = create(:name => options.delete(:name) || "Playlist #{rand(10000)}")
-    prepare_options!(options)
-
-    songs = MrEko::Song.where(options).all
-    if songs.size > 0
-      songs.each{ |song| pl.add_song(song) }
-      pl.save
-    else
-      pl.delete # TODO: Look into not creating Playlist in the 1st place
-      raise NoSongsError.new("No songs match that criteria!")
+    MrEko.connection.transaction do
+      pl = create(:name => options.delete(:name) || "Playlist #{rand(10000)}")
+      options = prepare_options(options)
+
+
+      songs = MrEko::Song.where(options).all
+      if songs.size > 0
+        songs.each{ |song| pl.add_song(song) }
+        pl.save
+      else
+        # pl.delete # TODO: Look into not creating Playlist in the 1st place
+        raise NoSongsError.new("No songs match those criteria!")
+      end
     end
   end
 
   # Organize and transform!
-  def self.prepare_options!(options)
+  def self.prepare_options(options)
+
     if preset = options.delete(:preset)
-      options.replace load_preset(preset)
+      new_options = load_preset(preset)
     else
-      unless options[:tempo].is_a? Range
-        min_tempo = options.delete(:min_tempo) || 0
-        max_tempo = options.delete(:max_tempo) || 500
-        options[:tempo] = min_tempo..max_tempo
-      end
 
-      unless options[:duration].is_a? Range
-        min_duration = options.delete(:min_duration) || 10 # worthless jams
-        max_duration = options.delete(:max_duration) || 1200 # 20 min.
-        options[:duration] = min_duration..max_duration
-      end
+      new_options = DEFAULT_OPTIONS.reject{ |d| options.keys.include?(d.keys.first) }
 
-      if options.has_key?(:mode)
-        options[:mode] = MrEko.mode_lookup(options[:mode])
-      end
+      options.each do |key, value|
+
+        case key
+
+        when :danceability, :energy, :loudness
+          new_options << transform(key, value, true)
+
+        when :mode
+          new_options << transform(key, MrEko.mode_lookup(value))
 
-      if options.has_key?(:key)
-        options[:key] = MrEko.key_lookup(options[:key])
+        when :key
+          new_options << transform(key, MrEko.key_lookup(value))
+
+        else
+          new_options << transform(key, value)
+        end
       end
     end
+
+    new_options
   end
 
   # Return the formatted playlist.
@@ -59,15 +68,32 @@ class MrEko::Playlist < Sequel::Model
     raise ArgumentError.new("Format must be one of #{FORMATS.join(', ')}") unless FORMATS.include? format
 
     case format
-    when :pls
-      create_pls
+    when :text
+      create_text
     when :m3u
       create_m3u
     else
-     create_text
+     create_pls
+    end
+  end
+
+  private
+
+  def self.transform(key, value, percentage=false)
+    if match = value.to_s.match(/(^[<>])(\d+)/)
+      operator = match[1]
+      value = match[2]
+
+      value = value.to_f / 100.0 if percentage
+
+      "#{key} #{operator} #{value}".lit
+    else
+      value = value.to_f / 100.0 if percentage
+      {key => value}
     end
   end
 
+
   # Returns a text representation of the Playlist.
   def create_text
     songs.inject("") do |list, song|

data/lib/mr_eko/presets.rb

@@ -1,18 +1,18 @@
 module MrEko::Presets
   FACTORY = {
-    :gym => {
+    :gym => [
       :tempo    => 125..300, # sweat, sweat, sweat!
       :mode     => 'major',  # bring the HappyHappy
       :duration => 180..300,  # shorter, poppier tunes
       :energy   => 0.5..1.0,
       :danceability => 0.4..1.0
-    },
-    :chill => {
+  ],
+    :chill => [
       :tempo    => 60..120,  # mellow
       :duration => 180..600, # bring the epic, long-players
       :energy   => 0.2..0.5,
       :danceability => 0.1..0.5
-    }
+  ]
   }
 
   module ClassMethods