mr_eko 0.3.3 → 0.3.4

data/lib/mr_eko/core.rb

@@ -4,6 +4,10 @@ module MrEko
     def self.included(base)
       base.send(:include, GlobalHelpers)
       base.extend GlobalHelpers
+
+      # The Sequel timestamps plugin doesn't seem to work, so...
+      def before_create; self.created_on = Time.now.utc; end
+      def before_update; self.updated_on = Time.now.utc; end
     end
 
     module GlobalHelpers

data/lib/mr_eko/song.rb

@@ -45,12 +45,7 @@ class MrEko::Song < Sequel::Model
 
     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)
@@ -60,22 +55,20 @@ class MrEko::Song < Sequel::Model
       song.filename       = File.expand_path(filename)
       song.md5            = md5
       song.code           = fingerprint_json ? fingerprint_json.code : nil
-      song.tempo          = analysis.tempo
-      song.duration       = analysis.duration
-      song.fade_in        = analysis.end_of_fade_in
-      song.fade_out       = analysis.start_of_fade_out
-      song.key            = analysis.key
-      song.mode           = analysis.mode
-      song.loudness       = analysis.loudness
-      song.time_signature = analysis.time_signature
+      song.tempo          = profile.audio_summary.tempo
+      song.duration       = profile.audio_summary.duration
+      song.key            = profile.audio_summary.key
+      song.mode           = profile.audio_summary.mode
+      song.loudness       = profile.audio_summary.loudness
+      song.time_signature = profile.audio_summary.time_signature
       song.echonest_id    = profile.id
-      song.bitrate        = profile.bitrate
+      song.bitrate        = fingerprint_json ? fingerprint_json.metadata.bitrate : nil
       song.title          = profile.title
       song.artist         = profile.artist || profile.artist_name
       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 if analysis && profile
+      song.danceability   = profile.audio_summary.danceability
+      song.energy         = profile.audio_summary.energy
+    end
   end
 
   # Parses the file's ID3 tags and converts and strange encoding.

data/lib/mr_eko/timed_playlist.rb

@@ -95,7 +95,7 @@ class MrEko::TimedPlaylist
   end
 
   # XXX Just sketching this part out at the moment...
-  # needs tests (and complete logic!)
+  # needs tests and to work with attributes other than tempo!
   def find_songs
     step_count, step_length = step_map[:tempo]
     return unless step_count && step_length
@@ -107,27 +107,32 @@ class MrEko::TimedPlaylist
     songs_to_examine_per_step = step_count > all_songs.size ? 1 : all_songs.size / step_count
 
     overall_seconds_used = 0
-    all_songs.each_slice(songs_to_examine_per_step).each do |songs|
+    all_songs.each_slice(songs_to_examine_per_step).each do |step_songs|
       break if overall_seconds_used >= @length
 
       song_length_proximity = 0
-      length_map = songs.inject({}) do |hsh, song|
+      length_map = step_songs.inject({}) do |hsh, song|
         song_length_proximity = (song.duration - step_length).abs
         hsh[song_length_proximity] = song
         hsh
       end
 
       step_seconds_used = 0
+      song_set = []
       length_map.sort_by{ |key, song| key }.each do |length, song|
-        @songs << song
+        song_set << song
         step_seconds_used += song.duration
         overall_seconds_used += song.duration
         break if step_seconds_used >= step_length
       end
 
+      # Make sure the songs are added the required order as they have been
+      # sorted by duration and thus may be in an odd order.
+      song_set = direction == :asc ? song_set.sort_by(&:tempo) : song_set.sort_by(&:tempo).reverse
+      @songs = @songs + song_set
     end
     # Might need to make a cluster map here instead of just choosing enough
-    # songs to fulfill the step_length.  This is because the over
+    # songs to fulfill the step_length.  This is because the
     # Playlist#length can be fulfilled even before we reach the target/final
     # target.  I think a better rule would be to pluck a song having the
     # initial and final values and then try to evenly spread out the remaining

data/lib/mr_eko.rb

@@ -19,7 +19,7 @@ EKO_ENV = ENV['EKO_ENV'] || 'development'
 Sequel.default_timezone = :utc
 
 module MrEko
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
   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.3'
