moc 2.5.0 → 2.5.0.1

data/lib/moc/controller.rb

@@ -50,7 +50,7 @@ class Controller
 	end
 
 	def send (object)
-		write object.pack
+		@socket.write object.respond_to?(:pack) ? object.pack : object.to_s
 	end
 
 	def send_command (command)
@@ -69,6 +69,35 @@ class Controller
 		send Protocol::String.new(string.to_s)
 	end
 
+	def send_item (item)
+		if item
+			send_string item.file
+			send_string item.title_tags || ''
+			send_tags   item.tags
+			send_time   item.mtime
+		else
+			send_string ''
+		end
+	end
+
+	def send_tags (tags)
+		if tags
+			send_string  tags.title
+			send_string  tags.artist
+			send_string  tags.album
+			send_integer tags.track
+			send_integer tags.time
+			send_integer 0x01 | 0x02
+		else
+			send_string  ''
+			send_string  ''
+			send_string  ''
+			send_integer -1
+			send_integer -1
+			send_integer 0
+		end
+	end
+
 	def read_string
 		Protocol::String.read(@socket)
 	end
@@ -85,10 +114,10 @@ class Controller
 		Protocol::Event.read(@socket).tap {|event|
 			event.data = case event.to_sym
 				when :PLIST_ADD, :QUEUE_ADD
-					get_item
+					read_item
 				
 				when :PLIST_DEL, :QUEUE_DEL, :STATUS_MSG
-					get_string
+					read_string
 
 				when :FILE_TAGS
 					FileTags.new(read_string, read_tags)
@@ -104,14 +133,34 @@ class Controller
 	end
 
 	def read_item
-		Playlist::Item.new(self)
+		return if (file = read_string.to_s).empty?
+
+		title_tags = read_string.to_s
+
+		Playlist::Item.new(file, title_tags.empty? ? nil : title_tags, read_tags, read_time)
 	end
 
 	def read_tags
-		Tags.new(self)
+		title  = read_string.to_s
+		artist = read_string.to_s
+		album  = read_string.to_s
+		track  = read_integer.to_i
+		time   = read_integer.to_i
+		filled = read_integer.to_i
+
+		title  = nil if title.empty?
+		artist = nil if artist.empty?
+		album  = nil if album.empty?
+		track  = nil if track == -1
+
+		if title.nil? && artist.nil? && album.nil? && track.nil? && time == -1 && filled == 0
+			return nil
+		end
+
+		Tags.new(title, artist, album, track, time)
 	end
 
-	%w[string integer time event state].each {|name|
+	%w[string integer time state tags].each {|name|
 		define_method "get_#{name}" do
 			wait_for :data
 
@@ -135,8 +184,6 @@ class Controller
 		}
 	end
 
-	private :fire
-
 	def loop
 		while event = read_event
 			fire event
@@ -171,8 +218,8 @@ class Controller
 		@player ||= Player.new(self)
 	end
 
-	def status
-		@status ||= Status.new(self)
+	def status (live = false)
+		live ? (@status ||= Status::Live.new(self)) : Status.new(self)
 	end
 
 	def inspect

data/lib/moc/controller/player.rb

@@ -53,7 +53,7 @@ class Player
 			controller.send_command :get_queue
 			controller.wait_for     :data
 
-			until (item = controller.read_item).nil?
+			while item = controller.read_item
 				block.call(item)
 			end
 		end

data/lib/moc/controller/playlist.rb

@@ -11,30 +11,7 @@
 module Moc; class Controller
 
 class Playlist
-	class Item < Struct.new(:file, :title_tags, :tags, :mtime)
-		attr_reader :controller
-
-		def initialize (controller)
-			@controller = controller
-			
-			if (file = controller.read_string).empty?
-				@nil = true
-			else
-				@nil = false
-
-				super(
-					file,
-					controller.read_string,
-					controller.read_tags,
-					controller.read_time
-				)
-			end
-		end
-
-		def nil?
-			@nil
-		end
-	end
+	Item = Struct.new(:file, :title_tags, :tags, :mtime)
 end
 
 Move = Struct.new(:from, :to)

data/lib/moc/controller/status.rb

@@ -11,51 +11,119 @@
 module Moc; class Controller
 
 class Status
-	class Song
+	class Live
+		class Song
+			attr_reader :controller
+
+			def initialize (controller)
+				@controller = controller
+			end
+
+			def channels
+				controller.send_command :get_channels
+				controller.get_integer.to_i
+			end
+
+			def rate
+				controller.send_command :get_rate
+				controller.get_integer.to_i
+			end
+
+			def bitrate
+				controller.send_command :get_bitrate
+				controller.get_integer.to_i
+			end
+			
+			def average_bitrate
+				controller.send_command :get_avg_bitrate
+				controller.get_integer.to_i
+			end
+
+			def position
+				controller.send_command :get_ctime
+				controller.get_integer.to_i
+			end
+
+			def file
+				controller.send_command :get_sname
+				controller.get_string.to_s
+			end
+
+			def tags
+				path = file
+
+				if path.start_with?('http://') || path.start_with?('ftp://')
+					controller.send_command :get_tags
+					controller.get_tags
+				else
+					controller.send_command :get_file_tags
+					controller.send_string  path
+					controller.send_integer 0x01 | 0x02
+
+					controller.wait_for(:file_tags).tags
+				end
+			end
+
+			%w[title artist album track].each {|name|
+				define_method name do
+					tags.send name
+				end
+			}
+
+			def duration
+				tags.time
+			end
+
+			def inspect
+				"#<#{self.class.name}: track=#{track} title=#{title.inspect} artist=#{artist.inspect} album=#{album.inspect} channels=#{channels} bitrate=#{bitrate}(#{average_bitrate}) position=#{position}/#{duration}>"
+			end
+		end
+
 		attr_reader :controller
 
 		def initialize (controller)
 			@controller = controller
 		end
 
-		def channels
-			controller.send_command :get_channels
-			controller.get_integer
+		def == (other)
+			super || state == other
 		end
 
-		def rate
-			controller.send_command :get_rate
-			controller.get_integer
+		def state
+			controller.send_command :get_state
+			controller.get_state
 		end
 
-		def bitrate
-			controller.send_command :get_bitrate
-			controller.get_integer
-		end
-		
-		def average_bitrate
-			controller.send_command :get_avg_bitrate
-			controller.get_integer
+		def volume
+			controller.send_command :get_mixer
+			controller.get_integer.to_i
 		end
 
-		def time
-			controller.send_command :get_ctime
-			controller.get_integer
-		end
+		def song
+			return if self == :stop
 
-		def file
-			controller.send_command :get_sname
-			controller.get_string
+			Song.new(controller)
 		end
 
-		def tags
-			path = file
+		def to_sym
+			state.to_sym
+		end
+	end
 
-			controller.send_command :get_file_tags
-			controller.send_string  path
-			controller.send_integer 0x01 | 0x02
+	class Song
+		attr_reader :controller, :channels, :rate, :bitrate, :average_bitrate, :position, :file, :tags
 
-			controller.wait_for(:file_tags).tags
+		def initialize (controller)
+			@controller = controller
+			@internal   = Live::Song.new(controller)
+
+			@channels        = @internal.channels
+			@rate            = @internal.rate
+			@bitrate         = @internal.bitrate
+			@average_bitrate = @internal.average_bitrate
+			@position        = @internal.position
+			@file            = @internal.file
+			@tags            = @internal.tags
 		end
 
 		%w[title artist album track].each {|name|
@@ -64,35 +132,31 @@ class Status
 			end
 		}
 
+		def duration
+			tags.time
+		end
+
 		def inspect
-			"#<#{self.class.name}: track=#{track} title=#{title} artist=#{artist} album=#{album} channels=#{channels} bitrate=#{bitrate}(#{average_bitrate}) position=#{time}>"
+			"#<#{self.class.name}: track=#{track} title=#{title.inspect} artist=#{artist.inspect} album=#{album.inspect} channels=#{channels} bitrate=#{bitrate}(#{average_bitrate}) position=#{position}/#{duration}>"
 		end
 	end
 
-	attr_reader :controller
+	attr_reader :controller, :state, :volume, :song
 
 	def initialize (controller)
 		@controller = controller
-	end
-
-	def == (other)
-		state == other
-	end
+		@internal   = Live.new(controller)
 
-	def state
-		controller.send_command :get_state
-		controller.get_state
-	end
+		@state  = @internal.state
+		@volume = @internal.volume
 
-	def volume
-		controller.send_command :get_mixer
-		controller.get_integer
+		if state != :stop
+			@song = Song.new(controller)
+		end
 	end
 
-	def song
-		return if self == :stop
-
-		Song.new(controller)
+	def == (other)
+		super || state == other
 	end
 
 	def to_sym

data/lib/moc/controller/tags.rb

@@ -10,24 +10,7 @@
 
 module Moc; class Controller
 
-class Tags < Struct.new(:title, :artist, :album, :track, :time)
-	attr_reader :controller
-
-	def initialize (controller)
-		@controller = controller
-
-		super(
-			controller.read_string,
-			controller.read_string,
-			controller.read_string,
-			controller.read_integer,
-			controller.read_integer
-		)
-
-		controller.read_integer
-	end
-end
-
+Tags     = Struct.new(:title, :artist, :album, :track, :time)
 FileTags = Struct.new(:file, :tags)
 
 end; end

data/lib/moc/controller/toggle.rb

@@ -57,65 +57,25 @@ class Toggle
 		!controller.get_integer.zero?
 	end
 
-	# toggle the repeat status
-	def repeat
-		toggle :Repeat
-	end
-
-	# enable repeat
-	def repeat!
-		on :Repeat
-	end
-
-	# disable repeat
-	def no_repeat!
-		off :Repeat
-	end
+	%w[repeat shuffle auto_next].each {|name|
+		option_name = name.capitalize.gsub(/_(\w)/) { $1.upcase }
 
-	# check if repeat is enabled
-	def repeat?
-		on? :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
-
-	# disable shuffle
-	def no_shuffle!
-		off :Shuffle
-	end
+		define_method "no_#{name}!" do
+			off option_name
+		end
 
-	# check if shuffle is enabled
-	def shuffle?
-		on? :Shuffle
-	end
-
-	# toggle the auto next status
-	def auto_next
-		toggle :AutoNext
-	end
-
-	# enable auto next
-	def auto_next!
-		on :AutoNext
-	end
-
-	# disable auto next
-	def no_auto_next!
-		off :AutoNext
-	end
-
-	# check if auto next is enabled
-	def auto_next?
-		on? :AutoNext
-	end
+		define_method "#{name}?" do
+			on? option_name
+		end
+	}
 
 	# toggle the pause status
 	def pause

data/lib/moc/protocol.rb

@@ -17,8 +17,12 @@ module Type
 		raise 'no read has been implemented'
 	end
 
-	def unpack (text)
-		read(StringIO.new(text))
+	def unpack (text, eat = false)
+		io = StringIO.new(text)
+
+		read(io).tap {
+			text[0, io.tell] = '' if eat
+		}
 	end
 end
 

data/lib/moc/protocol/integer.rb

@@ -14,15 +14,15 @@ class Integer < BasicObject
 	extend Type
 
 	def self.read (io)
-		new(io.read(4).unpack('l').first)
+		new(io.read(4).unpack('i').first)
 	end
 
 	def initialize (value)
 		@internal = value
 	end
 
-	def respond_to_missing? (id, include_private = false)
-		@internal.respond_to? id, include_private
+	def respond_to? (id, include_private = false)
+		return true if id == :pack || @internal.respond_to?(id, include_private)
 	end
 
 	def method_missing (id, *args, &block)
@@ -34,7 +34,7 @@ class Integer < BasicObject
 	end
 
 	def pack
-		[self].pack('l')
+		[self].pack('i')
 	end
 end
 

data/lib/moc/protocol/time.rb

@@ -16,6 +16,10 @@ class Time < ::Time
 	def self.read (io)
 		at Integer.read(io)
 	end
+
+	def pack
+		Integer.new(to_i).pack
+	end
 end
 
 end; end

data/lib/moc/version.rb

@@ -10,6 +10,6 @@
 
 module Moc
 	def self.version
-		'2.5.0'
+		'2.5.0.1'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moc
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: meh@paranoici.org