masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add default_hints parameter to Status object (#710)

Browse Source 
* Add default_hints paramter to Status object

This change adds a new parameter ("default_hints") to the Status object.
If specified, these hints will be applied to all subsequently added
modules (avoiding having to specify the same hint multiple times).

A default hint can be overridden at the module level (i.e. the hints
specified at the module level take precedence).
This commit is contained in:
Duncan Elliot 2019-02-13 13:01:56 +11:00 committed by chestm007
parent 68dbf4434b
commit bcd8f12b18
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
i3pystatus/core/__init__.py
View File

@ -60,12 +60,15 @@ class Status:
:param str logfile: Path to log file that will be used by i3pystatus. :param str logfile: Path to log file that will be used by i3pystatus.
:param tuple internet_check: Address of server that will be used to check for internet connection by :py:class:`.internet`. :param tuple internet_check: Address of server that will be used to check for internet connection by :py:class:`.internet`.
:param keep_alive: If True, modules that define the keep_alive flag will not be put to sleep when the status bar is hidden. :param keep_alive: If True, modules that define the keep_alive flag will not be put to sleep when the status bar is hidden.
:param dictionary default_hints: Dictionary of default hints to apply to all modules. Can be overridden at a module level.
""" """
def __init__(self, standalone=True, click_events=True, interval=1, def __init__(self, standalone=True, click_events=True, interval=1,
input_stream=None, logfile=None, internet_check=None, input_stream=None, logfile=None, internet_check=None,
keep_alive=False, logformat=DEFAULT_LOG_FORMAT): keep_alive=False, logformat=DEFAULT_LOG_FORMAT,
default_hints={"markup": "none"}):
self.standalone = standalone self.standalone = standalone
self.default_hints = default_hints
self.click_events = standalone and click_events self.click_events = standalone and click_events
input_stream = input_stream or sys.stdin input_stream = input_stream or sys.stdin
logger = logging.getLogger("i3pystatus") logger = logging.getLogger("i3pystatus")
@ -108,6 +111,13 @@ class Status:
if not module: if not module:
return return
# Merge the module's hints with the default hints
# and overwrite any duplicates with the hint from the module
merged_hints = self.default_hints.copy()
if 'hints' in kwargs:
merged_hints.update(kwargs['hints'])
kwargs['hints'] = merged_hints
try: try:
return self.modules.append(module, *args, **kwargs) return self.modules.append(module, *args, **kwargs)
except Exception as e: except Exception as e: