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

[modules/redshift] No digits for transition anymore

Browse source 
Having 2 digits *after* the comma for transitions seems excessive -
truncate value at the digit sign.
This commit is contained in:
tobi-wan-kenobi 2020-04-12 20:36:32 +02:00
parent d87b18a824
commit 0306760eb3
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/core/redshift.py
View file

@ -13,13 +13,9 @@ Parameters:
* redshift.lon : longitude if location is set to 'manual' * redshift.lon : longitude if location is set to 'manual'
""" """
import re
import threading import threading
import logging import requests
log = logging.getLogger(__name__)
try:
import requests
except ImportError:
log.warning('unable to import module "requests": Location via IP disabled')
import core.module import core.module
import core.widget import core.widget
@ -64,7 +60,8 @@ def get_redshift_value(module):
widget.set('state', 'night') widget.set('state', 'night')
else: else:
widget.set('state', 'transition') widget.set('state', 'transition')
widget.set('transition', ' '.join(line.split(' ')[2:])) match = re.search(r'(\d+)\.\d+% ([a-z]+)', line)
widget.set('transition', '({}% {})'.format(match.group(1), match.group(2)))
core.event.trigger('update', [ widget.module().id ], redraw_only=True) core.event.trigger('update', [ widget.module().id ], redraw_only=True)
class Module(core.module.Module): class Module(core.module.Module):
@ -73,7 +70,7 @@ class Module(core.module.Module):
widget = core.widget.Widget(self.text) widget = core.widget.Widget(self.text)
super().__init__(config, widget) super().__init__(config, widget)
self.__thread = threading.Thread(target=get_redshift_value, args=(self,)) self.__thread = None
if self.parameter('location', '') == 'ipinfo': if self.parameter('location', '') == 'ipinfo':
# override lon/lat with ipinfo # override lon/lat with ipinfo
@ -97,8 +94,9 @@ class Module(core.module.Module):
return val return val
def update(self): def update(self):
if self.__thread.isAlive(): if self.__thread is not None and self.__thread.isAlive():
return return
self.__thread = threading.Thread(target=get_redshift_value, args=(self,))
self.__thread.start() self.__thread.start()
def state(self, widget): def state(self, widget):