mr_eko 0.3.2 → 0.3.3

data/Rakefile

@@ -155,8 +155,7 @@ end
 
 desc 'Launch an IRB console'
 task :console do
-  libs = "-rlib/mr_eko -rirb/completion -rruby-debug"
-  exec "irb #{libs}"
+  exec "bundle console"
 end
 
 namespace :db do

data/lib/mr_eko/playlist.rb

@@ -17,15 +17,14 @@ class MrEko::Playlist < Sequel::Model
     # TODO: Is a name (or persisting) even necessary?
     MrEko.connection.transaction do
       pl = create(:name => options.delete(:name) || "Playlist #{rand(10000)}")
-      options = prepare_options(options)
 
+      filter = apply_filters prepare_options(options)
+      songs = filter.all
 
-      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
@@ -44,7 +43,7 @@ class MrEko::Playlist < Sequel::Model
 
         case key
 
-        when :danceability, :energy, :loudness
+        when :danceability, :energy
           new_options << transform(key, value, true)
 
         when :mode
@@ -94,6 +93,13 @@ class MrEko::Playlist < Sequel::Model
   end
 
 
+  # Recursively add Sequel where clauses
+  def self.apply_filters(options, filtered=nil)
+    filtered = (filtered || MrEko::Song).where(options.pop)
+    filtered = apply_filters(options, filtered) unless options.empty?
+    filtered
+  end
+
   # Returns a text representation of the Playlist.
   def create_text
     songs.inject("") do |list, song|

data/lib/mr_eko/song.rb

@@ -36,42 +36,30 @@ class MrEko::Song < Sequel::Model
   # @param [String] location of the audio file
   # @param [Hash] opts
   # @option opts [String] :md5 pre-calculated MD5 of file
-  # @return [MrEko::Song] the created Song
+  # @return [MrEko::Song, NilClass] the created Song
   def self.catalog_via_enmfp(filename, opts={})
+    return if file_too_big? filename
+
     md5 = opts[:md5] || MrEko.md5(filename)
