l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[modules/deadbeef] Update to latest API

Browse source
This commit is contained in:
tobi-wan-kenobi 2020-04-30 20:34:34 +02:00
parent 06f229a339
commit 289a4bad41
2 changed files with 33 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
modules/contrib/deadbeef.py
View file

@ -34,46 +34,45 @@ Parameters:
""" """
import sys import sys
import bumblebee.input
import bumblebee.output
import bumblebee.engine
from bumblebee.output import scrollable
try:
import subprocess import subprocess
except ImportError: import logging
pass
class Module(bumblebee.engine.Module): import core.module
def __init__(self, engine, config): import core.widget
super(Module, self).__init__(engine, config, import core.input
bumblebee.output.Widget(full_text=self.deadbeef) import core.decorators
)
buttons = {'LEFT_CLICK': bumblebee.input.LEFT_MOUSE, import util.cli
'RIGHT_CLICK': bumblebee.input.RIGHT_MOUSE, import util.format
'MIDDLE_CLICK': bumblebee.input.MIDDLE_MOUSE,
'SCROLL_UP': bumblebee.input.WHEEL_UP, class Module(core.module.Module):
'SCROLL_DOWN': bumblebee.input.WHEEL_DOWN, def __init__(self, config, theme):
super().__init__(config, theme, core.widget.Widget(self.deadbeef))
buttons = {'LEFT_CLICK': core.input.LEFT_MOUSE,
'RIGHT_CLICK': core.input.RIGHT_MOUSE,
'MIDDLE_CLICK': core.input.MIDDLE_MOUSE,
'SCROLL_UP': core.input.WHEEL_UP,
'SCROLL_DOWN': core.input.WHEEL_DOWN,
} }
self._song = '' self._song = ''
self._format = self.parameter('format', '{artist} - {title}') self._format = self.parameter('format', '{artist} - {title}')
self._tf_format = self.parameter('tf_format', '') self._tf_format = self.parameter('tf_format', '')
self._show_tf_when_stopped = bool(self.parameter('tf_format_if_stopped', '')) self._show_tf_when_stopped = util.format.asbool(self.parameter('tf_format_if_stopped', False))
prev_button = self.parameter('previous', 'LEFT_CLICK') prev_button = self.parameter('previous', 'LEFT_CLICK')
next_button = self.parameter('next', 'RIGHT_CLICK') next_button = self.parameter('next', 'RIGHT_CLICK')
pause_button = self.parameter('pause', 'MIDDLE_CLICK') pause_button = self.parameter('pause', 'MIDDLE_CLICK')
self.now_playing = ['deadbeef', '--nowplaying', '%a;%t;%b;%l;%n;%y;%c;%r;%e'] self.now_playing = 'deadbeef --nowplaying %a;%t;%b;%l;%n;%y;%c;%r;%e'
self.now_playing_tf = ['deadbeef', '--nowplaying-tf', ''] self.now_playing_tf = 'deadbeef --nowplaying-tf '
cmd = 'deadbeef ' cmd = 'deadbeef '
engine.input.register_callback(self, button=buttons[prev_button], core.input.register(self, button=buttons[prev_button],
cmd=cmd + '--prev') cmd=cmd + '--prev')
engine.input.register_callback(self, button=buttons[next_button], core.input.register(self, button=buttons[next_button],
cmd=cmd + '--next') cmd=cmd + '--next')
engine.input.register_callback(self, button=buttons[pause_button], core.input.register(self, button=buttons[pause_button],
cmd=cmd + '--play-pause') cmd=cmd + '--play-pause')
# modify the tf_format if we don't want it to show on stop # modify the tf_format if we don't want it to show on stop
@ -83,35 +82,36 @@ class Module(bumblebee.engine.Module):
if self._tf_format and not self._show_tf_when_stopped: if self._tf_format and not self._show_tf_when_stopped:
self._tf_format = '$if($or(%isplaying%,%ispaused%),{query})'.format(query=self._tf_format) self._tf_format = '$if($or(%isplaying%,%ispaused%),{query})'.format(query=self._tf_format)
@scrollable @core.decorators.scrollable
def deadbeef(self, widget): def deadbeef(self, widget):
return self.string_song return self.string_song
def hidden(self): def hidden(self):
return self.string_song == '' return self.string_song == ''
def update(self, widgets): def update(self):
widgets = self.widgets()
try: try:
if self._tf_format == '': # no tf format set, use the old style if self._tf_format == '': # no tf format set, use the old style
return self.update_standard(widgets) return self.update_standard(widgets)
return self.update_tf(widgets) return self.update_tf(widgets)
except Exception: except Exception as e:
logging.exception(e)
self._song = 'error' self._song = 'error'
def update_tf(self, widgets): def update_tf(self, widgets):
## ensure that deadbeef is actually running ## ensure that deadbeef is actually running
## easiest way to do this is to check --nowplaying for ## easiest way to do this is to check --nowplaying for
## the string 'nothing' ## the string 'nothing'
if read_process(self.now_playing) == 'nothing': if util.cli.execute(self.now_playing) == 'nothing':
self._song = '' self._song = ''
return return
## perform the actual query -- these can be much more sophisticated ## perform the actual query -- these can be much more sophisticated
self.now_playing_tf[-1] = self._tf_format data = util.cli.execute(self.now_playing_tf + self._tf_format)
data = read_process(self.now_playing_tf)
self._song = data self._song = data
def update_standard(self, widgets): def update_standard(self, widgets):
data = read_process(self.now_playing) data = util.cli.execute(self.now_playing)
if data == 'nothing': if data == 'nothing':
self._song = '' self._song = ''
else: else:
@ -136,8 +136,4 @@ Returns the current song as a string, either as a unicode() (Python <
return unicode(self._song) return unicode(self._song)
return str(self._song) return str(self._song)
def read_process(command):
proc = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
return proc.stdout.read()
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

4
util/cli.py
View file

@ -3,11 +3,11 @@ import shlex
import subprocess import subprocess
import logging import logging
def execute(cmd, wait=True, ignore_errors=False, env=None): def execute(cmd, wait=True, ignore_errors=False, include_stderr=False, env=None):
args = shlex.split(cmd) args = shlex.split(cmd)
logging.debug(cmd) logging.debug(cmd)
try: try:
proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env) proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT if include_stderr else subprocess.PIPE, env=env)
except FileNotFoundError as e: except FileNotFoundError as e:
raise RuntimeError('{} not found'.format(cmd)) raise RuntimeError('{} not found'.format(cmd))