summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--ranger/ext/signal_dispatcher.py53
-rw-r--r--test/tc_signal.py44
2 files changed, 96 insertions, 1 deletions
diff --git a/ranger/ext/signal_dispatcher.py b/ranger/ext/signal_dispatcher.py
index 542fb472..95bc11f3 100644
--- a/ranger/ext/signal_dispatcher.py
+++ b/ranger/ext/signal_dispatcher.py
@@ -13,6 +13,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import re
+
 class Signal(dict):
 	stopped = False
 	def __init__(self, **keywords):
@@ -25,6 +27,7 @@ class Signal(dict):
 
 class SignalHandler(object):
 	active = True
+	regexp = None
 	def __init__(self, signal_name, function, priority, pass_signal):
 		self.priority = max(0, min(1, priority))
 		self.signal_name = signal_name
@@ -77,3 +80,53 @@ class SignalDispatcher(object):
 					handler.function()
 				if signal.stopped:
 					return
+
+class RegexpSignalDispatcher(SignalDispatcher):
+	"""
+	A subclass of SignalDispatcher with regexp matching.
+	"""
+
+	def __init__(self):
+		SignalDispatcher.__init__(self)
+		self._signal_regexes = list()
+	_signal_clear = __init__
+
+	def signal_bind(self, signal_name, function, priority=0.5):
+		try:
+			handlers = self._signals[signal_name]
+		except:
+			handlers = self._signals[signal_name] = []
+			for handler in self._signal_regexes:
+				if handler.regexp.match(signal_name):
+					handlers.append(handler)
+		return SignalDispatcher.signal_bind(self, signal_name, \
+				function, priority)
+
+	def signal_bind_regexp(self, regexp, function, priority=0.5):
+		if isinstance(regexp, str):
+			regexp = re.compile(regexp)
+		handler = self.signal_bind('dynamic', function, priority)
+		handler.regexp = regexp
+		self._signal_regexes.append(handler)
+		for signal_name, handlers in self._signals.items():
+			if regexp.match(signal_name):
+				handlers.append(handler)
+			handlers.sort(key=lambda handler: -handler.priority)
+		return handler
+
+	def signal_unbind(self, handler):
+		self._signal_regexes.remove(handler)
+		for handlers in self._signals.values():
+			try:
+				handlers.remove(handler)
+			except ValueError:
+				pass
+
+	def signal_emit(self, signal_name, **kw):
+		assert isinstance(signal_name, str)
+		if not signal_name in self._signals:
+			handlers = self._signals[signal_name] = []
+			for handler in self._signal_regexes:
+				if handler.regexp.match(signal_name):
+					handlers.append(handler)
+		SignalDispatcher.signal_emit(self, signal_name, **kw)
diff --git a/test/tc_signal.py b/test/tc_signal.py
index 67625505..a585a86b 100644
--- a/test/tc_signal.py
+++ b/test/tc_signal.py
@@ -15,7 +15,7 @@
 
 if __name__ == '__main__': from __init__ import init; init()
 import unittest
-from ranger.ext.signal_dispatcher import SignalDispatcher
+from ranger.ext.signal_dispatcher import *
 
 class TestSignal(unittest.TestCase):
 	def setUp(self):
@@ -75,5 +75,47 @@ class TestSignal(unittest.TestCase):
 		sd.signal_emit('setnumber', number=100)
 		self.assertEqual(None, lst[-1])
 
+	def test_regexp_signals(self):
+		sd = RegexpSignalDispatcher()
+		lst = []
+		def modify(s):
+			s.number = 5
+		def set_number(s):
+			lst.append(s.number)
+		def stopit(s):
+			s.stop()
+
+		h1 = sd.signal_bind_regexp('.*ar', modify, priority=1)
+
+		sd.signal_bind('xyz', set_number)
+		sd.signal_bind('foobar', set_number)
+
+		sd.signal_emit('xyz', number=10)
+		self.assertEqual(10, lst[-1])
+		sd.signal_emit('foobar', number=10)
+		self.assertEqual(5, lst[-1])
+
+		h2 = sd.signal_bind_regexp('x.z', modify, priority=1)
+#		print(sd._signals)
+
+		sd.signal_emit('xyz', number=10)
+		self.assertEqual(5, lst[-1])
+		sd.signal_emit('foobar', number=10)
+		self.assertEqual(5, lst[-1])
+
+		sd.signal_unbind(h2)
+
+		sd.signal_emit('xyz', number=10)
+		self.assertEqual(10, lst[-1])
+		sd.signal_emit('foobar', number=10)
+		self.assertEqual(5, lst[-1])
+
+		sd.signal_unbind(h1)
+
+		sd.signal_emit('xyz', number=10)
+		self.assertEqual(10, lst[-1])
+		sd.signal_emit('foobar', number=10)
+		self.assertEqual(10, lst[-1])
+
 if __name__ == '__main__':
 	unittest.main()
' href='#n298'>298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419