Merge branch 'plugins'

Conflicts:
	README
	src/core.py
	src/tabs.py

1 files changed, 29 insertions, 0 deletions

diff --git a/plugins/mpd_client.py b/plugins/mpd_client.py
new file mode 100644
index 00000000..b56e0d7f
--- /dev/null
+++ b/plugins/mpd_client.py
@@ -0,0 +1,29 @@
+# a plugin adding a command to manipulate an MPD instance
+
+from plugin import BasePlugin
+from common import shell_split
+import mpd
+
+class Plugin(BasePlugin):
+    def init(self):
+        self.add_command('mpd', self.command_mpd, "Usage: /mpd [full]\nMpd: sends a message showing the current song of an MPD instance. If full is provided, the message is more verbose.", self.completion_mpd)
+
+    def command_mpd(self, args):
+        args = shell_split(args)
+        c = mpd.MPDClient()
+        c.connect(host=self.config.get('host', 'localhost'), port=self.config.get('port', '6600'))
+        password = self.config.get('password', '')
+        if password:
+            c.password(password)
+        current = c.currentsong()
+        current_time = float(c.status()['elapsed'])
+
+        s = '%(artist)s - %(title)s (%(album)s)' % current
+        if 'full' in args:
+            pourcentage = int(current_time / float(current['time']) * 10)
+            s += ' \x192[\x191' + '-'*(pourcentage-1) + '\x193+' + '\x191' + '-' * (10-pourcentage-1) + '\x192]\x19o'
+        if not self.core.send_message('%s' % (s,)):
+            self.core.information('Cannot send result (%s), this is not a conversation tab' % result)
+
+    def completion_mpd(self, the_input):
+        return the_input.auto_completion(['full'])