LOLastfm 0.0.3.3 → 0.0.3.5

data/LOLastfm.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new {|s|
 	s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 	s.require_paths = ['lib']
 
+	s.add_dependency 'eventmachine'
 	s.add_dependency 'lastfm'
 	s.add_dependency 'taglib-ruby'
 }

data/bin/LOLastfm

@@ -28,8 +28,7 @@ EM.run {
 	d.start
 
 	EM.error_handler {|e|
-		$stderr.puts e.message
-		$stderr.puts e.backtrace
+		d.log e
 	}
 
 	%w[INT KILL].each {|sig|

data/lib/LOLastfm.rb

@@ -53,6 +53,8 @@ class LOLastfm
 	def start
 		return if started?
 
+		@started = true
+
 		@server = if @host && @port
 			EM.start_server(host, port, LOLastfm::Connection) {|conn|
 				conn.fm = self
@@ -78,6 +80,8 @@ class LOLastfm
 		EM.cancel_timer @timer
 
 		@checker.stop if @checker
+
+		@started = false
 	ensure
 		save
 	end
@@ -113,19 +117,16 @@ class LOLastfm
 
 	def log (what, group = nil)
 		io = StringIO.new
-
-		io.print "[#{Time.now}#{" (#{group})" if group}] "
+		io.print "[#{Time.now}#{", #{group}" if group}] "
 
 		if what.is_a? Exception
 			io.puts "#{what.class.name}: #{what.message}"
-			io.puts e.backtrace
+			io.puts what.backtrace
 		else
 			io.puts what
 		end
 
-		io.seek 0
-
-		io.read.tap {|text|
+		io.string.tap {|text|
 			$stderr.puts text
 
 			File.open(@logs_at, 'a') { |f| f.print text }
@@ -179,6 +180,8 @@ class LOLastfm
 
 	def listened! (song)
 		@session.track.scrobble(song.artist, song.title, song.listened_at.to_time.to_i, song.album, song.track, song.id, song.length)
+	rescue SystemCallError, SocketError, EOFError
+		false
 	rescue Exception => e
 		log e, :listened
 
@@ -204,6 +207,8 @@ class LOLastfm
 
 	def love! (song)
 		@session.track.love(song.artist, song.title)
+	rescue SystemCallError, SocketError, EOFError
+		false
 	rescue Exception => e
 		log e, :love
 
@@ -229,6 +234,8 @@ class LOLastfm
 
 	def unlove! (song)
 		@session.track.unlove(song.artist, song.title)
+	rescue SystemCallError, SocketError, EOFError
+		false
 	rescue Exception => e
 		log e, :unlove
 
@@ -262,7 +269,7 @@ class LOLastfm
 			name = args.shift.to_sym
 
 			if args.first.is_a? String
-				require args.pop
+				require args.shift
 			elsif !self.class.checkers[name]
 				begin
 					require "LOLastfm/checkers/#{name}"

data/lib/LOLastfm/cache.rb

@@ -24,19 +24,19 @@ class Cache
 	end
 
 	def listened (song)
-		return if song.nil? || @listened.member?(song)
+		return if song.nil?
 
 		@listened << song
 	end
 
 	def love (song)
-		return if song.nil? || @loved.member?(song)
+		return if song.nil?
 
 		@loved << song
 	end
 
 	def unlove (song)
-		return if song.nil? || @unloved.member?(song)
+		return if song.nil?
 
 		@unloved << song
 	end
@@ -47,19 +47,19 @@ class Cache
 
 	def flush!
 		until @listened.empty?
-			break unless fm.listened! Song.new(@listened.first)
+			break unless fm.listened! @listened.first
 
 			@listened.shift
 		end
 
 		until @loved.empty?
-			break unless fm.love! Song.new(@loved.first)
+			break unless fm.love! @loved.first
 
 			@loved.shift
 		end
 
 		until @unloved.empty?
-			break unless fm.unlove! Song.new(@unloved.first)
+			break unless fm.unlove! @unloved.first
 
 			@unloved.shift
 		end

data/lib/LOLastfm/checker.rb

@@ -87,13 +87,17 @@ class Checker
 
 	def set_timeout (*args, &block)
 		EM.schedule {
-			@timers << EM.add_timer(*args, &block)
+			EM.add_timer(*args, &block).tap {|timer|
+				@timers << timer
+			}
 		}
 	end
 
 	def set_interval (*args, &block)
 		EM.schedule {
-			@timers << EM.add_periodic_timer(*args, &block)
+			EM.add_periodic_timer(*args, &block).tap {|timer|
+				@timers << timer
+			}
 		}
 	end
 
@@ -102,6 +106,8 @@ class Checker
 			EM.cancel_timer(what)
 		}
 	end
+
+	alias clear_interval clear_timeout
 end
 
 end

data/lib/LOLastfm/checkers/cmus.rb

@@ -29,8 +29,8 @@ end
 
 LOLastfm.define_checker :cmus do
 	settings.default[:socket]  = '~/.cmus/socket'
-	settings.default[:every]   = 5
 	settings.default[:timeout] = 0.005
+	settings.default[:every]   = 5
 
 	if @cmus = Cmus::Controller.new(settings[:socket], settings[:timeout]) rescue false
 		@last = @cmus.status
@@ -41,12 +41,9 @@ LOLastfm.define_checker :cmus do
 	end
 
 	set_interval settings[:every] do
-		unless @cmus
-			@cmus = Cmus::Controller.new(settings[:socket], settings[:timeout]) rescue next
-			@last = @cmus.status
-		end
+		next unless @cmus = Cmus::Controller.new(settings[:socket], settings[:timeout]) rescue false
 
-		unless status = @cmus.status rescue nil
+		unless status = @cmus.status rescue false
 			@cmus = nil
 			next
 		end

data/lib/LOLastfm/checkers/moc.rb

@@ -41,61 +41,61 @@ LOLastfm.define_checker :moc do
 	settings.default[:every]  = 5
 
 	create = proc {
-		unless moc = Moc::Controller.new(settings[:socket]) rescue false
+		unless @moc = Moc::Controller.new(settings[:socket]) rescue false
 			set_timeout settings[:every], &create unless stopped?
 
 			next
 		end
 
 		Thread.new {
-			song, position = nil
-
 			begin
-				moc.loop {|e|
+				@moc.loop {|e|
 					if e == :audio_stop
-						next unless song
+						next unless @song
 
-						if song.stream?
-							listened song
+						if @song.stream?
+							listened @song
+						elsif LOLastfm::Song.is_scrobblable?(@position, @song.length)
+							listened @song
 						else
-							if LOLastfm::Song.is_scrobblable?(position, song.length)
-								listened song
-							else
-								stopped_playing!
-							end
+							stopped_playing!
 						end
 
-						song = nil
+						@song = nil
 					elsif e == :audio_start
-						now_playing song = moc.status(true).to_song
-					elsif e == :state && moc.status(true) == :paused
+						now_playing @song = @moc.status(true).to_song
+					elsif e == :state && @moc.status(true) == :paused
 						stopped_playing!
 					elsif e == :ctime
-						unless song
-							now_playing song = moc.status(true).to_song
+						unless @song
+							now_playing @song = @moc.status(true).to_song
 						end
 
-						if song.stream?
-							if moc.status(true).song.title != song.title
-								listened song
-								now_playing song = moc.status(true).to_song
+						if @song.stream?
+							if @moc.status(true).song.title != @song.title
+								listened @song
+								now_playing @song = @moc.status(true).to_song
 							end
 						else
-							position = moc.status(true).song.position
+							@position = @moc.status(true).song.position rescue nil
 						end
 					end
 				}
 			rescue Exception => e
 				log e, 'checker: moc'
+
+				retry if @moc.active?
 			end
 
-			if song.stream?
-				listened song
-			else
-				if LOLastfm::Song.is_scrobblable?(position, song.length)
-					listened song
+			if @song
+				if @song.stream?
+					listened @song
 				else
-					stopped_playing!
+					if LOLastfm::Song.is_scrobblable?(@position, @song.length)
+						listened @song
+					else
+						stopped_playing!
+					end
 				end
 			end
 

data/lib/LOLastfm/checkers/mpd.rb

@@ -0,0 +1,128 @@
+#--
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+#++
+
+require 'mpd'
+
+class MPD::Controller::Status
+	def to_song
+		return unless song
+
+		if song.file =~ %r{\w+://}
+			comment = song.file
+		else
+			path = song.file
+		end
+
+		LOLastfm::Song.new(true,
+			track:   song.track,
+			title:   song.title,
+			artist:  song.artist,
+			album:   song.album,
+			length:  song.duration,
+			comment: comment,
+			path:    path,
+			stream:  !!comment
+		)
+	end
+end
+
+LOLastfm.define_checker :mpd do
+	settings.default[:host]  = 'localhost'
+	settings.default[:port]  = 6600
+	settings.default[:every] = 5
+
+	create = proc {
+		unless @mpd = MPD::Controller.new(settings[:socket] || settings[:host], settings[:port])
+			set_timeout settings[:every], &create unless stopped?
+
+			next
+		end
+
+		if settings[:password]
+			@mpd.authenticate(settings[:password])
+		end
+
+		@last = @mpd.status
+
+		if @last == :play
+			now_playing @last.to_song
+		end
+
+		Thread.new {
+			timeout = set_interval settings[:every] do
+				@mpd.stop_waiting
+			end
+
+			begin
+				@mpd.loop {|e|
+					if e == :player
+						status = @mpd.status
+
+						if status == :stop
+							next unless @last
+
+							song = @last.to_song
+
+							if song.stream?
+								listened song
+							elsif LOLastfm::Song.is_scrobblable?(@position, song.length)
+								listened song
+							else
+								stopped_playing!
+							end
+						elsif status == :pause
+							stopped_playing!
+						else
+							if @last == :play
+								song = @last.to_song
+
+								if song.stream?
+									listened song
+								elsif LOLastfm::Song.is_scrobblable?(@position, song.length)
+									listened song
+								end
+							end
+
+							@position = 0
+
+							now_playing status.to_song
+						end
+
+						@last = @mpd.status
+					elsif e == :break
+						@position = @mpd.status.song.position
+					end
+				}
+			rescue Exception => e
+				log e, 'checker: mpd'
+
+				retry if mpd.active?
+			end
+
+			if song
+				if song.stream?
+					listened song
+				else
+					if LOLastfm::Song.is_scrobblable?(position, song.length)
+						listened song
+					else
+						stopped_playing!
+					end
+				end
+			end
+
+			clear_timeout timeout
+
+			set_timeout settings[:every], &create unless stopped?
+		}
+	}
+
+	create.call
+end

data/lib/LOLastfm/commands/glyr.rb

@@ -29,18 +29,22 @@ module Glyr
 		end
 	end
 
-	File.join(Dir.tmpdir, rand.to_s).tap {|path|
+	File.expand_path(ENV['GLYR_CACHE'] || '~/.LOLastfm/glyr.cache').tap {|path|
 		FileUtils.mkpath(path)
 		cache_at path
 	}
 end
 
-LOLastfm.define_command :lyrics? do
-	song = now_playing?
+LOLastfm.define_command :lyrics? do |song|
+	song = song ? Song.new(song) : now_playing?
 
-	EM.defer -> {
-		Glyr.query(title: song.title, artist: song.artist, album: song.album).lyrics
-	}, -> results {
-		send_response results.map(&:to_hash)
-	}
+	if song
+		EM.defer -> {
+			Glyr.query(title: song.title, artist: song.artist, album: song.album).lyrics
+		}, -> results {
+			send_response results.map(&:to_hash)
+		}
+	else
+		send_response nil
+	end
 end

data/lib/LOLastfm/song.rb

@@ -34,9 +34,9 @@ class Song
 		data = Hash[data.map { |key, value| [key.to_sym, value] }]
 
 		@track       = data[:track] && data[:track].to_i
-		@title       = data[:title]
-		@album       = data[:album]
-		@artist      = data[:artist]
+		@title       = data[:title] && data[:title].strip
+		@album       = data[:album] && data[:album].strip
+		@artist      = data[:artist] && data[:artist].strip
 		@length      = data[:length] && data[:length].to_i
 		@comment     = data[:comment]
 		@listened_at = data[:listened_at]
@@ -60,6 +60,10 @@ class Song
 				@listened_at = DateTime.now
 			end
 		end
+
+		@title = nil if @title && @title.strip.empty?
+		@album = nil if @album && @album.empty?
+		@arist = nil if @artist && @artist.empty?
 	end
 
 	def fill!

data/lib/LOLastfm/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: LOLastfm
 version: !ruby/object:Gem::Version
-  version: 0.0.3.3
+  version: 0.0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: lastfm
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +82,7 @@ files:
 - lib/LOLastfm/checker.rb
 - lib/LOLastfm/checkers/cmus.rb
 - lib/LOLastfm/checkers/moc.rb
+- lib/LOLastfm/checkers/mpd.rb
 - lib/LOLastfm/checkers/process.rb
 - lib/LOLastfm/client.rb
 - lib/LOLastfm/commands/glyr.rb