From 29d427e6a13f6c450c4ada57e1aa2e937b8312c9 Mon Sep 17 00:00:00 2001
From: Michael Kwardakov <kwardakov+github@gmail.com>
Date: Mon, 14 Jan 2019 11:43:21 +0300
Subject: [PATCH 1/2] Make mocp understand formats

Slight init optimization
---
 bumblebee/modules/mocp.py | 51 ++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/bumblebee/modules/mocp.py b/bumblebee/modules/mocp.py
index 3e3f3f0..16a117f 100644
--- a/bumblebee/modules/mocp.py
+++ b/bumblebee/modules/mocp.py
@@ -1,13 +1,26 @@
 # pylint: disable=C0111,R0903
 # -*- coding: utf-8 -*-
 
-"""Displays information about the current song in mocp.
+"""Displays information about the current song in mocp. Left click toggles play/pause.
 
 Requires the following executable:
     * mocp
 
 Parameters:
-    * mocp.format: Format string for the song information. Tag values can be put in curly brackets (i.e. {artist})
+    * mocp.format: Format string for the song information. Replace string sequences with the actual information:
+         %state     State
+         %file      File
+         %title     Title, includes track, artist, song title and album
+         %artist    Artist
+         %song      SongTitle
+         %album     Album
+         %tt        TotalTime
+         %tl        TimeLeft
+         %ts        TotalSec
+         %ct        CurrentTime
+         %cs        CurrentSec
+         %b         Bitrate
+         %r         Sample rate
 """
 
 import bumblebee.util
@@ -19,44 +32,26 @@ from bumblebee.output import scrollable
 
 class Module(bumblebee.engine.Module):
     def __init__(self, engine, config):
-        widgets = [
-            bumblebee.output.Widget(name="mocp.main", full_text=self.description),
-        ]
-        super(Module, self).__init__(engine, config, widgets)
+        super(Module, self).__init__(engine, config,
+                                     bumblebee.output.Widget(name="mocp.main", full_text=self.description)
+                                     )
 
-        engine.input.register_callback(widgets[0], button=bumblebee.input.LEFT_MOUSE,
+        engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE,
             cmd="mocp -G")
+        self._format = self.parameter("format", "%state %artist - %song | %ct/%tt")
         self._running = 0
 
     #@scrollable
     def description(self, widget):
-        if self._running == 1:
-            display = self._status + ": " + self._artist + " - " +  self._title + " | " + self._position + "/" + self._duration
-        else:
-            display = "Music On Console Player"
-        return display
+        return self._info if self._running == 1 else "Music On Console Player"
 
     def update(self, widgets):
         self._load_song()
 
     def _load_song(self):
         try:
-            info = bumblebee.util.execute("mocp -i")
-            for line in info.split("\n"):
-                if line.startswith("State:"):
-                    self._status = line.split(": ", 2)[1]
-                if line.startswith("Artist:"):
-                    self._artist = line.split(": ", 2)[1]
-                if line.startswith("Title:"):
-                    self._title = line.split(": ", 2)[1]
-                    self._title = self._title.split("(by ", 2)[0]
-                if line.startswith("CurrentTime:"):
-                    self._position = line.split(": ", 2)[1]
-                if line.startswith("TotalTime:"):
-                    self._duration = line.split(": ", 2)[1]
-                    self._running = 1
-                if line.startswith("State: STOP"):
-                    self._running = 0
+            self._info = bumblebee.util.execute("mocp -Q '" + self._format +  "'" )
+            self._running = 1
         except RuntimeError:
             self._running = 0
 

From 18b0e793cb32d1e731c94f3c99a39a212562c30d Mon Sep 17 00:00:00 2001
From: Michael Kwardakov <kwardakov+github@gmail.com>
Date: Mon, 14 Jan 2019 12:03:47 +0300
Subject: [PATCH 2/2] mocp toggles shuffle on right click

---
 bumblebee/modules/mocp.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bumblebee/modules/mocp.py b/bumblebee/modules/mocp.py
index 16a117f..1ab5b29 100644
--- a/bumblebee/modules/mocp.py
+++ b/bumblebee/modules/mocp.py
@@ -1,7 +1,7 @@
 # pylint: disable=C0111,R0903
 # -*- coding: utf-8 -*-
 
-"""Displays information about the current song in mocp. Left click toggles play/pause.
+"""Displays information about the current song in mocp. Left click toggles play/pause. Right click toggles shuffle.
 
 Requires the following executable:
     * mocp
@@ -38,6 +38,8 @@ class Module(bumblebee.engine.Module):
 
         engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE,
             cmd="mocp -G")
+        engine.input.register_callback(self, button=bumblebee.input.RIGHT_MOUSE,
+            cmd="mocp -t shuffle")
         self._format = self.parameter("format", "%state %artist - %song | %ct/%tt")
         self._running = 0