Merge lp:~stefanor/ibid/morse-339514 into lp:~ibid-core/ibid/old-trunk-pack-0.92

[Stefano Rivera]

[Stefano Rivera (stefanor)]

I think this is a reasonable workaround (and output cleanup)

[Michael Gorven (mgorven)]

Fix looks fine. Could do with some improvements though, like generating rtable in setup() and compiling the regex.

review: Approve

[lp:~stefanor/ibid/morse-339514]

573. By Stefano Rivera on 2009-03-12

Clean up morse

[Stefano Rivera (stefanor)]

"Could do with some improvements though, like generating rtable in setup() and compiling the regex."

r573 fixes that

[Jonathan Hitchcock (vhata)]

What will this do if somebody says "morse" by itself to the bot?

[Stefano Rivera (stefanor)]

Hi Jonathan (2009.03.12_18:44:41_+0200)
> What will this do if somebody says "morse" by itself to the bot?

Good point. I'm sure I meant to do something about that...

r574

SR

[lp:~stefanor/ibid/morse-339514]

574. By Stefano Rivera on 2009-03-12

Handle the case of 'morse'

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/morse.py'
--- ibid/plugins/morse.py	2009-03-08 13:16:28 +0000
+++ ibid/plugins/morse.py	2009-03-11 10:07:15 +0000
@@ -1,3 +1,5 @@
+import re
+
 from ibid.plugins import Processor, match
 
 help = {}
@@ -8,7 +10,7 @@
     u"""morse (text|morsecode)"""
     feature = 'morse'
 
-    @match(r'^morse\s+(.+)$')
+    @match(r'^morse\s*(.*)$')
     def morse(self, event, message):
      
         table = {
@@ -64,6 +66,8 @@
                 '=': "-...-",
         }
 
+        if "message_raw" in event:
+            message = re.match(r'^.*?morse\s+(.+)$', event.message_raw).group(1)
 
         def text2morse(text):
             return u" ".join(table.get(c.upper(), c) for c in text)
@@ -71,9 +75,9 @@
         def morse2text(morse):
             rtable = dict((v, k) for k, v in table.items())
             toks = morse.split(u' ')
-            return u" ".join(rtable.get(t, t) for t in toks)
+            return u"".join(rtable.get(t, u' ') for t in toks)
 
-        if message.replace('-', '').replace('.', '').isspace():
+        if message.replace(u'-', u'').replace(u'.', u'').strip() == u'':
             event.addresponse(u'Decodes as %s', morse2text(message))
         else:
             event.addresponse(u'Encodes as %s', text2morse(message))