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

Refactor run_command_endpoint into class

Browse Source
This commit is contained in:
enkore 2013-10-23 21:06:52 +02:00
parent 266084801d
commit 2895aa44cf
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
i3pystatus/core/__init__.py
View File

@ -8,28 +8,43 @@ from i3pystatus.core import io, util
from i3pystatus.core.modules import Module, START_HOOKS from i3pystatus.core.modules import Module, START_HOOKS
class Status: class CommandEndpoint:
def __init__(self, modules, io_handler_factory):
self.modules = modules
self.io_handler_factory = io_handler_factory
self.thread = Thread(target=self._command_endpoint)
self.thread.daemon = True
def start(self):
self.thread.start()
def _command_endpoint(self):
for command in self.io_handler_factory().read():
target_module = self.modules.get_module_by_id(command["instance"])
if target_module:
target_module.on_click(command["button"])
class Status:
""" """
The main class used for registering modules and managing I/O The main class used for registering modules and managing I/O
:param standalone: Wether i3pystatus should read i3status-compatible input from `input_stream` :param standalone: Whether i3pystatus should read i3status-compatible input from `input_stream`
:param interval: Update interval in seconds :param interval: Update interval in seconds
:param input_stream: A file-like object that provides the input stream, if `standalone` is False. :param input_stream: A file-like object that provides the input stream, if `standalone` is False.
""" """
def __init__(self, standalone=False, interval=1, input_stream=sys.stdin): def __init__(self, standalone=False, interval=1, input_stream=sys.stdin):
self.modules = util.ModuleList(self, ClassFinder(Module))
self.standalone = standalone self.standalone = standalone
if standalone: if standalone:
self.io = io.StandaloneIO(interval) self.io = io.StandaloneIO(interval)
self.ce_thread = Thread(target=self.run_command_endpoint) self.command_endpoint = CommandEndpoint(
self.ce_thread.daemon = True self.modules,
self.ce_thread.start() lambda: io.JSONIO(io=io.IOHandler(sys.stdin, open(os.devnull, "w")), skiplines=1))
else: else:
self.io = io.IOHandler(input_stream) self.io = io.IOHandler(input_stream)
self.modules = util.ModuleList(self, ClassFinder(Module))
def register(self, module, *args, **kwargs): def register(self, module, *args, **kwargs):
"""Register a new module.""" """Register a new module."""
@ -50,17 +65,12 @@ class Status:
else: else:
return None return None
def run_command_endpoint(self):
for command in io.JSONIO(io=io.IOHandler(sys.stdin, open(os.devnull, "w")), skiplines=1).read():
module = self.modules.get_module_by_id(command["instance"])
if module:
module.on_click(command["button"])
def call_start_hooks(self): def call_start_hooks(self):
for hook in START_HOOKS: for hook in START_HOOKS:
hook() hook()
def run(self): def run(self):
self.command_endpoint.start()
self.call_start_hooks() self.call_start_hooks()
for j in io.JSONIO(self.io).read(): for j in io.JSONIO(self.io).read():
for module in self.modules: for module in self.modules: