anyplayer 1.1.2 → 1.2.1

data/lib/anyplayer/players/itunes_mac.rb

@@ -1,66 +1,71 @@
 class Anyplayer::ItunesMac < Anyplayer::Player
   def play
-    itunes 'play'
+    itunes "play"
   end
 
   def pause
-    itunes 'pause'
+    itunes "pause"
   end
 
   def playpause
-    itunes 'playpause'
+    itunes "playpause"
   end
 
   def prev
-    itunes 'previous track'
+    itunes "previous track"
     super
   end
 
   def next
-    itunes 'next track'
+    itunes "next track"
     super
   end
 
   def voldown
-    itunes 'set sound volume to sound volume - 10'
+    itunes "set sound volume to sound volume - 10"
   end
 
   def volup
-    itunes 'set sound volume to sound volume + 10'
+    itunes "set sound volume to sound volume + 10"
   end
 
   def volume
-    itunes 'return sound volume'
+    itunes "return sound volume"
   end
 
   def track
-    itunes 'return name of current track'
+    itunes "return name of current track"
   end
 
   def artist
-    itunes 'return artist of current track'
+    itunes "return artist of current track"
   end
 
   def album
-    itunes 'return album of current track'
+    itunes "return album of current track"
   end
 
   def playing?
-    playing = itunes 'return player state is playing'
+    playing = itunes "return player state is playing"
     playing == "true"
   end
 
   def launched?
-    nb = %x(osascript -e 'tell app "System Events" to count (every process whose name is "iTunes")' 2>/dev/null).rstrip
-    nb.match(/^\d+/) and nb.to_i > 0 ? true : false
+    %x(osascript -e 'app "iTunes" is running').rstrip == "true"
   end
 
   def name
     "iTunes Mac"
   end
 
+  def platforms
+    [:mac]
+  end
+
+
   private
-    def itunes(command)
-      %x(osascript -e 'tell app "iTunes" to #{command}').rstrip
-    end
+
+  def itunes(command)
+    %x(osascript -e 'tell app "iTunes" to #{command}').rstrip
+  end
 end

data/lib/anyplayer/players/itunes_windows.rb

@@ -1,7 +1,7 @@
 begin
-  require 'win32ole'
+  require "win32ole"
 rescue LoadError => e
-  raise LoadError.new("#{e.message} -- You probably aren't on Windows")
+  raise LoadError.new("#{e.message} - You probably aren't on Windows")
 end
 
 class Anyplayer::ItunesWindows < Anyplayer::Player
@@ -59,10 +59,13 @@ class Anyplayer::ItunesWindows < Anyplayer::Player
     "iTunes Windows"
   end
 
+  def platforms
+    [:windows]
+  end
+
   private
 
-    def itunes
-      itunes ||= WIN32OLE.new("iTunes.Application")
-    end
+  def itunes
+    itunes ||= WIN32OLE.new("iTunes.Application")
+  end
 end
-

data/lib/anyplayer/players/mpd.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
 begin
-  require 'ruby-mpd'
+  require "ruby-mpd"
 rescue LoadError => e
-  raise LoadError.new "#{e.message} — please install ruby-mpd gem"
+  raise LoadError.new "#{e.message} — Please install the ruby-mpd gem"
 end
 
-
 class Anyplayer::Mpd < Anyplayer::Player
   def initialize
     @mpc = false
@@ -51,15 +50,18 @@ class Anyplayer::Mpd < Anyplayer::Player
   end
 
   def track
-    mpc.current_song && mpc.current_song.title
+    song = current_song
+    return unless song
+
+    song.title || File.basename(song.file)
   end
 
   def artist
-    mpc.current_song && mpc.current_song.artist
+    current_song&.artist
   end
 
   def album
-    mpc.current_song && mpc.current_song.album
+    current_song&.album
   end
 
   def launched?
@@ -67,10 +69,15 @@ class Anyplayer::Mpd < Anyplayer::Player
   end
 
   def host
-    ENV['MPD_HOST'] || super
+    ENV["MPD_HOST"] || super
   end
 
   private
+
+  def current_song
+    mpc.current_song
+  end
+
   def connect
     @mpc ||= MPD.new
     @mpc.connect
@@ -83,4 +90,3 @@ class Anyplayer::Mpd < Anyplayer::Player
     @mpc
   end
 end
-

data/lib/anyplayer/players/noplayer.rb