+  s.version           = '0.3.4'
   s.date              = '2011-12-02'
   s.rubyforge_project = 'mr_eko'
 

data/test/song_test.rb

@@ -1,3 +1,4 @@
+require 'ostruct'
 class SongTest < Test::Unit::TestCase
 
   TEST_MP3 = File.join(File.dirname(__FILE__), 'data', 'they_want_a_test.mp3')
@@ -24,6 +25,16 @@ class SongTest < Test::Unit::TestCase
     Hashie::Mash.new(opts)
   end
 
+  def song_identify_stub
+    Hashie::Mash.new(:artist_id => "ARZQYSZ1187FB3AC39", :artist_name => "Sebastian",
+                     :id => "SOEQMAC12A6701D920", :message => "OK (match type 6)", :score =>57, :tag => 0, :title => "Ross Ross Ross",
+                     :audio_summary => Hashie::Mash.new(:analysis_url => "url", :audio_md5 => "fb592e1fa581a8ad0b0478a45130e9e0",
+                                                        :danceability => 0.265574327869162, :duration =>1223,
+                                                        :energy => 0.732951527606216, :key => 11, :loudness =>-10.328,
+                                                        :mode => 0, :tempo => 137.538, :time_signature =>1)
+                    )
+  end
+
   def setup
     MrEko::Song.delete
   end
@@ -67,7 +78,7 @@ class SongTest < Test::Unit::TestCase
 
     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.expects(:get_datapoints_by_upload).with(TEST_MP3).returns([stub_everything, stub_everything(:audio_summary => stub_everything, :id => 'yu82')])
       MrEko::Song.catalog_via_enmfp(TEST_MP3)
     end
 
@@ -78,36 +89,13 @@ class SongTest < Test::Unit::TestCase
     end
 
     should 'try to upload when no songs are returned from the Song#identify call' do
-      stub_data = enmfp_data_stub
-      empty_profile_stub = stub(:songs => [])
-      id_opts = {
-        :code    => stub_data.raw_data,
-        :artist  => stub_data.metadata.artist,
-        :title   => stub_data.metadata.title,
-        :release => stub_data.metadata.release,
-        :bucket  => 'audio_summary'
-      }
-      MrEko::Song.stubs(:enmfp_data).returns(stub_data)
-      Echonest::ApiMethods::Song.any_instance.expects(:identify).with(id_opts).returns(empty_profile_stub)
-      MrEko::Song.expects(:get_datapoints_by_upload).returns([stub_everything, stub_everything(:id => 'whatever')])
+      MrEko::Song.stubs(:enmfp_data).returns(enmfp_data_stub)
+      MrEko::Song.expects(:identify_from_enmfp_data).with(enmfp_data_stub).raises(MrEko::Song::EnmfpError.new("no songs"))
+      MrEko::Song.expects(:get_datapoints_by_upload).returns([stub_everything, stub_everything(:audio_summary => stub_everything, :id => 'yu82')])
+
       MrEko::Song.catalog_via_enmfp(TEST_MP3)
     end
 
-    should 'try to get the profile data when a song is returned from the Song#identify call' do
-      stub_data = enmfp_data_stub
-      profile_stub = stub(:songs => [stub_everything(:id => 'FJJ299KLOP')])
-      profile_details_stub = stub(:songs => [stub(:audio_summary => stub_everything)])
-
-      MrEko::Song.stubs(:enmfp_data).returns(stub_data)
-      Echonest::ApiMethods::Song.any_instance.expects(:identify).returns(profile_stub)
-      Echonest::ApiMethods::Song.any_instance.expects(:profile).with(:id => 'FJJ299KLOP', :bucket => 'audio_summary').returns(profile_details_stub)
-      MrEko::Song.expects(:get_datapoints_by_upload).never
-
-
-      assert_difference 'MrEko::Song.count' do
-        MrEko::Song.catalog_via_enmfp(TEST_MP3)
-      end
-    end
   end
 
   context 'catalog_via_tags' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mr_eko
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Ed Hickey