LOLastfm 0.0.3.1 → 0.0.3.2

data/lib/LOLastfm.rb

@@ -10,6 +10,7 @@
 
 require 'eventmachine'
 require 'lastfm'
+require 'stringio'
 
 class LOLastfm
 	def self.load (path)
@@ -40,6 +41,7 @@ class LOLastfm
     @events  = Hash.new { |h, k| h[k] = [] }
 
 		cache_at '~/.LOLastfm/cache'
+		logs_at  '~/.LOLastfm/logs'
 	end
 
 	def load (path)
@@ -66,6 +68,7 @@ class LOLastfm
 		end
 
 		@checker.start
+		@cache.flush!
 	end
 
 	def stop
@@ -87,6 +90,19 @@ class LOLastfm
 		end
 	end
 
+	def logs_at (path)
+		@logs_at = File.expand_path(path)
+	end
+
+	def server_at (host, port = nil)
+		if port
+			@host = host
+			@port = port
+		else
+			@path = host
+		end
+	end
+
 	def save
 		if @cache_at
 			File.open(@cache_at, 'w') {|f|
@@ -95,13 +111,25 @@ class LOLastfm
 		end
 	end
 
-	def server_at (host, port = nil)
-		if port
-			@host = host
-			@port = port
+	def log (what, group = nil)
+		io = StringIO.new
+
+		io.print "[#{Time.now}#{" (#{group})" if group}] "
+
+		if what.is_a? Exception
+			io.puts "#{what.class.name}: #{what.message}"
+			io.puts e.backtrace
 		else
-			@path = host
+			io.puts what
 		end
+
+		io.seek 0
+
+		io.read.tap {|text|
+			$stderr.puts text
+
+			File.open(@logs_at, 'a') { |f| f.print text }
+		}
 	end
 
 	def session (key)
@@ -143,15 +171,17 @@ class LOLastfm
 		unless listened! song
 			@cache.listened(song)
 		end
+
+		@last_played = song
 		
 		true
 	end
 
 	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).tap {
-			@last_played = song
-		}
-	rescue
+		@session.track.scrobble(song.artist, song.title, song.listened_at.to_time.to_i, song.album, song.track, song.id, song.length)
+	rescue Exception => e
+		log e, :listened
+
 		false
 	end
 
@@ -174,7 +204,9 @@ class LOLastfm
 
 	def love! (song)
 		@session.track.love(song.artist, song.title)
-	rescue
+	rescue Exception => e
+		log e, :love
+
 		false
 	end
 
@@ -197,7 +229,9 @@ class LOLastfm
 
 	def unlove! (song)
 		@session.track.unlove(song.artist, song.title)
-	rescue
+	rescue Exception => e
+		log e, :unlove
+
 		false
 	end
 

data/lib/LOLastfm/cache.rb

@@ -24,19 +24,19 @@ class Cache
 	end
 
 	def listened (song)
-		return if @loved.member? song
+		return if song.nil? || @listened.member?(song)
 
 		@listened << song
 	end
 
 	def love (song)
-		return if @loved.member? song
+		return if song.nil? || @loved.member?(song)
 
 		@loved << song
 	end
 
 	def unlove (song)
-		return if @unloved.member? song
+		return if song.nil? || @unloved.member?(song)
 
 		@unloved << song
 	end
@@ -47,19 +47,19 @@ class Cache
 
 	def flush!
 		until @listened.empty?
-			break unless fm.listened! @listened.first
+			break unless fm.listened! Song.new(@listened.first)
 
 			@listened.shift
 		end
 
 		until @loved.empty?
-			break unless fm.love! @loved.first
+			break unless fm.love! Song.new(@loved.first)
 
 			@loved.shift
 		end
 
 		until @unloved.empty?
-			break unless fm.unlove! @unloved.first
+			break unless fm.unlove! Song.new(@unloved.first)
 
 			@unloved.shift
 		end
@@ -68,24 +68,24 @@ class Cache
 	def load (path)
 		data = YAML.parse_file(path).transform
 
-		data['listened'].each {|song|
+		data[:listened].each {|song|
 			listened(Song.new(song))
-		} if data['listened']
+		} if data[:listened]
 
-		data['loved'].each {|song|
+		data[:loved].each {|song|
 			love(Song.new(song))
-		} if data['loved']
+		} if data[:loved]
 
-		data['unloved'].each {|song|
+		data[:unloved].each {|song|
 			unlove(Song.new(song))
-		} if data['unloved']
+		} if data[:unloved]
 	end
 
 	def to_yaml
 		{
-			'listened' => @listened.map(&:to_hash),
-			'loved'    => @loved.map(&:to_hash),
-			'unloved'  => @unloved.map(&:to_hash)
+			listened: @listened.map(&:to_hash),
+			loved:    @loved.map(&:to_hash),
+			unloved:  @unloved.map(&:to_hash)
 		}.to_yaml
 	end
 end

data/lib/LOLastfm/checkers/moc.rb

@@ -86,8 +86,7 @@ LOLastfm.define_checker :moc do
 					end
 				}
 			rescue Exception => e
-				$stderr.puts e.message
-				$stderr.puts e.backtrace
+				log e, 'checker: moc'
 			end
 
 			if song.stream?

data/lib/LOLastfm/checkers/process.rb

@@ -11,24 +11,25 @@
 LOLastfm.define_checker :process do
 	settings.default[:every] = 5
 
-	set_interval settings[:every] do
-		if status == :stopped
-			if @last == :playing
-
-			end
-		else
+	ENV['PATH'].split(':').each {|path|
+		if File.executable?("#{path}/lsof")
+			break settings.default[:lsof] = "#{path}/lsof"
 		end
+	}
 
-		@last = status
+	unless settings[:name]
+		raise 'I need the name of the process to check'
 	end
 
-	hint do |path|
-		if @hint && path != @hint
-			next unless listened path: path
-		end
+	unless settings[:lsof]
+		raise 'I need the path to lsof to work'
+	end
 
-		next unless now_playing path: path
+	set_interval settings[:every] do
+
+	end
 
-		@hint = path
+	hint do |path|
+		listened path: path
 	end
 end

data/lib/LOLastfm/connection.rb

@@ -70,8 +70,7 @@ class Connection < EventMachine::Protocols::LineAndTextProtocol
 			instance_exec *arguments, &block
 		end
 	rescue Exception => e
-		$stderr.puts e.to_s
-		$stderr.puts e.backtrace
+		f.log e, "command: #{command}"
 	end
 
 	def respond_to_missing? (id)

data/lib/LOLastfm/song.rb

@@ -53,17 +53,25 @@ class Song
 
 		if @listened_at
 			@listened_at = @listened_at.is_a?(String) ? DateTime.parse(@listened_at) : @listened_at.to_datetime
-		elsif @length
-			@listened_at = (Time.now - @length).to_datetime
-		else
-			@listened_at = DateTime.now
 		end
 	end
 
-	def fill!
-		return unless @path
+	def listened_at
+		return @listened_at if @listened_at
+
+		unless nil? || @listened_at
+			if @length && !stream?
+				@listened_at = (Time.now - @length).to_datetime
+			else
+				@listened_at = DateTime.now
+			end
+		end
 
-		return if @track && @title && @album && @artist && @comment && @length && @id
+		@listened_at
+	end
+
+	def fill!
+		return if !@path || (@track && @title && @album && @artist && @comment && @length && @id)
 
 		TagLib::FileRef.open(@path) {|f|
 			if f.tag
@@ -140,6 +148,22 @@ class Song
 	def to_yaml
 		to_hash.to_yaml
 	end
+
+	def inspect
+		header = ''
+		header << "#{id} "                      if id
+		header << "listened at #{listened_at} " if listened_at
+		header << "#{length} seconds "          if length
+		header << "found at #{path} "           if path
+
+		parts = ''
+		parts << "track=#{track} "   if track
+		parts << "title=#{title} "   if title
+		parts << "artist=#{artist} " if artist
+		parts << "album=#{album} "   if album
+
+		"#<LOLastfm::Song#{"(#{header[0 .. -2]})" unless header.empty?}:#{" #{parts[0 .. -2]}" if parts}>"
+	end
 end
 
 end

data/lib/LOLastfm/version.rb

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

metadata

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