LOLastfm 0.0.3 → 0.0.3.1

data/bin/LOLastfm-send

@@ -79,9 +79,9 @@ else
 	if options[:now_playing]
 		client.send_command :now_playing, options[:song]
 	elsif options[:love]
-		client.send_command :love, options[:song].empty? ? (options[:current] ? :current : nil) : options[:song]
+		client.send_command :love, (options[:song].empty? ? (options[:current] ? :current : nil) : options[:song])
 	elsif options[:unlove]
-		client.send_command :unlove, options[:song].empty? ? (options[:current] ? :current : nil) : options[:song]
+		client.send_command :unlove, (options[:song].empty? ? (options[:current] ? :current : nil) : options[:song])
 	else
 		client.send_command :listened, options[:song]
 	end

data/lib/LOLastfm/checkers/moc.rb

@@ -43,6 +43,8 @@ LOLastfm.define_checker :moc do
 	create = proc {
 		unless moc = Moc::Controller.new(settings[:socket]) rescue false
 			set_timeout settings[:every], &create unless stopped?
+
+			next
 		end
 
 		Thread.new {
@@ -88,6 +90,16 @@ LOLastfm.define_checker :moc do
 				$stderr.puts e.backtrace
 			end
 
+			if song.stream?
+				listened song
+			else
+				if LOLastfm::Song.is_scrobblable?(position, song.length)
+					listened song
+				else
+					stopped_playing!
+				end
+			end
+
 			set_timeout settings[:every], &create unless stopped?
 		}
 	}

data/lib/LOLastfm/version.rb

@@ -10,6 +10,6 @@
 
 class LOLastfm
 	def self.version
-		'0.0.3'
+		'0.0.3.1'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: LOLastfm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lastfm