mr_eko 0.6.0 → 0.6.1

data/README.md

@@ -11,10 +11,10 @@ Example:
     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
+    mreko playlist --tempo '>120' --mode minor > 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
+    mreko playlist --preset gym > sweaty_playlist.pls
 
     # Output a 30 minute playlist which builds from tempo 120 to 185 BPM. See notes on TimedPlaylists below.
     mreko playlist --timed 1800 --tempo 120 --final 185 > morning_commute.pls

data/lib/mr_eko/song.rb

@@ -72,14 +72,14 @@ class MrEko::Song < Sequel::Model
     end
   end
 
-  # Parses the file's ID3 tags and converts and strange encoding.
+  # Parses the file's ID3 tags
   #
   # @param [String] The file path
-  # @return [ID3Lib::Tag]
+  # @return [MrEko::TagParser::Result]
   def self.parse_id3_tags(filename)
     log "Parsing ID3 tags"
 
-    clean_tags ID3Lib::Tag.new(filename, ID3Lib::V_ALL)
+    MrEko::TagParser.parse(filename)
   end
 
 
@@ -89,7 +89,8 @@ class MrEko::Song < Sequel::Model
   # @return [MrEko::Song]
   def self.catalog_via_tags(filename, opts={})
     tags = parse_id3_tags(filename)
-    return unless has_required_tags? tags
+
+    return unless tags.reject{ |k, v| v.blank? }.size >= REQUIRED_ID3_TAGS.size
 
     md5 = opts[:md5] || MrEko.md5(filename)
     begin
@@ -98,7 +99,7 @@ class MrEko::Song < Sequel::Model
                                         :bucket => 'audio_summary',
                                         :limit => 1).songs.first
     rescue => e
-      log "BAD TAGS? #{tags.artist} - #{tags.title} - #{filename}"
+      log "BAD TAGS? #{tags.inspect} #{filename}"
       log e.message
       log e.backtrace.join("\n")
       return
@@ -126,13 +127,6 @@ class MrEko::Song < Sequel::Model
     end if analysis
   end
 
-  def self.has_required_tags?(tags)
-    found = REQUIRED_ID3_TAGS.inject([]) do |present, meth|
-      present << tags.send(meth)
-    end
-
-    found.compact.size == REQUIRED_ID3_TAGS.size ? true : false
-  end
 
   # Using the Echonest Musical Fingerprint lib in the hopes
   # of sidestepping the mp3 upload process.
@@ -218,21 +212,4 @@ class MrEko::Song < Sequel::Model
     File.expand_path File.join(MrEko::FINGERPRINTS_DIR, "#{md5}.json")
   end
 
-  # @param [Array<ID3Lib::Tag>]
-  # @return [Array<ID3Lib::Tag>]
-  def self.clean_tags(tags)
-
-    (REQUIRED_ID3_TAGS + [:album]).each do |rt|
-      tag = tags.send(rt).to_s
-      if tag.encoding != Encoding::UTF_8
-        decoded = tag.encode
-      else
-        decoded = tag
-      end
-
-      tags.send("#{rt}=", decoded)
-    end
-
-    tags
-  end
 end

data/lib/mr_eko/tag_parser.rb

@@ -0,0 +1,22 @@
+class MrEko::TagParser
+
+  def self.parse(filename)
+    TagLib::FileRef.open(filename, false) do |file|
+      tag = file.tag
+      result = Result.new
+      result.artist = tag.artist
+      result.title = tag.title
+      result.album = tag.album
+
+      result
+    end
+
+  end
+
+  class Result < Hash
+    include Hashie::Extensions::MethodAccess
+    include Hashie::Extensions::IndifferentAccess
+  end
+
+end
+

data/lib/mr_eko.rb

@@ -9,7 +9,7 @@ require 'sequel/extensions/migration'
 require "logger"
 require "hashie"
 require "digest/md5"
-require 'id3lib'
+require 'taglib'
 require "echonest"
 begin
   require 'debugger'
@@ -22,7 +22,7 @@ EKO_ENV = ENV['EKO_ENV'] || 'development'
 Sequel.default_timezone = :utc
 
 module MrEko
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
   USER_DIR = File.join(ENV['HOME'], ".mreko")
   FINGERPRINTS_DIR = File.join(USER_DIR, 'fingerprints')
   LOG_DIR = File.join(USER_DIR, 'logs')
@@ -144,3 +144,4 @@ require "mr_eko/playlist"
 require "mr_eko/timed_playlist"
 require "mr_eko/song"
 require "mr_eko/playlist_entry"
+require "mr_eko/tag_parser"

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.6.0'
+  s.version           = '0.6.1'
   s.date              = '2013-08-13'
   s.rubyforge_project = 'mr_eko'
 
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   s.add_dependency('httpclient', "~> 2.1")
   s.add_dependency('bassnode-ruby-echonest')
   s.add_dependency('json', "= 1.4.6")
-  s.add_dependency('id3lib-ruby')
+  s.add_dependency('taglib-ruby')
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
@@ -101,13 +101,16 @@ Gem::Specification.new do |s|
     lib/mr_eko/playlist_entry.rb
     lib/mr_eko/presets.rb
     lib/mr_eko/song.rb
+    lib/mr_eko/tag_parser.rb
     lib/mr_eko/timed_playlist.rb
     mr_eko.gemspec
     test/data/tagless.mp3
     test/data/they_want_a_test.mp3
+    test/data/unicode.mp3
     test/mr_eko_test.rb
     test/playlist_test.rb
     test/song_test.rb
+    test/tag_parser_test.rb
     test/test.rb
     test/timed_playlist_test.rb
   ]

data/test/song_test.rb

@@ -1,9 +1,6 @@
 require 'ostruct'
 class SongTest < Test::Unit::TestCase
 
-  TEST_MP3 = File.join(File.dirname(__FILE__), 'data', 'they_want_a_test.mp3')
-  TAGLESS_MP3 = File.join(File.dirname(__FILE__), 'data', 'tagless.mp3')
-
   def enmfp_data_stub(overrides={})
     opts = {
       'code'         => '98ouhajsnd081oi2he0da8sdoihjasdi2y9e8aASD3e8yaushdjQWD',
@@ -100,12 +97,12 @@ class SongTest < Test::Unit::TestCase
 
   context 'catalog_via_tags' do
 
-    context 'for a mp3 with no useful tag information' do
+    context 'for a mp3 with no ID3 tag information' do
 
       setup do
         @mp3 = MrEko::Song.parse_id3_tags(TAGLESS_MP3)
-        assert_empty @mp3.artist
-        assert_empty @mp3.title
+        assert_nil @mp3.artist
+        assert_nil @mp3.title
       end
 
       should 'return nil' do
@@ -132,25 +129,4 @@ class SongTest < Test::Unit::TestCase
     end
   end
 
-  context 'cleaning encoded ID3 tags' do
-
-    should "decode iTunes' encoded tags" do
-      dm = 'Dead Meadow'.encode(Encoding::UCS_2BE, Encoding::UTF_8)
-      tag_stub = OpenStruct.new(:artist => dm, :title => 'Good Moaning')
-      ID3Lib::Tag.expects(:new).once.returns(tag_stub)
-      parsed_tags = MrEko::Song.parse_id3_tags(TEST_MP3)
-
-      assert_equal "Dead Meadow", parsed_tags.artist
-    end
-
-    should "not alter the tags when they aren't encoded" do
-      tag_stub = OpenStruct.new(:artist => 'Dead Meadow', :title => 'Good Moaning')
-      ID3Lib::Tag.expects(:new).once.returns(tag_stub)
-
-      parsed = MrEko::Song.parse_id3_tags(TEST_MP3)
-
-      assert_equal parsed.artist, 'Dead Meadow'
-      assert_equal parsed.title, 'Good Moaning'
-    end
-  end
 end

data/test/tag_parser_test.rb

@@ -0,0 +1,21 @@
+class TagParserTest < Test::Unit::TestCase
+
+  context 'parse' do
+
+    should 'return an abject with the tags' do
+      parser = MrEko::TagParser.parse(TEST_MP3)
+
+      assert_equal 'Swamp Rooters', parser.artist
+      assert_equal 'Swamp Cat Rag', parser.title
+      assert_equal 'Misc', parser.album
+    end
+
+    should 'handles files without tags' do
+      parser = MrEko::TagParser.parse(TAGLESS_MP3)
+
+      assert_nil parser.artist
+      assert_nil parser.title
+      assert_nil parser.album
+    end
+  end
+end

data/test/test.rb

@@ -13,6 +13,11 @@ end
 
 class Test::Unit::TestCase
 
+  TEST_MP3 = File.join(File.dirname(__FILE__), 'data', 'they_want_a_test.mp3')
+  TAGLESS_MP3 = File.join(File.dirname(__FILE__), 'data', 'tagless.mp3')
+  UNICODE_MP3 = File.join(File.dirname(__FILE__), 'data', 'unicode.mp3')
+
+
   # Could be fleshed out some more.
   def sequel_dataset_stub
     data = mock()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr_eko
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.6
 - !ruby/object:Gem::Dependency
-  name: id3lib-ruby
+  name: taglib-ruby
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -276,13 +276,16 @@ files:
 - lib/mr_eko/playlist_entry.rb
 - lib/mr_eko/presets.rb
 - lib/mr_eko/song.rb
+- lib/mr_eko/tag_parser.rb
 - lib/mr_eko/timed_playlist.rb
 - mr_eko.gemspec
 - test/data/tagless.mp3
 - test/data/they_want_a_test.mp3
+- test/data/unicode.mp3
 - test/mr_eko_test.rb
 - test/playlist_test.rb
 - test/song_test.rb
+- test/tag_parser_test.rb
 - test/test.rb
 - test/timed_playlist_test.rb
 homepage: http://github.com/bassnode/mreko
@@ -300,7 +303,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2527726127632796201
+      hash: -723694834172722563
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: