LOLastfm 0.0.1 → 0.0.2

data/LOLastfm.gemspec

@@ -16,5 +16,4 @@ Gem::Specification.new {|s|
 
 	s.add_dependency 'lastfm'
 	s.add_dependency 'taglib-ruby'
-	s.add_dependency 'call-me'
 }

data/README.md

@@ -1,2 +1,51 @@
-LOLastfm - blablablabal
-=======================
+LOLastfm - LOL a scrobbler
+==========================
+LOLastfm is a modular and extensible last.fm scrobbler.
+
+It supports a virtually infinite array of music players and has a cool server-client
+interface that lets you manage music related features seamlessly.
+
+For instance, you can ask it the current playing song without having to relay on client specific
+shims, or by including the glyr extension you can ask it to give you the lyrics of the currently
+playing song.
+
+How to configure
+----------------
+Before being able to use LOLastfm you have to allow access to it on last.fm, just run `LOLastfm -a`
+and follow what it says, then create a file at `~/.LOLastfm/config` and put the session id it gave you
+back.
+
+You have to then tell LOLastfm what music player you want to be used, you can do it dynamically with
+`LOLastfm-do --use player:path'.
+
+```ruby
+session 'heregoesthesession'
+
+use :moc
+```
+
+The example above is if you're using moc.
+
+You can also hook to certain events to, for example, change the attributes of a song before it's sent.
+
+This allows for some neat features, like easily scrobbling from a radio, the following example shows
+how to scrobble songs from trance.fm.
+
+```ruby
+%w(listened love now_playing).each {|name|
+  on name do |song|
+    next if song.artist || !song.stream?
+
+    if song.comment && song.comment.include?('trance.fm')
+      next :stop if song.title.include?('trance.fm') || song.title.start_with?('Trance - FM-')
+
+      song.artist, song.title = song.title.split(/ - /, 2)
+      song.length             = 60 * 1337
+
+      next
+    end
+
+    :stop
+  end
+}
+```

data/bin/LOLastfm

@@ -24,7 +24,7 @@ OptionParser.new do |o|
 end.parse!
 
 EM.run {
-	d = LOLastfm.load(ARGV.first || '~/.LOLastfm.rc')
+	d = LOLastfm.load(ARGV.first || '~/.LOLastfm/config')
 	d.start
 
 	%w[INT KILL].each {|sig|

data/bin/LOLastfm-cmus

@@ -4,7 +4,7 @@ require 'json'
 
 args = Hash[*ARGV]
 
-UNIXSocket.new(File.expand_path('~/.LOLastfm.socket')).tap {|socket|
+UNIXSocket.new(File.expand_path('~/.LOLastfm/socket')).tap {|socket|
 	if args['url']
 		socket.puts [:hint, [:stream, args['title'], args['comment']]].to_json
 	end

data/bin/LOLastfm-lyrics

@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+require 'json'
+require 'socket'
+
+socket = UNIXSocket.new(File.expand_path(ARGV.empty? ? '~/.LOLastfm/socket' : ARGV.first))
+socket.puts [:commands, :glyr].to_json
+
+if STDOUT.tty?
+	require 'ncursesw'
+
+	abort 'ncurses UI not implemented yet, redirect the output to something'
+else
+	socket.puts [:lyrics?].to_json
+
+	response = JSON.parse(socket.readline)
+
+	if response.first
+		puts response.first['data']
+	else
+		exit 1
+	end
+end

data/bin/LOLastfm-now-playing

@@ -0,0 +1,14 @@
+#! /usr/bin/env ruby
+require 'json'
+require 'socket'
+
+socket = UNIXSocket.new(File.expand_path(ARGV.empty? ? '~/.LOLastfm/socket' : ARGV.first))
+socket.puts [:now_playing?].to_json
+
+response = JSON.parse(?[ + socket.readline + ?]).first
+
+exit 1 if response.nil?
+
+%w[track title artist album].each {|name|
+	puts "#{name} #{response[name]}" if response[name]
+}

data/bin/{LOLastfm-do → LOLastfm-send}

@@ -6,7 +6,7 @@ require 'json'
 options = {}
 
 OptionParser.new do |o|
-	options[:socket] = '~/.LOLastfm.socket'
+	options[:socket] = '~/.LOLastfm/socket'
 	options[:song] = {}
 
 	o.on '--listened', 'enable listened sending' do
@@ -48,6 +48,14 @@ OptionParser.new do |o|
 	o.on '-i', '--id ID', 'the MusicBrainz id of the song' do |value|
 		options[:song][:id] = value
 	end
+
+	o.on '-u', '--use USE', 'the string for the checker' do |value|
+		options[:use] = value
+	end
+
+	o.on '-u', '--commands COMMANDS', 'the string for the command library' do |value|
+		options[:commands] = value
+	end
 end.parse!
 
 if ARGV.first
@@ -56,12 +64,18 @@ end
 
 socket = UNIXSocket.new(File.expand_path(options[:socket]))
 
-if options[:now_playing]
-	socket.puts [:now_playing, options[:song]].to_json
-elsif options[:love]
-	socket.puts [:love, options[:song].empty? ? nil : options[:song]].to_json
+if options[:use]
+	socket.puts [:use, options[:use].split(':')].to_json
+elsif options[:commands]
+	socket.puts [:commands, options[:commands].split(':')].to_json
 else
-	socket.puts [:listened, options[:song]].to_json
+	if options[:now_playing]
+		socket.puts [:now_playing, options[:song]].to_json
+	elsif options[:love]
+		socket.puts [:love, options[:song].empty? ? nil : options[:song]].to_json
+	else
+		socket.puts [:listened, options[:song]].to_json
+	end
 end
 
 socket.flush

data/lib/LOLastfm.rb

@@ -10,7 +10,6 @@
 
 require 'eventmachine'
 require 'lastfm'
-require 'call-me/memoize'
 
 class LOLastfm
 	def self.load (path)
@@ -33,31 +32,45 @@ class LOLastfm
 		commands[name.to_sym.downcase] = block
 	end
 
-	attr_reader :cache
+	attr_reader :path, :host, :port, :cache
 
 	def initialize
 		@session = Lastfm.new('5f7b134ba19b20536a5e29bc86ae64c9', '3b50e74d989795c3f4b3667c5a1c8e67')
 		@cache   = Cache.new(self)
     @events  = Hash.new { |h, k| h[k] = [] }
 
-		cache_at '~/.LOLastfm.cache'
+		cache_at '~/.LOLastfm/cache'
 	end
 
 	def load (path)
 		instance_eval File.read(File.expand_path(path)), path
 	end
 
+	def started?; !!@started; end
+
 	def start
-		@server = EM.start_unix_domain_server(@socket || File.expand_path('~/.LOLastfm.socket'), LOLastfm::Connection) {|conn|
-			conn.fm = self
-		}
+		return if started?
+
+		@server = if @host && @port
+			EM.start_server(host, port, LOLastfm::Connection) {|conn|
+				conn.fm = self
+			}
+		else
+			EM.start_unix_domain_server(path || File.expand_path('~/.LOLastfm/socket'), LOLastfm::Connection) {|conn|
+				conn.fm = self
+			}
+		end
 
 		@timer = EM.add_periodic_timer 360 do
 			save
 		end
+
+		@checker.start
 	end
 
 	def stop
+		return unless started?
+
 		EM.stop_server @server
 		EM.cancel_timer @timer
 
@@ -82,8 +95,13 @@ class LOLastfm
 		end
 	end
 
-	def socket (path)
-		@socket = path
+	def server_at (host, port = nil)
+		if port
+			@host = host
+			@port = port
+		else
+			@path = host
+		end
 	end
 
 	def session (key)
@@ -96,6 +114,7 @@ class LOLastfm
 
 	def now_playing (song)
 		song = Song.new(song) unless song.is_a?(Song)
+		song = song.dup
 
 		return false unless fire :now_playing, song
 
@@ -112,6 +131,7 @@ class LOLastfm
 
 	def listened (song)
 		song = Song.new(song) unless song.is_a?(Song)
+		song = song.dup
 
 		return false unless fire :listened, song
 
@@ -138,6 +158,7 @@ class LOLastfm
 	def love (song = nil)
 		song = @last_played or return unless song
 		song = Song.new(song) unless song.is_a? Song
+		song = song.dup
 
 		return false unless fire :love, song
 
@@ -168,16 +189,26 @@ class LOLastfm
 		@last_played
 	end
 
-	def use (*args, &block)
-		if args.first.is_a?(String)
-			return require args.first
+	def commands (name)
+		begin
+			require "LOLastfm/commands/#{name}"
+		rescue LoadError
+			require name.to_s
 		end
+	end
 
-		unless block
+	def use (*args, &block)
+		return if args.empty? && !block
+
+		unless args.first.respond_to?(:to_hash) || block
 			name = args.shift.to_sym
 
-			if args.first.is_a?(String)
-				require args.shift
+			if args.first.is_a? String
+				require args.pop
+			elsif !self.class.checkers[name]
+				begin
+					require "LOLastfm/checkers/#{name}"
+				rescue LoadError; end
 			end
 
 			block = self.class.checkers[name]
@@ -187,9 +218,9 @@ class LOLastfm
 			@checker.stop
 		end
 
-		@checker = Checker.new(self, name, args.shift, &block)
-		@checker.start
-		@checker
+		@checker = Checker.new(self, name, args.shift, &block).tap {|c|
+			c.start if started?
+		}
 	end
 
 	def hint (*args)

data/lib/LOLastfm/checker.rb

@@ -62,17 +62,21 @@ class Checker
 	end
 	
 	def stop (&block)
-		@timers.each {|timer|
-			clear_timeout(timer)
-		}
-
 		if block
 			@stop_block = block
 		else
+			@stopped = true
+
+			@timers.each {|timer|
+				clear_timeout(timer)
+			}
+
 			@stop_block.call if @stop_block
 		end
 	end
 
+	def stopped?; !!@stopped; end
+
 	def hint (*args, &block)
 		if block
 			@hint_block = block

data/lib/LOLastfm/checkers/cmus.rb

@@ -11,7 +11,6 @@
 require 'cmus'
 
 class Cmus::Controller::Status
-	memoize
 	def to_song
 		return unless song
 
@@ -33,26 +32,37 @@ LOLastfm.define_checker :cmus do
 	settings.default[:every]   = 5
 	settings.default[:timeout] = 0.005
 
-	@cmus = Cmus::Controller.new(settings[:socket], settings[:timeout])
-	@last = @cmus.status
+	if @cmus = Cmus::Controller.new(settings[:socket], settings[:timeout]) rescue false
+		@last = @cmus.status
 
-	if @last == :play
-		now_playing @last.to_song
+		if @last == :play
+			now_playing @last.to_song
+		end
 	end
 
 	set_interval settings[:every] do
+		unless @cmus
+			@cmus = Cmus::Controller.new(settings[:socket], settings[:timeout]) rescue next
+			@last = @cmus.status
+		end
+
+		unless status = @cmus.status rescue nil
+			@cmus = nil
+			next
+		end
+
 		status = @cmus.status
 
 		if status == :stop
-			if @last != :stop && LOLastfm::Song.is_scrobblable?(@last.song.position, @last.song.duration)
+			if @last != :stop && (@last.to_song.stream? || LOLastfm::Song.is_scrobblable?(@last.song.position, @last.song.duration))
 				listened @last.to_song
-			else
-				stopped_playing!
 			end
+
+			stopped_playing!
 		elsif status == :pause
 			stopped_playing!
 		else
-			if @last != :stop && (@last.to_song != status.to_song || @last.song.position > status.song.position) && LOLastfm::Song.is_scrobblable?(@last.song.position, @last.song.duration)
+			if @last != :stop && (@last.to_song != status.to_song || @last.song.position > status.song.position + 30) && (@last.to_song.stream? || LOLastfm::Song.is_scrobblable?(@last.song.position, @last.song.duration))
 				listened @last.to_song
 			end
 

data/lib/LOLastfm/checkers/moc.rb

@@ -10,23 +10,25 @@
 
 require 'moc'
 
-class Moc::Controller::Status
-	memoize
+class Moc::Controller::Status::Live
 	def to_song
 		return unless song
 
-		if song.file.start_with?('http://') || song.file.start_with?('ftp://')
-			comment = song.file
+		file = song.file
+		tags = song.tags
+
+		if file.start_with?('http://') || file.start_with?('ftp://')
+			comment = file
 		else
-			path = song.file
+			path = file
 		end
 
 		LOLastfm::Song.new(true,
-			track:   song.track,
-			title:   song.title,
-			artist:  song.artist,
-			album:   song.album,
-			length:  song.duration,
+			track:   tags.track,
+			title:   tags.title,
+			artist:  tags.artist,
+			album:   tags.album,
+			length:  tags.time,
 			comment: comment,
 			path:    path,
 			stream:  !!comment
@@ -38,34 +40,58 @@ LOLastfm.define_checker :moc do
 	settings.default[:socket] = '~/.moc/socket2'
 	settings.default[:every]  = 5
 
-	@moc  = Moc::Controller.new(settings[:socket])
-	@last = @moc.status
+	create = proc {
+		unless moc = Moc::Controller.new(settings[:socket]) rescue false
+			set_timeout settings[:every], &create unless stopped?
+		end
 
-	if @last == :play
-		now_playing @last.to_song
-	end
+		Thread.new {
+			song, position = nil
 
-	set_interval settings[:every] do
-		status = @moc.status
+			begin
+				moc.loop {|e|
+					if e == :audio_stop
+						next unless song
 
-		if status == :stop
-			if @last != :stop && LOLastfm::Song.is_scrobblable?(@last.song.position, @last.song.duration)
-				listened @last.to_song
-			else
-				stopped_playing!
-			end
-		elsif status == :pause
-			stopped_playing!
-		else
-			if @last != :stop && (@last.to_song != status.to_song || @last.song.position > status.song.position) && LOLastfm::Song.is_scrobblable?(@last.song.position, @last.song.duration)
-				listened @last.to_song
-			end
+						if song.stream?
+							listened song
+						else
+							if LOLastfm::Song.is_scrobblable?(position, song.length)
+								listened song
+							else
+								stopped_playing!
+							end
+						end
+
+						song = nil
+					elsif e == :tags
+					elsif e == :audio_start
+						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
+						end
 
-			if @last != :play || @last.to_song != status.to_song
-				now_playing status.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
+						end
+					end
+				}
+			rescue Exception => e
+				$stderr.puts e.message
+				$stderr.puts e.backtrace
 			end
-		end
 
-		@last = status
-	end
+			set_timeout settings[:every], &create unless stopped?
+		}
+	}
+
+	create.call
 end

data/lib/LOLastfm/commands/glyr.rb

@@ -9,19 +9,34 @@
 #++
 
 require 'glyr'
+require 'tmpdir'
+require 'fileutils'
 
-class Glyr::Result::Data
-	def to_json
-		{ source: source, provider: provider, data: data }.to_json
+module Glyr
+	class Source
+		def to_hash
+			{ name: name, quality: quality, speed: speed, language_aware: language_aware? }
+		end
 	end
+
+	class Result
+		def to_hash
+			{ source: source, url: url, data: data }
+		end
+	end
+
+	File.join(Dir.tmpdir, rand.to_s).tap {|path|
+		FileUtils.mkpath(path)
+		cache_at path
+	}
 end
 
 LOLastfm.define_command :lyrics? do
 	song = now_playing?
 
 	EM.defer -> {
-		Glyr.query.title(song.title).artist(song.artist).album(song.album).lyrics
-	}, -> result {
-		send_line result.first.to_str.to_json
+		Glyr.query(title: song.title, artist: song.artist, album: song.album).lyrics
+	}, -> results {
+		send_line results.map(&:to_hash).to_json
 	}
 end

data/lib/LOLastfm/connection.rb

@@ -16,6 +16,10 @@ define_command :use do |*args|
 	use *args
 end
 
+define_command :commands do |*args|
+	commands *args
+end
+
 define_command :listened do |song|
 	listened song
 end
@@ -55,7 +59,7 @@ class Connection < EventMachine::Protocols::LineAndTextProtocol
 		command, arguments = JSON.parse(line)
 
 		if block = LOLastfm.commands[command.to_sym.downcase]
-			instance_eval *arguments, &block
+			instance_exec *arguments, &block
 		end
 	rescue => e
 		$stderr.puts e.to_s

data/lib/LOLastfm/song.rb

@@ -17,6 +17,8 @@ class LOLastfm
 
 class Song
 	def self.is_scrobblable? (position, duration)
+		return false unless position && duration
+
 		return false if duration < 30
 
 		return true if position > 240

data/lib/LOLastfm/version.rb

@@ -10,6 +10,6 @@
 
 class LOLastfm
 	def self.version
-		'0.0.1'
+		'0.0.2'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: LOLastfm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lastfm
@@ -43,28 +43,14 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: call-me
-  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'
 description: 
 email: meh@paranoici.org
 executables:
 - LOLastfm
 - LOLastfm-cmus
-- LOLastfm-do
+- LOLastfm-lyrics
+- LOLastfm-now-playing
+- LOLastfm-send
 extensions: []
 extra_rdoc_files: []
 files:
@@ -72,7 +58,9 @@ files:
 - README.md
 - bin/LOLastfm
 - bin/LOLastfm-cmus
-- bin/LOLastfm-do
+- bin/LOLastfm-lyrics
+- bin/LOLastfm-now-playing
+- bin/LOLastfm-send
 - lib/LOLastfm.rb
 - lib/LOLastfm/cache.rb
 - lib/LOLastfm/checker.rb