Merge lp:~stefanor/ibid/dc-too-long-503017 into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

[Stefano Rivera (stefanor)]

Urgent merge, but probably a little controversial

[lp:~stefanor/ibid/dc-too-long-503017]

829. By Stefano Rivera on 2010-01-04

Make sure that the punctionation goes on the previous line, not the next line

830. By Stefano Rivera on 2010-01-04

Use source function to determine truncation point

831. By Stefano Rivera on 2010-01-04

Some max length functions for sources

832. By Stefano Rivera on 2010-01-06

horizontal ellipsis = 3 utf-8 bytes

833. By Stefano Rivera on 2010-01-06

Add setup() method to sources and docstrings to IbidSourceFactory

834. By Stefano Rivera on 2010-01-06

Use the new source setup method

835. By Stefano Rivera on 2010-01-06

Whitespace

836. By Stefano Rivera on 2010-01-06

Whoops, ibid.sources is a list of names not sources

837. By Stefano Rivera on 2010-01-07

Don't have action in the supports list by default

838. By Stefano Rivera on 2010-01-07

Rename function that was very similar (in name) to a related variable

Unmerged revisions

=== modified file 'ibid/plugins/core.py'
--- ibid/plugins/core.py	2010-01-02 17:03:20 +0000
+++ ibid/plugins/core.py	2010-01-04 18:59:10 +0000
@@ -172,6 +172,10 @@
 class Format(Processor):
     priority = 2000
 
+    def _truncate(self, line):
+        return line.encode('utf-8')[:489].decode('utf-8', 'ignore') \
+                               + u'\N{horizontal ellipsis}'
+
     def process(self, event):
         filtered = []
         for response in event.responses:
@@ -182,18 +186,58 @@
                 response['reply'] = u'*%s*' % response['reply']
 
             conflate = response.get('conflate', True)
+            # Expand response into multiple single-line responses:
             if (not conflate and 'multiline' not in supports):
                 for line in response['reply'].split('\n'):
+                    if 'trim' in supports and len(line.encode('utf-8')) > 490:
+                        line = self._truncate(line)
                     r = {'reply': line}
                     for k in response.iterkeys():
                         if k not in ('reply'):
                             r[k] = response[k]
                     filtered.append(r)
+
+            # Expand response into multiple multi-line responses:
+            elif (not conflate and 'multiline' in supports
+                               and 'trim' in supports):
+                message = response['reply']
+                while len(message.encode('utf-8')) > 490:
+                    splitpoint = len(message.encode('utf-8')[:490] \
+                                            .decode('utf-8', 'ignore'))
+                    parts = [message[:splitpoint].rstrip(),
+                             message[splitpoint:].lstrip()]
+                    for sep in u'\n.;:, ':
+                        if sep in u'\n ':
+                            search = message[:splitpoint+1]
+                        else:
+                            search = message[:splitpoint]
+                        if sep in search:
+                            splitpoint = search.rindex(sep)
+                            parts = [message[:splitpoint+1].rstrip(),
+                                     message[splitpoint+1:]]
+                            break
+                    r = {'reply': parts[0]}
+                    for k in response.iterkeys():
+                        if k not in ('reply'):
+                            r[k] = response[k]
+                    filtered.append(r)
+                    message = parts[1]
+
+                response['reply'] = message
+                filtered.append(response)
+
             else:
+                line = response['reply']
+                # Remove any characters that make no sense on IRC-like sources:
                 if 'multiline' not in supports:
-                    response['reply'] = response['reply'].expandtabs(1) \
-                            .replace('\n', conflate == True
-                                           and u' ' or conflate or u'')
+                    line = line.expandtabs(1) \
+                               .replace('\n', conflate == True
+                                              and u' ' or conflate or u'')
+
+                if 'trim' in supports and len(line.encode('utf-8')) > 490:
+                    line = self._truncate(line)
+                response['reply'] = line
+
                 filtered.append(response)
 
         event.responses = filtered

=== modified file 'ibid/source/dc.py'
--- ibid/source/dc.py	2009-12-30 22:18:47 +0000
+++ ibid/source/dc.py	2010-01-04 18:59:10 +0000
@@ -129,8 +129,10 @@
         elif response.get('action', False):
             if self.factory.action_prefix and target is None:
                 self.say(target, u'%s %s' % (self.factory.action_prefix, message))
+            elif self.factory.action_prefix:
+                self.say(target, u'*%s*' % message)
             else:
-                self.say(target, u'* %s %s' % (self.my_nickname, message))
+                self.say(target, message)
 
             self.factory.log.debug(u"Sent action to %s: %s", target, message)
         else:
@@ -156,7 +158,7 @@
 class SourceFactory(protocol.ReconnectingClientFactory, IbidSourceFactory):
     protocol = DCBot
 
-    supports = ('action', 'multiline', 'topic')
+    supports = ['action', 'multiline', 'topic', 'trim']
     auth = ('op',)
 
     port = IntOption('port', 'Server port number', 411)
@@ -182,6 +184,11 @@
         self._auth = {}
 
     def setServiceParent(self, service):
+        if self.action_prefix is None and 'action' in self.supports:
+            self.supports.remove('action')
+        if self.action_prefix is not None and 'action' not in self.supports:
+            self.supports.append('action')
+
         if service:
             internet.TCPClient(self.server, self.port, self).setServiceParent(service)
         else:

=== modified file 'ibid/source/irc.py'
--- ibid/source/irc.py	2010-01-02 12:17:07 +0000
+++ ibid/source/irc.py	2010-01-04 18:59:10 +0000
@@ -264,7 +264,7 @@
     protocol = Ircbot
 
     auth = ('hostmask', 'nickserv')
-    supports = ('action', 'notice', 'topic')
+    supports = ('action', 'notice', 'topic', 'trim')
 
     port = IntOption('port', 'Server port number', 6667)
     ssl = BoolOption('ssl', 'Use SSL', False)

=== modified file 'ibid/source/silc.py'
--- ibid/source/silc.py	2010-01-02 12:17:07 +0000
+++ ibid/source/silc.py	2010-01-04 18:59:10 +0000
@@ -199,7 +199,7 @@
 class SourceFactory(IbidSourceFactory):
 
     auth = ('implicit',)
-    supports = ('action', 'topic')
+    supports = ('action', 'topic', 'trim')
 
     server = Option('server', 'Server hostname')
     port = IntOption('port', 'Server port number', 706)