Add length limit on messages from wolfram alpha.

diff --git a/pyva/pypsd.example.yml b/pyva/pypsd.example.yml
index 00cd9b1396f95b96b7d2444d7c4092bd7f27182d..759ed328154e397056f0e73fda17f4cdcaa7d72f 100644 (file)
--- a/pyva/pypsd.example.yml
+++ b/pyva/pypsd.example.yml
@@ -61,6 +61,7 @@ internets:
   key_steam: xxx
   key_google: xxx
   outputlimit: 10
+  max_line_length: 500
   yt_parse_delay: 180
 
 limitserv:

diff --git a/pyva/pyva/src/main/python/internets/cmd_user.py b/pyva/pyva/src/main/python/internets/cmd_user.py
index 1270e39997f12124f3e83739758263ea9facb4e7..f08f8625ae85c0cca81655d6581264d8f0624e42 100644 (file)
--- a/pyva/pyva/src/main/python/internets/cmd_user.py
+++ b/pyva/pyva/src/main/python/internets/cmd_user.py
@@ -292,6 +292,8 @@ def command_calc(self, manager, opts, arg, channel, sender, userinfo):
                        lines = len(result[0].splitlines(True)) if result[1] is None else len(result[1].splitlines(True))
                        if lines > self.output_limit:
                                self.notice(sender, u'[W|A] {r[0]} = {r[1]}'.format(r=result))
+                       else if max([len(x) for x in lines]) > self.max_line_length:
+                               self.notice(sender, u'[W|A] {r[0]} = {r[1]}'.format(r=result))
                        else:
                                self.msg(channel, u'[W|A] {r[0]} = {r[1]}'.format(r=result))
 

diff --git a/pyva/pyva/src/main/python/internets/internets.py b/pyva/pyva/src/main/python/internets/internets.py
index 7082072278a4d93e5f0881ad4b2aa8b4bf3fa74a..e7c21c65e1d5e9bd836f75ce3b55c2b3e95e9905 100644 (file)
--- a/pyva/pyva/src/main/python/internets/internets.py
+++ b/pyva/pyva/src/main/python/internets/internets.py
@@ -78,6 +78,12 @@ class internets(
                        self.log.exception("Error reading 'internets:outputlimit' configuration option: %s" % err)
                        raise
 
+               try:
+                       self.max_line_length = int(self.config.get('internets').get('maxlinelength'))
+               except Exception, err:
+                       self.log.exception("Error reading 'internets:maxlinelength' configuration option: %s" % err)
+                       raise
+
                self.bind_admin_commands()
 
        def start_threads(self):