-    fingerprint_json = enmfp_data(filename, md5)
-
-    if fingerprint_json.keys.include?('error')
-      raise EnmfpError, "Errors returned in the ENMFP fingerprint data: #{fingerprint_json.error.inspect}"
-    else
-      begin
-        log "Identifying with ENMFP code"
-
-        identify_options = {}.tap do |opts|
-          opts[:code]    = fingerprint_json.raw_data
-          opts[:artist]  = fingerprint_json.metadata.artist
-          opts[:title]   = fingerprint_json.metadata.title
-          opts[:release] = fingerprint_json.metadata.release
-          opts[:bucket]  = 'audio_summary'
-        end
-
-        profile = MrEko.nest.song.identify(identify_options)
-
-        raise EnmfpError, "Nothing returned" if profile.songs.empty?
-        profile = profile.songs.first
-
-        # Get the extended audio data from the profile
-        analysis = MrEko.nest.song.profile(:id => profile.id, :bucket => 'audio_summary').songs.first.audio_summary
-      rescue Exception => e
-        log %Q{Issues using ENMFP data "(#{e})" #{e.backtrace.join("\n")}}
-        analysis, profile = get_datapoints_by_upload(filename)
-      end
+    log "Identifying with ENMFP code #{filename}"
+
+    begin
+      fingerprint_json = enmfp_data(filename, md5)
+
+      profile = identify_from_enmfp_data(fingerprint_json)
+
+      # Get the extended audio data from the profile
+      analysis = MrEko.nest.song.profile(:id => profile.id, :bucket => 'audio_summary').songs.first.audio_summary
+
+    rescue EnmfpError => e
+      log %Q{Issues using ENMFP data "(#{e})" #{e.backtrace.join("\n")}}
+      analysis, profile = get_datapoints_by_upload(filename)
     end
 
     create do |song|
       song.filename       = File.expand_path(filename)
       song.md5            = md5
-      song.code           = fingerprint_json.code
+      song.code           = fingerprint_json ? fingerprint_json.code : nil
       song.tempo          = analysis.tempo
       song.duration       = analysis.duration
       song.fade_in        = analysis.end_of_fade_in
@@ -84,10 +72,10 @@ class MrEko::Song < Sequel::Model
       song.bitrate        = profile.bitrate
       song.title          = profile.title
       song.artist         = profile.artist || profile.artist_name
-      song.album          = profile.release
+      song.album          = fingerprint_json ? fingerprint_json.metadata.release : profile.release
       song.danceability   = profile.audio_summary? ? profile.audio_summary.danceability : analysis.danceability
       song.energy         = profile.audio_summary? ? profile.audio_summary.energy       : analysis.energy
-    end
+    end if analysis && profile
   end
 
   # Parses the file's ID3 tags and converts and strange encoding.
@@ -110,10 +98,17 @@ class MrEko::Song < Sequel::Model
     return unless has_required_tags? tags
 
     md5 = opts[:md5] || MrEko.md5(filename)
-    analysis = MrEko.nest.song.search(:artist => tags.artist,
-                                      :title => tags.title,
-                                      :bucket => 'audio_summary',
-                                      :limit => 1).songs.first
+    begin
+      analysis = MrEko.nest.song.search(:artist => tags.artist,
+                                        :title => tags.title,
+                                        :bucket => 'audio_summary',
+                                        :limit => 1).songs.first
+    rescue => e
+      log "BAD TAGS? #{tags.artist} - #{tags.title} - #{filename}"
+      log e.message
+      log e.backtrace.join("\n")
+      return
+    end
 
     create do |song|
       song.filename       = File.expand_path(filename)
@@ -155,13 +150,23 @@ class MrEko::Song < Sequel::Model
   # @return [Hash] data from the ENMFP process
   def self.enmfp_data(filename, md5)
     unless File.exists?(fp_location(md5))
-      log 'Running ENMFP'
+      log 'Waiting for ENMFP binary...'
       `#{File.join(MrEko::HOME_DIR, 'ext', 'enmfp', MrEko.enmfp_binary)} "#{File.expand_path(filename)}" > #{fp_location(md5)}`
     end
 
-    raw_json = File.read fp_location(md5)
-    hash = Hashie::Mash.new(JSON.parse(raw_json).first)
-    hash.raw_data = raw_json
+    begin
+      raw_json = File.read fp_location(md5)
+      hash = Hashie::Mash.new(JSON.parse(raw_json).first)
+      hash.raw_data = raw_json
+
+      if hash.keys.include?('error')
+        raise EnmfpError, "Errors returned in the ENMFP fingerprint data: #{hash.error.inspect}"
+      end
+
+    rescue JSON::ParserError => e
+      raise EnmfpError, e.message
+    end
+
     hash
   end
 
@@ -188,6 +193,31 @@ class MrEko::Song < Sequel::Model
     self.md5 ||= MrEko.md5(filename)
   end
 
+  # Is the song over a sane limit for uploading and ENMFP?
+  #
+  # @param [String] filename
+  # @return [Boolean]
+  def self.file_too_big?(file)
+    File.size(file)/1024/1024 > 50
+  end
+
+  # @param [Hash]
+  # @return [Hashie, EnmfpError] EN song API result
+  def self.identify_from_enmfp_data(json)
+    identify_options = {}.tap do |opts|
+      opts[:code]    = json.raw_data
+      opts[:artist]  = json.metadata.artist
+      opts[:title]   = json.metadata.title
+      opts[:release] = json.metadata.release
+      opts[:bucket]  = 'audio_summary'
+    end
+
+    profile = MrEko.nest.song.identify(identify_options)
+    raise EnmfpError, "Nothing returned from song/identify API call" if profile.songs.empty?
+
+    profile.songs.first
+  end
+
   # Return the file path of the EN fingerprint JSON file
   #
   # @param [String] MD5 hash of the file

data/lib/mr_eko/timed_playlist.rb

@@ -102,7 +102,7 @@ class MrEko::TimedPlaylist
     direction = step_count > 0 ? :asc : :desc
     sorted_tempos = [attributes[:initial][:tempo], attributes[:final][:tempo]].sort
     tempo_range = Range.new(*sorted_tempos)
-    all_songs = MrEko::Song.where(:tempo => tempo_range).order("tempo #{direction}".lit).all
+    all_songs = MrEko::Song.where({:tempo => tempo_range} & ~{:duration => nil}).order("tempo #{direction}".lit).all
 
     songs_to_examine_per_step = step_count > all_songs.size ? 1 : all_songs.size / step_count
 

data/lib/mr_eko.rb

@@ -19,7 +19,7 @@ EKO_ENV = ENV['EKO_ENV'] || 'development'
 Sequel.default_timezone = :utc
 
 module MrEko
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
   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,8 +13,8 @@ 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.2'
-  s.date              = '2011-11-30'
+  s.version           = '0.3.3'
+  s.date              = '2011-12-02'
   s.rubyforge_project = 'mr_eko'
 
   ## Make sure your summary is short. The description may be as long
@@ -60,6 +60,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('test-unit', "~> 2.1")
   s.add_development_dependency("ruby-debug")
   s.add_development_dependency("autotest")
+  s.add_development_dependency("pry")
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE

data/test/playlist_test.rb

@@ -31,11 +31,6 @@ class PlaylistTest < Test::Unit::TestCase
       assert_equal @playlist_count + 1, MrEko::Playlist.count
     end
 
-    should "filter out certain options before querying for songs" do
-      unfiltered_options = {:name => "Rock You in Your Face mix #{rand(1000)}", :time_signature => 4}
-      MrEko::Song.expects(:where).with(Not(has_key(:name))).once.returns(sequel_dataset_stub)
-      assert_raise(MrEko::Playlist::NoSongsError){ MrEko::Playlist.create_from_options(unfiltered_options) }
-    end
   end
 
   context 'output' do
@@ -96,7 +91,7 @@ class PlaylistTest < Test::Unit::TestCase
       end
 
       context "percentage values" do
-        [:loudness, :energy, :danceability].each do |attribute|
+        [:energy, :danceability].each do |attribute|
           should "translate #{attribute} into decimal form" do
             transformed = MrEko::Playlist.prepare_options({attribute => 32})
             assert_equal( {attribute => 0.32}, transformed.last )

data/test/song_test.rb

@@ -65,9 +65,16 @@ class SongTest < Test::Unit::TestCase
 
   context 'catalog_via_enmfp' do
 
-    should 'raise an error if the ENMFP fingerprint contains errors' do
-      MrEko::Song.stubs(:enmfp_data).returns(enmfp_data_stub('error' => 'BOOM'))
-      assert_raise(MrEko::Song::EnmfpError){ MrEko::Song.catalog_via_enmfp(TEST_MP3) }
+    should 'try uploading if the ENMFP fingerprint contains errors' do
+      MrEko::Song.stubs(:enmfp_data).raises(MrEko::Song::EnmfpError)
+      MrEko::Song.expects(:get_datapoints_by_upload).once.with(TEST_MP3).returns([])
+      MrEko::Song.catalog_via_enmfp(TEST_MP3)
+    end
+
+    should 'return nil when the file is too big' do
+      MrEko::Song.stubs(:file_too_big?).returns(true)
+      MrEko.nest.song.expects(:identify).never
+      assert_nil MrEko::Song.catalog_via_enmfp(TEST_MP3)
     end
 
     should 'try to upload when no songs are returned from the Song#identify call' do

data/test/timed_playlist_test.rb

@@ -57,7 +57,7 @@ class TimedPlaylistTest < Test::Unit::TestCase
       assert !list.step_map.empty?
     end
 
-    should 'increase the step length to 4.minutes if value is less that that' do
+    should 'increase the step length to 4.minutes if value is less than that' do
       list = MrEko::TimedPlaylist.new(:length => 300) do |pl|
         pl.initial(:tempo, 60)
         pl.final(:tempo, 80)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mr_eko
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Ed Hickey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2011-12-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sequel
@@ -194,6 +194,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: pry
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id013
 description: Catalogs music file data and exposes a playlist interface
 email: bassnode@gmail.com
 executables: