LOLastfm 0.0.3.5 → 0.0.3.6

data/lib/LOLastfm.rb

@@ -263,7 +263,9 @@ class LOLastfm
 	end
 
 	def use (*args, &block)
-		return if args.empty? && !block
+		if args.empty? && !block
+			raise ArgumentError, 'no name or block given'
+		end
 
 		unless args.first.respond_to?(:to_hash) || block
 			name = args.shift.to_sym
@@ -276,7 +278,9 @@ class LOLastfm
 				rescue LoadError; end
 			end
 
-			block = self.class.checkers[name]
+			unless block = self.class.checkers[name]
+				raise ArgumentError, "#{name} checker could not be found"
+			end
 		end
 
 		if @checker

data/lib/LOLastfm/song.rb

@@ -8,7 +8,7 @@
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 #++
 
-require 'taglib'
+require 'taglib2'
 require 'json'
 require 'yaml'
 require 'date'
@@ -69,45 +69,19 @@ class Song
 	def fill!
 		return if !@path || (@track && @title && @album && @artist && @comment && @length && @id)
 
-		TagLib::FileRef.open(@path) {|f|
-			if f.tag
-				@track   = f.tag.track && f.tag.track.to_i unless @track
-				@title   = f.tag.title unless @title
-				@album   = f.tag.album unless @album
-				@artist  = f.tag.artist unless @artist
-				@comment = f.tag.comment unless @comment
-			end
-
-			if f.audio_properties
-				@length = f.audio_properties.length.to_i unless @length
-			end
-		}
-
-		unless @id
-			TagLib::MPEG::File.new(@path).tap {|file|
-				next unless tag = file.id3v2_tag
-
-				if ufid = tag.frame_list('UFID').find { |u| u.owner == 'http://musicbrainz.org' }
-					@id = ufid.identifier
-				end
-			}
-		end
-
-		unless @id
-			TagLib::FLAC::File.new(@path).tap {|file|
-				next unless tag = file.xiph_comment
-
-				@id = tag.field_list_map['MUSICBRAINZ_TRACKID']
-			}
-		end
+		TagLib::File.new(@path).tap {|f|
+			@track   = f.track && f.track.to_i if f.track && !@track
+			@title   = f.title if f.title && !@title
+			@album   = f.album if f.album && !@album
+			@artist  = f.artist if f.artist && !@artist
+			@comment = f.comment if f.comment && !@comment
 
-		unless @id
-			TagLib::Ogg::Vorbis::File.new(@path).tap {|file|
-				next unless tag = file.tag
+			begin
+				@length = f.length.to_i if f.length && !@length
+			rescue TagLib::BadAudioProperties; end
 
-				@id = tag.field_list_map['MUSICBRAINZ_TRACKID']
-			}
-		end
+			f.close
+		}
 	end
 
 	def stream?; !!@stream;      end

data/lib/LOLastfm/version.rb

@@ -10,6 +10,6 @@
 
 class LOLastfm
 	def self.version
-		'0.0.3.5'
+		'0.0.3.6'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: LOLastfm
 version: !ruby/object:Gem::Version
-  version: 0.0.3.5
+  version: 0.0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine