remove no-longer-used code for stacking signals

This commit is contained in:
Michael Hudson-Doyle 2019-03-07 14:13:06 +13:00
parent 833314d17c
commit 1c5ce7c07a
1 changed files with 3 additions and 51 deletions

View File

@ -28,7 +28,6 @@ class SignalException(Exception):
class Signal:
known_signals = []
signal_stack = []
def register_signals(self, signals):
if type(signals) is list:
@ -37,66 +36,19 @@ class Signal:
self.known_signals.append(signals)
urwid.register_signal(Signal, signals)
def prev_signal(self):
log.debug('prev_signal: before: '
'size={} stack={}'.format(len(self.signal_stack),
self.signal_stack))
if len(self.signal_stack) > 1:
(current_name, *_) = self.signal_stack.pop()
(prev_name, args, kwargs) = self.signal_stack.pop()
log.debug('current_name={}'.format(current_name))
log.debug('previous={}'.format(prev_name))
while (current_name.count(':') < prev_name.count(':') or
current_name == prev_name):
log.debug('get next previous')
(prev_name, args, kwargs) = self.signal_stack.pop()
log.debug('previous={}'.format(prev_name))
log.debug('prev_signal: after: '
'size={} stack={}'.format(len(self.signal_stack),
self.signal_stack))
log.debug("PrevEmitter: {}, {}, {}".format(prev_name, args,
kwargs))
self.emit_signal(prev_name, *args, **kwargs)
else:
log.debug('stack empty: emitting menu:welcome:main')
# FIXME: this should be set by common
urwid.emit_signal(self, 'menu:welcome:main')
def emit_signal(self, name, *args, **kwargs):
if name.startswith("menu:"):
log.debug(" emit: before: "
"size={} stack={}".format(len(self.signal_stack),
self.signal_stack))
# only stack *menu* signals, drop signals if we've already
# visited this level
match = [s for s in self.signal_stack if s[0] == name]
if len(match) > 0:
index = self.signal_stack.index(match.pop())
log.debug('Already visited {}, trimming stack'.format(name))
self.signal_stack = self.signal_stack[0:index + 1]
else:
log.debug('New menu for stack: {}'.format(name))
self.signal_stack.append((name, args, kwargs))
log.debug(" emit: after: "
"size={} stack={}".format(len(self.signal_stack),
self.signal_stack))
urwid.emit_signal(self, name, *args, **kwargs)
def connect_signal(self, name, cb, **kwargs):
log.debug(
"Emitter Connection: {}, {}, {}".format(name,
cb,
kwargs))
"Emitter Connection: %s, %s, %s",
name, cb, kwargs)
urwid.connect_signal(self, name, cb, **kwargs)
def connect_signals(self, signal_callback):
""" Connects a batch of signals
:param list signal_callback: List of tuples
eg. ('menu:welcome:show', self.cb)
:param list signal_callback: List of tuples eg. ('signame', self.cb)
"""
if not type(signal_callback) is list:
raise SignalException(