LOLastfm 0.0.2 → 0.0.3

data/README.md

@@ -32,7 +32,7 @@ This allows for some neat features, like easily scrobbling from a radio, the fol
 how to scrobble songs from trance.fm.
 
 ```ruby
-%w(listened love now_playing).each {|name|
+%w(listened love unlove now_playing).each {|name|
   on name do |song|
     next if song.artist || !song.stream?
 

data/bin/LOLastfm

@@ -27,6 +27,11 @@ EM.run {
 	d = LOLastfm.load(ARGV.first || '~/.LOLastfm/config')
 	d.start
 
+	EM.error_handler {|e|
+		$stderr.puts e.message
+		$stderr.puts e.backtrace
+	}
+
 	%w[INT KILL].each {|sig|
 		trap sig do
 			puts 'LOLastfm stopping...'

data/bin/LOLastfm-lyrics

@@ -1,21 +1,19 @@
 #! /usr/bin/env ruby
-require 'json'
-require 'socket'
+require 'LOLastfm/client'
 
-socket = UNIXSocket.new(File.expand_path(ARGV.empty? ? '~/.LOLastfm/socket' : ARGV.first))
-socket.puts [:commands, :glyr].to_json
+client = LOLastfm::Client.new(ARGV.empty? ? '~/.LOLastfm/socket' : ARGV.first)
+client.send_command :commands, :glyr
 
 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)
+	client.send_command :lyrics?
+	response = client.read_response
 
 	if response.first
-		puts response.first['data']
+		puts response.first['content']
 	else
 		exit 1
 	end

data/bin/LOLastfm-now-playing

@@ -1,14 +1,35 @@
 #! /usr/bin/env ruby
-require 'json'
-require 'socket'
+require 'optparse'
+require 'LOLastfm/client'
 
-socket = UNIXSocket.new(File.expand_path(ARGV.empty? ? '~/.LOLastfm/socket' : ARGV.first))
-socket.puts [:now_playing?].to_json
+options = {}
 
-response = JSON.parse(?[ + socket.readline + ?]).first
+OptionParser.new do |o|
+	options[:socket] = '~/.LOLastfm/socket'
 
-exit 1 if response.nil?
+	o.on '-t', '--template TEMPLATE', 'the template to use' do |value|
+		options[:template] = value
+	end
+end.parse!
 
-%w[track title artist album].each {|name|
-	puts "#{name} #{response[name]}" if response[name]
-}
+if ARGV.first
+	options[:socket] = ARGV.first
+end
+
+client = LOLastfm::Client.new(options[:socket])
+client.send_command :now_playing?
+
+exit 1 if (response = client.read_response).nil?
+
+if options[:template]
+	track  = response['track']
+	title  = response['title']
+	artist = response['artist']
+	album  = response['album']
+
+	puts eval("%Q{#{options[:template]}}")
+else
+	%w[track title artist album].each {|name|
+		puts "#{name} #{response[name]}" if response[name]
+	}
+end

data/bin/LOLastfm-send

@@ -1,7 +1,6 @@
 #! /usr/bin/env ruby
 require 'optparse'
-require 'socket'
-require 'json'
+require 'LOLastfm/client'
 
 options = {}
 
@@ -21,6 +20,14 @@ OptionParser.new do |o|
 		options[:love] = true
 	end
 
+	o.on '--unlove', 'enable unlove sending' do
+		options[:unlove] = true
+	end
+
+	o.on '-c', '--current', 'work on the current song' do
+		options[:current] = true
+	end
+
 	o.on '-t', '--title TITLE', 'title of the song' do |value|
 		options[:song][:title] = value
 	end
@@ -62,21 +69,20 @@ if ARGV.first
 	options[:socket] = ARGV.first
 end
 
-socket = UNIXSocket.new(File.expand_path(options[:socket]))
+client = LOLastfm::Client.new(options[:socket])
 
 if options[:use]
-	socket.puts [:use, options[:use].split(':')].to_json
+	client.send_command :use, options[:use].split(':')
 elsif options[:commands]
-	socket.puts [:commands, options[:commands].split(':')].to_json
+	client.send_command :commands, options[:commands].split(':')
 else
 	if options[:now_playing]
-		socket.puts [:now_playing, options[:song]].to_json
+		client.send_command :now_playing, options[:song]
 	elsif options[:love]
-		socket.puts [:love, options[:song].empty? ? nil : options[:song]].to_json
+		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]
 	else
-		socket.puts [:listened, options[:song]].to_json
+		client.send_command :listened, options[:song]
 	end
 end
-
-socket.flush
-socket.close

data/lib/LOLastfm/cache.rb

@@ -20,6 +20,7 @@ class Cache
 
 		@listened = []
 		@loved    = []
+		@unloved  = []
 	end
 
 	def listened (song)
@@ -34,8 +35,14 @@ class Cache
 		@loved << song
 	end
 
+	def unlove (song)
+		return if @unloved.member? song
+
+		@unloved << song
+	end
+
 	def empty?
-		@listened.empty? && @loved.empty?
+		@listened.empty? && @loved.empty? && @unloved.empty?
 	end
 
 	def flush!
@@ -50,6 +57,12 @@ class Cache
 
 			@loved.shift
 		end
+
+		until @unloved.empty?
+			break unless fm.unlove! @unloved.first
+
+			@unloved.shift
+		end
 	end
 
 	def load (path)
@@ -57,15 +70,23 @@ class Cache
 
 		data['listened'].each {|song|
 			listened(Song.new(song))
-		}
+		} if data['listened']
 
 		data['loved'].each {|song|
 			love(Song.new(song))
-		}
+		} if data['loved']
+
+		data['unloved'].each {|song|
+			unlove(Song.new(song))
+		} if data['unloved']
 	end
 
 	def to_yaml
-		{ 'listened' => @listened.map(&:to_hash), 'loved' => @loved.map(&:to_hash) }.to_yaml
+		{
+			'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

@@ -64,7 +64,6 @@ LOLastfm.define_checker :moc do
 						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

data/lib/LOLastfm/client.rb

@@ -0,0 +1,47 @@
+#--
+#            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 'socket'
+require 'json'
+
+class LOLastfm
+
+class Client
+	def initialize (host, port = nil)
+		@socket = port ? TCPSocket.new(host, port) : UNIXSocket.new(File.expand_path(host))
+	end
+
+	def respond_to_missing? (id, include_private = false)
+		@socket.respond_to?(id, include_private)
+	end
+
+	def method_missing (id, *args, &block)
+		if @socket.respond_to? id
+			return @socket.__send__ id, *args, &block
+		end
+
+		super
+	end
+
+	def send_command (type, *arguments)
+		@socket.puts [type, arguments].to_json
+	end
+
+	def read_response
+		JSON.parse(?[ + @socket.readline.chomp + ?]).first
+	end
+
+	def close
+		@socket.flush
+		@socket.close
+	end
+end
+
+end

data/lib/LOLastfm/commands/glyr.rb

@@ -21,7 +21,11 @@ module Glyr
 
 	class Result
 		def to_hash
-			{ source: source, url: url, data: data }
+			if respond_to? :to_str
+				{ source: source, url: url, content: to_str }
+			else
+				{ source: source, url: url }
+			end
 		end
 	end
 
@@ -37,6 +41,6 @@ LOLastfm.define_command :lyrics? do
 	EM.defer -> {
 		Glyr.query(title: song.title, artist: song.artist, album: song.album).lyrics
 	}, -> results {
-		send_line results.map(&:to_hash).to_json
+		send_response results.map(&:to_hash)
 	}
 end

data/lib/LOLastfm/connection.rb

@@ -12,6 +12,10 @@ require 'json'
 
 class LOLastfm
 
+define_command :version? do
+	send_response LOLastfm.version
+end
+
 define_command :use do |*args|
 	use *args
 end
@@ -36,12 +40,16 @@ define_command :love do |song|
 	love song
 end
 
+define_command :unlove do |song|
+	unlove song
+end
+
 define_command :hint do |*args|
 	hint *args
 end
 
 define_command :now_playing? do
-	send_line now_playing?.to_json
+	send_response now_playing?
 end
 
 define_command :next? do
@@ -61,17 +69,11 @@ class Connection < EventMachine::Protocols::LineAndTextProtocol
 		if block = LOLastfm.commands[command.to_sym.downcase]
 			instance_exec *arguments, &block
 		end
-	rescue => e
+	rescue Exception => e
 		$stderr.puts e.to_s
 		$stderr.puts e.backtrace
 	end
 
-	def send_line (line)
-		raise ArgumentError, 'the line already has a newline character' if line.include? "\n"
-
-		send_data "#{line}\r\n"
-	end
-
 	def respond_to_missing? (id)
 		@fm.respond_to?(id)
 	end
@@ -83,6 +85,16 @@ class Connection < EventMachine::Protocols::LineAndTextProtocol
 
 		super
 	end
+
+	def send_line (line)
+		raise ArgumentError, 'the line already has a newline character' if line.include? "\n"
+
+		send_data line.dup.force_encoding('BINARY') << "\r\n"
+	end
+
+	def send_response (*arguments)
+		send_line (arguments.length == 1 ? arguments.first : arguments).to_json
+	end
 end
 
 end

data/lib/LOLastfm/version.rb

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

data/lib/LOLastfm.rb

@@ -157,6 +157,7 @@ class LOLastfm
 
 	def love (song = nil)
 		song = @last_played or return unless song
+		song = now_playing? or return if song == 'current' || song == :current
 		song = Song.new(song) unless song.is_a? Song
 		song = song.dup
 
@@ -177,6 +178,29 @@ class LOLastfm
 		false
 	end
 
+	def unlove (song = nil)
+		song = @last_played or return unless song
+		song = now_playing? or return if song == 'current' || song == :current
+		song = Song.new(song) unless song.is_a? Song
+		song = song.dup
+
+		return false unless fire :unlove, song
+
+		return false if song.nil?
+
+		unless unlove! song
+			@cache.unlove(song)
+		end
+
+		true
+	end
+
+	def unlove! (song)
+		@session.track.unlove(song.artist, song.title)
+	rescue
+		false
+	end
+
 	def stopped_playing!
 		@now_playing = nil
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: LOLastfm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lastfm
@@ -67,6 +67,7 @@ files:
 - lib/LOLastfm/checkers/cmus.rb
 - lib/LOLastfm/checkers/moc.rb
 - lib/LOLastfm/checkers/process.rb
+- lib/LOLastfm/client.rb
 - lib/LOLastfm/commands/glyr.rb
 - lib/LOLastfm/connection.rb
 - lib/LOLastfm/song.rb