@@ -1,5 +1,6 @@
 class Anyplayer::Noplayer < Anyplayer::Player
-  def playpause
+  def playing?
+    true
   end
 
   def play
@@ -42,4 +43,3 @@ class Anyplayer::Noplayer < Anyplayer::Player
     true
   end
 end
-

data/lib/anyplayer/players/rdio_mac.rb

@@ -1,66 +1,70 @@
 class Anyplayer::RdioMac < Anyplayer::Player
   def play
-    rdio 'play'
+    rdio "play"
   end
 
   def pause
-    rdio 'pause'
+    rdio "pause"
   end
 
   def playpause
-    rdio 'playpause'
+    rdio "playpause"
   end
 
   def prev
-    rdio 'previous track'
+    rdio "previous track"
     super
   end
 
   def next
-    rdio 'next track'
+    rdio "next track"
     super
   end
 
   def voldown
-    rdio 'set sound volume to sound volume - 10'
+    rdio "set sound volume to sound volume - 10"
   end
 
   def volup
-    rdio 'set sound volume to sound volume + 10'
+    rdio "set sound volume to sound volume + 10"
   end
 
   def volume
-    rdio 'return sound volume'
+    rdio "return sound volume"
   end
 
   def track
-    rdio 'return name of current track'
+    rdio "return name of current track"
   end
 
   def artist
-    rdio 'return artist of current track'
+    rdio "return artist of current track"
   end
 
   def album
-    rdio 'return album of current track'
+    rdio "return album of current track"
   end
 
   def playing?
-    playing = rdio 'return player state is playing'
+    playing = rdio "return player state is playing"
     playing == "true"
   end
 
   def launched?
-    nb = %x(osascript -e 'tell app "System Events" to count (every process whose name is "rdio")' 2>/dev/null).rstrip
-    nb.match(/^\d+/) and nb.to_i > 0 ? true : false
+    %x(osascript -e 'app "rdio" is running').rstrip == "true"
   end
 
   def name
     "Rdio Mac"
   end
 
+  def platforms
+    [:mac]
+  end
+
   private
-    def rdio(command)
-      %x(osascript -e 'tell app "rdio" to #{command}').rstrip
-    end
-end
+
+  def rdio(command)
+    %x(osascript -e 'tell app "rdio" to #{command}').rstrip
+  end
+end

data/lib/anyplayer/players/rhythmbox.rb

@@ -1,48 +1,48 @@
 class Anyplayer::Rhythmbox < Anyplayer::Player
   def playpause
-    rhythmbox 'play-pause'
+    rhythmbox "play-pause"
   end
 
   def play
-    rhythmbox 'play'
+    rhythmbox "play"
   end
 
   def pause
-    rhythmbox 'pause'
+    rhythmbox "pause"
   end
 
   def prev
-    rhythmbox 'previous'
+    rhythmbox "previous"
     super
   end
 
   def next
-    rhythmbox 'next'
+    rhythmbox "next"
     super
   end
 
   def voldown
-    rhythmbox 'volume-down'
+    rhythmbox "volume-down"
   end
 
   def volup
-    rhythmbox 'volume-up'
+    rhythmbox "volume-up"
   end
 
   def volume
-    rhythmbox 'print-volume'
+    rhythmbox "print-volume"
   end
 
   def track
-    rhythmbox 'print-playing-format=%tt'
+    rhythmbox "print-playing-format=%tt"
   end
 
   def artist
-    rhythmbox 'print-playing-format=%ta'
+    rhythmbox "print-playing-format=%ta"
   end
 
   def album
-    rhythmbox 'print-playing-format=%at'
+    rhythmbox "print-playing-format=%at"
   end
 
   def launched?
@@ -50,8 +50,8 @@ class Anyplayer::Rhythmbox < Anyplayer::Player
   end
 
   private
