cmus 2.0.4.4 → 2.0.4.5

data/bin/cmus-remote.rb

@@ -98,9 +98,11 @@ if options[:status]
 		puts "duration #{status.duration}" if status.duration
 		puts "position #{status.position}" if status.position
 
-		status.tags.marshal_dump.each {|name, value|
-			puts "tag #{name} #{value}"
-		}
+		if status.song
+			status.song.marshal_dump.each {|name, value|
+				puts "tag #{name} #{value}"
+			}
+		end
 
 		status.settings.marshal_dump.each {|name, value|
 			puts "set #{name} #{value}"
@@ -110,7 +112,7 @@ end
 
 if options[:raw]
 	ARGV.each {|command|
-		controller.puts command
+		controller.send command
 	}
 
 	while line = controller.readline

data/lib/cmus/controller.rb

@@ -10,6 +10,7 @@
 
 require 'socket'
 
+require 'cmus/controller/window'
 require 'cmus/controller/toggle'
 require 'cmus/controller/player'
 require 'cmus/controller/status'
@@ -22,9 +23,10 @@ module Cmus
 class Controller
 	attr_reader :path
 
-	def initialize (path = '~/.cmus/socket')
-		@path   = File.expand_path(path)
-		@socket = UNIXSocket.new(@path)
+	def initialize (path = '~/.cmus/socket', timeout = 0.005)
+		@path    = File.expand_path(path)
+		@socket  = UNIXSocket.new(@path)
+		@timeout = timeout
 	end
 
 	def respond_to_missing? (id)
@@ -35,16 +37,138 @@ class Controller
 		@socket.__send__ id, *args, &block
 	end
 
+	def send (text)
+		@socket.puts(text)
+	end
+
+	def source (path)
+		send "source #{File.realpath(File.expand_path(path))}"
+		check_for_error
+
+		self
+	end
+
+	def save
+		send 'save'
+
+		self
+	end
+
+	def quit
+		send 'quit'
+
+		self
+	end
+
+	def set (name, value)
+		send "set #{name}=#{value}"
+		check_for_error
+
+		self
+	end
+
+	def set? (name)
+		send "set #{name}"
+
+		if text = check_for_error
+			text[/=(.*?)'/, 1]
+		end
+	end
+
+	def colorscheme (name)
+		send "colorscheme #{name}"
+		check_for_error
+
+		self
+	end
+
 	# clear the context
 	def clear (context = :playlist)
-		puts "clear -#{context.to_s[0]}"
+		send "clear -#{context.to_s[0]}"
+		check_for_error
+
+		self
 	end
 
 	# add a file to the context
 	def add (context = :playlist, *paths)
 		paths.flatten.compact.uniq.each {|path|
-			puts "clear -#{context.to_s[0]} #{path}"
+			send "add -#{context.to_s[0]} #{File.realpath(File.expand_path(path))}"
+			check_for_error
 		}
+
+		self
+	end
+
+	def bind (context = :common, key, command)
+		send "bind #{context} #{key} #{command}"
+		check_for_error
+
+		self
+	end
+
+	def bind! (context = :common, key, command)
+		send "bind -f #{context} #{key} #{command}"
+
+		self
+	end
+
+	def unbind (context = :common, key)
+		send "unbind #{context} #{key}"
+		check_for_error
+
+		self
+	end
+	
+	def unbind! (context = :common, key)
+		send "unbind -f #{context} #{key}"
+
+		self
+	end
+
+	def bind? (context = :common, key)
+		send "showbind #{context} #{key}"
+
+		if text = check_for_error
+			Struct.new(:context, :key, :command).new(context, *text.split(' ')[2, 2])
+		end
+	end
+
+	def mark (filter)
+		send "mark #{filter}"
+		check_for_error
+
+		self
+	end
+
+	def unmark
+		send 'unmark'
+
+		self
+	end
+
+	def update_cache
+		send 'update-cache'
+
+		self
+	end
+
+	def echo (text)
+		send "echo #{text}"
+		check_for_error
+
+		self
+	end
+
+	def filter (filter, live = false)
+		send "#{'live-' if live}filter #{filter}"
+		check_for_error
+
+		self
+	end
+
+	def window
+		@window ||= Window.new(self)
 	end
 
 	# returns the toggle facilities
@@ -61,6 +185,28 @@ class Controller
 	def status
 		Status.new(self)
 	end
+
+	def wait_for_data (timeout = @timeout)
+		IO.select([@socket], nil, nil, timeout)
+
+		buffer = ""
+
+		while tmp = (@socket.read_nonblock(4096) rescue nil)
+			buffer << tmp
+		end
+
+		buffer
+	rescue
+		nil
+	end
+
+	def check_for_error (data = nil)
+		if error = data || wait_for_data and !error.strip.empty? && error.start_with?('Error:')
+			raise ArgumentError, error.strip.split(/:\s*/, 2).last
+		end
+
+		error
+	end
 end
 
 end

data/lib/cmus/controller/player.rb

@@ -20,49 +20,67 @@ class Player
 	# play the current selection or the passed file
 	def play (file = nil)
 		if file
-			controller.puts "player-play #{File.real_path(File.expand_path(file))}"
+			controller.send "player-play #{File.real_path(File.expand_path(file))}"
 		else
-			controller.puts 'player-play'
+			controller.send 'player-play'
 		end
+
+		self
 	end
 
 	# pause the current song
 	def pause
-		return if controller.status == :paused
+		return self if controller.status == :paused
+
+		controller.send 'player-pause'
 
-		controller.puts 'player-pause'
+		self
 	end
 
 	# unpause the current song
 	def unpause
-		return unless controller.status == :paused
+		return self unless controller.status == :paused
 
-		controller.puts 'player-pause'
+		controller.send 'player-pause'
+
+		self
 	end
 
 	# stop the current song
 	def stop
-		controller.puts 'player-stop'
+		controller.send 'player-stop'
+
+		self
 	end
 
 	# go to the next song in the playlist
 	def next
-		controller.puts 'player-next'
+		controller.send 'player-next'
+
+		self
 	end
 
 	# go to the previous song in the playlist
 	def prev
-		controller.puts 'player-prev'
+		controller.send 'player-prev'
+
+		self
 	end
 
 	# change the volume
 	def volume (volume)
-		controller.puts "vol #{volume}"
+		controller.send "vol #{volume}"
+		controller.check_for_error
+
+		self
 	end
 
 	# seek to the passed second
 	def seek (second)
-		controller.puts "seek #{second}"
+		controller.send "seek #{second}"
+		controller.check_for_error
+
+		self
 	end
 end
 

data/lib/cmus/controller/status.rb

@@ -13,23 +13,16 @@ require 'ostruct'
 module Cmus; class Controller
 
 class Status
-	attr_reader :controller, :path, :duration, :position, :tags, :settings
+	attr_reader :controller, :path, :duration, :position, :song, :settings
 
 	def initialize (controller)
 		@controller = controller
 
-		@tags     = OpenStruct.new
+		@song     = OpenStruct.new
 		@settings = OpenStruct.new
 
-		controller.puts 'status'
-
-		buffer = controller.read(1)
-
-		while tmp = (controller.read_nonblock(2048) rescue nil)
-			buffer << tmp
-		end
-		
-		buffer.each_line {|line|
+		controller.send 'status'
+		controller.wait_for_data.buffer.each_line {|line|
 			type, data = line.chomp.split ' ', 2
 
 			next unless type
@@ -50,7 +43,7 @@ class Status
 			when :tag
 				name, data = data.split ' ', 2
 
-				@tags.send "#{name}=", data
+				@song.send "#{name}=", data
 
 			when :set
 				name, data = data.split ' ', 2
@@ -70,6 +63,14 @@ class Status
 				@settings.send "#{name}=", data
 			end
 		}
+
+		if @song.marshal_dump.empty?
+			@song = nil
+		end
+	end
+
+	def volume
+		(settings.vol_left + settings.vol_right) / 2.0
 	end
 
 	def == (other)

data/lib/cmus/controller/toggle.rb

@@ -18,60 +18,55 @@ class Toggle
 	end
 
 	def toggle (name)
-		controller.puts "toggle #{name}"
+		controller.send "toggle #{name}"
 
 		self
 	end
 
 	def on (name)
-		unless controller.status.settings.send(name)
-			controller.puts "toggle #{name}"
+		unless on? name
+			controller.send "toggle #{name}"
 		end
 
 		self
 	end
 
 	def off (name)
-		if controller.status.settings.send(name)
-			controller.puts "toggle #{name}"
+		if on? name
+			controller.send "toggle #{name}"
 		end
 
 		self
 	end
 
-	# toggle the repeat status
-	def repeat
-		toggle :Repeat
+	def on? (name)
+		controller.status.settings.send(name)
 	end
 
-	# enable repeat
-	def repeat!
-		on :Repeat
-	end
+	%w[show_hidden continue play_library repeat_current aaa_mode play_sorted repeat shuffle show_remaining_time].each {|name|
+		option_name = name
 
-	# disable repeat
-	def no_repeat!
-		off :Repeat
-	end
+		define_method name do
+			toggle option_name
+		end
 
-	# toggle the shuffle status
-	def shuffle
-		toggle :Shuffle
-	end
+		define_method "#{name}!" do
+			on option_name
+		end
 
-	# enable shuffle
-	def shuffle!
-		on :Shuffle
-	end
+		define_method "no_#{name}!" do
+			off option_name
+		end
+
+		define_method "#{name}?" do
+			on? option_name
+		end
+	}
 
-	# disable shuffle
-	def no_shuffle!
-		off :Shuffle
-	end
 
 	# toggle the pause status
 	def pause
-		controller.puts 'player-pause'
+		controller.send 'player-pause'
 
 		self
 	end

data/lib/cmus/controller/window.rb

@@ -0,0 +1,133 @@
+#--
+#            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.
+#++
+
+module Cmus; class Controller
+
+class Window
+	attr_reader :controller
+
+	def initialize (controller)
+		@controller = controller
+	end
+
+	def view (name)
+		controller.send "view #{name}"
+		controller.check_for_error
+
+		self
+	end
+
+	def refresh
+		controller.send 'refresh'
+
+		self
+	end
+
+	def activate
+		controller.send 'win-activate'
+
+		self
+	end
+
+	def add (context = :playlist)
+		controller.send "win-add-#{context.to_s.downcase[0]}"
+		controller.check_for_error
+
+		self
+	end
+
+	def bottom
+		controller.send 'win-bottom'
+
+		self
+	end
+
+	def down
+		controller.send 'win-down'
+
+		self
+	end
+
+	def up
+		controller.send 'win-up'
+
+		self
+	end
+
+	def top
+		controller.send 'win-top'
+		
+		self
+	end
+
+	def move (whence = :after)
+		controller.send "win-mv-#{whence}"
+		controller.check_for_error
+
+		self
+	end
+
+	def next
+		controller.send 'win-next'
+
+		self
+	end
+
+	def page_up
+		controller.send 'win-page-up'
+
+		self
+	end
+
+	def page_down
+		controller.send 'win-page-down'
+
+		self
+	end
+
+	def remove
+		controller.send 'win-remove'
+
+		self
+	end
+
+	def select_current
+		controller.send 'win-sel-cur'
+
+		self
+	end
+
+	def toggle
+		controller.send 'win-toggle'
+
+		self
+	end
+
+	def update
+		controller.send 'win-update'
+
+		self
+	end
+
+	def update_cache
+		controller.send 'win-update-cache'
+
+		self
+	end
+
+	def search (whence = :next)
+		controller.send "search-#{whence}"
+		controller.check_for_error
+
+		self
+	end
+end
+
+end; end

data/lib/cmus/version.rb

@@ -10,6 +10,6 @@
 
 module Cmus
 	def self.version
-		'2.0.4.4'
+		'2.0.4.5'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmus
 version: !ruby/object:Gem::Version
-  version: 2.0.4.4
+  version: 2.0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: meh@paranoici.org
@@ -26,6 +26,7 @@ files:
 - lib/cmus/controller/player.rb
 - lib/cmus/controller/status.rb
 - lib/cmus/controller/toggle.rb
+- lib/cmus/controller/window.rb
 - lib/cmus/version.rb
 homepage: http://github.com/meh/ruby-cmus
 licenses: []