cmus 2.0.4.5 → 2.0.4.6

data/bin/cmus-remote.rb

@@ -95,14 +95,12 @@ if options[:status]
 	controller.status.tap {|status|
 		puts "status #{status.to_sym}"
 		puts "file #{status.path}" if status.path
-		puts "duration #{status.duration}" if status.duration
-		puts "position #{status.position}" if status.position
-
-		if status.song
-			status.song.marshal_dump.each {|name, value|
-				puts "tag #{name} #{value}"
-			}
-		end
+		puts "duration #{status.song.duration}" if status.song.duration
+		puts "position #{status.song.position}" if status.song.position
+
+		status.song.tags.marshal_dump.each {|name, value|
+			puts "tag #{name} #{value}"
+		}
 
 		status.settings.marshal_dump.each {|name, value|
 			puts "set #{name} #{value}"

data/lib/cmus/controller/status.rb

@@ -13,37 +13,60 @@ require 'ostruct'
 module Cmus; class Controller
 
 class Status
-	attr_reader :controller, :path, :duration, :position, :song, :settings
+	class Song
+		attr_reader   :controller, :tags
+		attr_accessor :file, :position, :duration
+
+		def initialize (controller)
+			@tags = OpenStruct.new
+		end
+
+		%w[title artist album].each {|name|
+			define_method name do
+				tags.__send__ name
+			end
+		}
+
+		def track
+			tags.tracknumber
+		end
+	end
+
+	attr_reader :controller, :song, :settings
 
 	def initialize (controller)
 		@controller = controller
 
-		@song     = OpenStruct.new
+		@song     = Song.new(controller)
 		@settings = OpenStruct.new
 
 		controller.send 'status'
-		controller.wait_for_data.buffer.each_line {|line|
+		controller.wait_for_data.each_line {|line|
 			type, data = line.chomp.split ' ', 2
 
 			next unless type
 
 			case type.to_sym
 			when :status
-				@status = data.to_sym
+				@status = case data.to_sym
+					when :stopped then :STOP
+					when :paused  then :PAUSE
+					else               :PLAY
+				end
 
 			when :file
-				@path = data
+				@song.file = data
 
 			when :duration
-				@duration = data.to_i
+				@song.duration = data.to_i
 
 			when :position
-				@position = data.to_i
+				@song.position = data.to_i
 
 			when :tag
 				name, data = data.split ' ', 2
 
-				@song.send "#{name}=", data
+				@song.tags.send "#{name}=", data
 
 			when :set
 				name, data = data.split ' ', 2
@@ -64,9 +87,7 @@ class Status
 			end
 		}
 
-		if @song.marshal_dump.empty?
-			@song = nil
-		end
+		@song = nil if self == :stop
 	end
 
 	def volume
@@ -74,7 +95,7 @@ class Status
 	end
 
 	def == (other)
-		super || to_sym == other
+		super || to_sym.downcase == other.to_sym.downcase
 	end
 
 	def to_sym

data/lib/cmus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmus
 version: !ruby/object:Gem::Version
-  version: 2.0.4.5
+  version: 2.0.4.6
   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