-    def rhythmbox(command)
-      %x(rhythmbox-client --no-start --#{command}).rstrip
-    end
-end
 
+  def rhythmbox(command)
+    %x(rhythmbox-client --no-start --#{command}).rstrip
+  end
+end

data/lib/anyplayer/players/spotify_mac.rb

@@ -1,66 +1,70 @@
 class Anyplayer::SpotifyMac < Anyplayer::Player
   def play
-    spotify 'play'
+    spotify "play"
   end
 
   def pause
-    spotify 'pause'
+    spotify "pause"
   end
 
   def playpause
-    spotify 'playpause'
+    spotify "playpause"
   end
 
   def prev
-    spotify 'previous track'
+    spotify "previous track"
     super
   end
 
   def next
-    spotify 'next track'
+    spotify "next track"
     super
   end
 
   def voldown
-    spotify 'set sound volume to sound volume - 10'
+    spotify "set sound volume to sound volume - 10"
   end
 
   def volup
-    spotify 'set sound volume to sound volume + 10'
+    spotify "set sound volume to sound volume + 10"
   end
 
   def volume
-    spotify 'return sound volume'
+    spotify "return sound volume"
   end
 
   def track
-    spotify 'return name of current track'
+    spotify "return name of current track"
   end
 
   def artist
-    spotify 'return artist of current track'
+    spotify "return artist of current track"
   end
 
   def album
-    spotify 'return album of current track'
+    spotify "return album of current track"
   end
 
   def playing?
-    playing = spotify 'return player state is playing'
+    playing = spotify "return player state is playing"
     playing == "true"
   end
 
   def launched?
-    nb = %x(osascript -e 'tell app "System Events" to count (every process whose name is "Spotify")' 2>/dev/null).rstrip
-    nb.match(/^\d+/) and nb.to_i > 0 ? true : false
+    %x(osascript -e 'app "Spotify" is running').rstrip == "true"
   end
 
   def name
     "Spotify Mac"
   end
 
+  def platforms
+    [:mac]
+  end
+
   private
-    def spotify(command)
-      %x(osascript -e 'tell app "spotify" to #{command}').rstrip
-    end
+
+  def spotify(command)
+    %x(osascript -e 'tell app "Spotify" to #{command}').rstrip
+  end
 end

data/lib/anyplayer/players/xmms2.rb

@@ -1,77 +1,87 @@
 class Anyplayer::Xmms2 < Anyplayer::Player
   def playpause
-    xmms2 'toggle'
+    xmms2 "toggle"
   end
 
   def play
-    xmms2 'play'
+    xmms2 "play"
   end
 
   def pause
-    xmms2 'pause'
+    xmms2 "pause"
   end
 
   def prev
-    xmms2 'prev'
+    xmms2 "prev"
     super
   end
 
   def next
-    xmms2 'next'
+    xmms2 "next"
     super
   end
 
   def voldown
-    current = volume.to_i
-    new_volume = (current < 11 ? 0 : current - 10)
-    xmms2 "server volume #{new_volume}"
+    set_volume volume - 10
   end
 
   def volup
-    current = volume.to_i
-    new_volume = (current > 89 ? 100 : current + 10)
-    xmms2 "server volume #{new_volume}"
+    set_volume volume + 10
   end
 
   def volume
     # currently just the first (left?) channel
-    xmms2('server volume').split("\n").first.sub(/([^0-9]*)/, '')
-    $1
+    xmms2("server volume").split("\n").first.sub(/([^0-9]*)/, "").to_i
   end
 
   def track
-    xmms2 "status -f '${title}'"
+    xmms2 "current -f '${title}'"
   end
 
   def artist
-    xmms2 "status -f '${artist}'"
+    xmms2 "current -f '${artist}'"
   end
 
   def album
-    xmms2 "status -f '${album}'"
+    xmms2 "current -f '${album}'"
   end
 
   def playing?
-    xmms2("status -f '${playback_status}'") == "Playing"
+    xmms2("current -f '${playback_status}'") == "Playing"
   end
 
   def paused?
-    xmms2("status -f '${playback_status}'") == "Paused"
+    xmms2("current -f '${playback_status}'") == "Paused"
   end
 
   def launched?
     # xmms2 autolaunches the daemon, so this should always be true
-    %x(xmms2 status 2> /dev/null)
+    %x(xmms2 current 2> /dev/null)
     $? == 0
   end
 
   def host
-    ENV['XMMS_PATH'] || super
+    ENV["XMMS_PATH"] || super
+  end
+
+  def platforms
+    [:unix, :linux]
   end
 
   private
-    def xmms2(command)
-      %x(xmms2 #{command}).split("\n").first.strip
-    end
-end
 
+  def xmms2(command)
+    ret = %x(xmms2 #{command}).split("\n").first
+    ret ? ret.strip : ""
+  end
+
+  def set_volume(num)
+    num = if num < 0
+            0
+          elsif num > 100
+            100
+          end
+
+    xmms2 "server volume #{num}"
+  end
+end