diff --git a/.coveragerc b/.coveragerc
index 4029b48d47cc9459718e2bff5e0b72a576da45fd..00e10da81100a1d8c04ad9d8178041ace2feb9c9 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -31,6 +31,7 @@ omit =
homeassistant/components/keyboard.py
homeassistant/components/light/hue.py
homeassistant/components/media_player/cast.py
+ homeassistant/components/media_player/mpd.py
homeassistant/components/notify/instapush.py
homeassistant/components/notify/nma.py
homeassistant/components/notify/pushbullet.py
diff --git a/homeassistant/components/media_player/__init__.py b/homeassistant/components/media_player/__init__.py
index 2b555faa5030f46366f66b657b4941f46d2c0164..1f647abe9fef87db940db477b6c2a22180ea3de2 100644
--- a/homeassistant/components/media_player/__init__.py
+++ b/homeassistant/components/media_player/__init__.py
@@ -2,7 +2,7 @@
homeassistant.components.media_player
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Component to interface with various media players
+Component to interface with various media players.
"""
import logging
@@ -40,6 +40,7 @@ ATTR_MEDIA_ALBUM = 'media_album'
ATTR_MEDIA_IMAGE_URL = 'media_image_url'
ATTR_MEDIA_VOLUME = 'media_volume'
ATTR_MEDIA_DURATION = 'media_duration'
+ATTR_MEDIA_DATE = 'media_date'
MEDIA_STATE_UNKNOWN = 'unknown'
MEDIA_STATE_PLAYING = 'playing'
diff --git a/homeassistant/components/media_player/mpd.py b/homeassistant/components/media_player/mpd.py
new file mode 100644
index 0000000000000000000000000000000000000000..53faa37a605a6602fc2072d6632a749fc84e73d8
--- /dev/null
+++ b/homeassistant/components/media_player/mpd.py
@@ -0,0 +1,195 @@
+"""
+homeassistant.components.media_player.mpd
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Provides functionality to interact with a Music Player Daemon.
+
+Configuration:
+
+To use MPD you will need to add something like the following to your
+config/configuration.yaml
+
+media_player:
+ platform: mpd
+ server: 127.0.0.1
+ port: 6600
+ location: bedroom
+
+Variables:
+
+server
+*Required
+IP address of the Music Player Daemon. Example: 192.168.1.32
+
+port
+*Optional
+Port of the Music Player Daemon, defaults to 6600. Example: 6600
+
+location
+*Optional
+Location of your Music Player Daemon.
+"""
+import logging
+import socket
+
+from homeassistant.components.media_player import (
+ MediaPlayerDevice, STATE_NO_APP, ATTR_MEDIA_STATE,
+ ATTR_MEDIA_CONTENT_ID, ATTR_MEDIA_TITLE, ATTR_MEDIA_ARTIST,
+ ATTR_MEDIA_ALBUM, ATTR_MEDIA_DATE, ATTR_MEDIA_DURATION,
+ ATTR_MEDIA_VOLUME, MEDIA_STATE_PAUSED, MEDIA_STATE_PLAYING,
+ MEDIA_STATE_STOPPED, MEDIA_STATE_UNKNOWN)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices, discovery_info=None):
+ """ Sets up the MPD platform. """
+
+ daemon = config.get('server', None)
+ port = config.get('port', 6600)
+ location = config.get('location', 'MPD')
+
+ try:
+ from mpd import MPDClient
+
+ except ImportError:
+ _LOGGER.exception(
+ "Unable to import mpd2. "
+ "Did you maybe not install the 'python-mpd2' package?")
+
+ return False
+
+ # pylint: disable=no-member
+ try:
+ mpd_client = MPDClient()
+ mpd_client.connect(daemon, port)
+ mpd_client.close()
+ mpd_client.disconnect()
+ except socket.error:
+ _LOGGER.error(
+ "Unable to connect to MPD. "
+ "Please check your settings")
+
+ return False
+
+ mpd = []
+ mpd.append(MpdDevice(daemon, port, location))
+ add_devices(mpd)
+
+
+class MpdDevice(MediaPlayerDevice):
+ """ Represents a MPD server. """
+
+ def __init__(self, server, port, location):
+ from mpd import MPDClient
+
+ self.server = server
+ self.port = port
+ self._name = location
+ self.state_attr = {ATTR_MEDIA_STATE: MEDIA_STATE_STOPPED}
+
+ self.client = MPDClient()
+ self.client.timeout = 10
+ self.client.idletimeout = None
+ self.client.connect(self.server, self.port)
+
+ @property
+ def name(self):
+ """ Returns the name of the device. """
+ return self._name
+
+ # pylint: disable=no-member
+ @property
+ def state(self):
+ """ Returns the state of the device. """
+ status = self.client.status()
+
+ if status is None:
+ return STATE_NO_APP
+ else:
+ return self.client.currentsong()['artist']
+
+ @property
+ def media_state(self):
+ """ Returns the media state. """
+ media_controller = self.client.status()
+
+ if media_controller['state'] == 'play':
+ return MEDIA_STATE_PLAYING
+ elif media_controller['state'] == 'pause':
+ return MEDIA_STATE_PAUSED
+ elif media_controller['state'] == 'stop':
+ return MEDIA_STATE_STOPPED
+ else:
+ return MEDIA_STATE_UNKNOWN
+
+ # pylint: disable=no-member
+ @property
+ def state_attributes(self):
+ """ Returns the state attributes. """
+ status = self.client.status()
+ current_song = self.client.currentsong()
+
+ if not status and not current_song:
+ state_attr = {}
+
+ if current_song['id']:
+ state_attr[ATTR_MEDIA_CONTENT_ID] = current_song['id']
+
+ if current_song['date']:
+ state_attr[ATTR_MEDIA_DATE] = current_song['date']
+
+ if current_song['title']:
+ state_attr[ATTR_MEDIA_TITLE] = current_song['title']
+
+ if current_song['time']:
+ state_attr[ATTR_MEDIA_DURATION] = current_song['time']
+
+ if current_song['artist']:
+ state_attr[ATTR_MEDIA_ARTIST] = current_song['artist']
+
+ if current_song['album']:
+ state_attr[ATTR_MEDIA_ALBUM] = current_song['album']
+
+ state_attr[ATTR_MEDIA_VOLUME] = status['volume']
+
+ return state_attr
+
+ def turn_off(self):
+ """ Service to exit the running MPD. """
+ self.client.stop()
+
+ def volume_up(self):
+ """ Service to send the MPD the command for volume up. """
+ current_volume = self.client.status()['volume']
+
+ if int(current_volume) <= 100:
+ self.client.setvol(int(current_volume) + 5)
+
+ def volume_down(self):
+ """ Service to send the MPD the command for volume down. """
+ current_volume = self.client.status()['volume']
+
+ if int(current_volume) >= 0:
+ self.client.setvol(int(current_volume) - 5)
+
+ def media_play_pause(self):
+ """ Service to send the MPD the command for play/pause. """
+ self.client.pause()
+
+ def media_play(self):
+ """ Service to send the MPD the command for play/pause. """
+ self.client.start()
+
+ def media_pause(self):
+ """ Service to send the MPD the command for play/pause. """
+ self.client.pause()
+
+ def media_next_track(self):
+ """ Service to send the MPD the command for next track. """
+ self.client.next()
+
+ def media_prev_track(self):
+ """ Service to send the MPD the command for previous track. """
+ self.client.previous()
diff --git a/requirements.txt b/requirements.txt
index 624cd3797cd8374a1a24a4887eaca42746a41bc9..24e1f8ff921c178bda67549034895a6edbb971e7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,56 +1,56 @@
-# required for Home Assistant core
+# Required for Home Assistant core
requests>=2.0
pyyaml>=3.11
pytz>=2015.2
-# optional, needed for specific components
+# Optional, needed for specific components
-# discovery
+# Discovery platform (discovery)
zeroconf>=0.16.0
-# sun
+# Sun (sun)
pyephem>=3.7
-# lights.hue
+# Philips Hue library (lights.hue)
phue>=0.8
-# lights.limitlessled
+# Limitlessled/Easybulb/Milight library (lights.limitlessled)
ledcontroller>=1.0.7
-# media_player.cast
+# Chromecast bindings (media_player.cast)
pychromecast>=0.6.2
-# keyboard
+# Keyboard (keyboard)
pyuserinput>=0.1.9
-# switch.tellstick, sensor.tellstick
+# Tellstick bindings (*.tellstick)
tellcore-py>=1.0.4
-# device_tracker.nmap
+# Nmap bindings (device_tracker.nmap)
python-libnmap>=0.6.2
-# notify.pushbullet
+# PushBullet bindings (notify.pushbullet)
pushbullet.py>=0.7.1
-# thermostat.nest
+# Nest Thermostat bindings (thermostat.nest)
python-nest>=2.1
-# z-wave
+# Z-Wave (*.zwave)
pydispatcher>=2.0.5
-# isy994
+# ISY994 bindings (*.isy994
PyISY>=1.0.2
-# sensor.systemmonitor
+# PSutil (sensor.systemmonitor)
psutil>=2.2.1
-# pushover notifications
+# Pushover bindings (notify.pushover)
python-pushover>=0.2
-# Transmission Torrent Client
+# Transmission Torrent Client (*.transmission)
transmissionrpc>=0.11
-# OpenWeatherMap Web API
+# OpenWeatherMap Web API (sensor.openweathermap)
pyowm>=2.2.0
# XMPP Bindings (notify.xmpp)
@@ -58,3 +58,6 @@ sleekxmpp>=1.3.1
# Blockchain (sensor.bitcoin)
blockchain>=1.1.2
+
+# MPD Bindings (media_player.mpd)
+python-mpd2>=0.5.4