Merge branch 'gonzobot' into gonzobot+crypto-fix

Author: linuxdaemon

cloudbot/__init__.py

@@ -12,7 +12,7 @@
 
 __version__ = "1.0.9"
 
-__all__ = ["util", "bot", "connection", "config", "permissions", "plugin", "event", "hook", "log_dir"]
+__all__ = ["clients", "util", "bot", "client", "config", "event", "hook", "permissions", "plugin", "reloader", "logging_dir"]
 
 
 def _setup():

cloudbot/bot.py

@@ -221,7 +221,7 @@ def _init_routine(self):
         self.observer.start()
 
         # Connect to servers
-        yield from asyncio.gather(*[conn.connect() for conn in self.connections.values()], loop=self.loop)
+        yield from asyncio.gather(*[conn.try_connect() for conn in self.connections.values()], loop=self.loop)
 
         # Activate web interface.
         if self.config.get("web", {}).get("enabled", False) and web_installed:

cloudbot/client.py

@@ -1,6 +1,7 @@
 import asyncio
 import collections
 import logging
+import random
 
 from cloudbot.permissions import PermissionManager
 
@@ -59,7 +60,20 @@ def describe_server(self):
         raise NotImplementedError
 
     @asyncio.coroutine
-    def connect(self):
+    def try_connect(self):
+        timeout = 30
+        while True:
+            try:
+                yield from self.connect(timeout)
+            except Exception:
+                logger.exception("[%s] Error occurred while connecting.")
+            else:
+                break
+
+            yield from asyncio.sleep(random.randrange(timeout))
+
+    @asyncio.coroutine
+    def connect(self, timeout=None):
         """
         Connects to the server, or reconnects if already connected.
         """

cloudbot/clients/irc.py

@@ -1,5 +1,6 @@
 import asyncio
 import logging
+import random
 import re
 import ssl
 from _ssl import PROTOCOL_SSLv23
@@ -106,7 +107,20 @@ def describe_server(self):
             return "{}:{}".format(self.server, self.port)
 
     @asyncio.coroutine
-    def connect(self):
+    def try_connect(self):
+        timeout = self.config["connection"].get("timeout", 30)
+        while True:
+            try:
+                yield from self.connect(timeout)
+            except (asyncio.TimeoutError, OSError):
+                logger.exception("[%s] Error occurred while connecting", self.name)
+            else:
+                break
+
+            yield from asyncio.sleep(random.randrange(timeout))
+
+    @asyncio.coroutine
+    def connect(self, timeout=None):
         """
         Connects to the IRC server, or reconnects if already connected.
         """
@@ -125,8 +139,15 @@ def connect(self):
         optional_params = {}
         if self.local_bind:
             optional_params["local_addr"] = self.local_bind
-        self._transport, self._protocol = yield from self.loop.create_connection(
-            lambda: _IrcProtocol(self), host=self.server, port=self.port, ssl=self.ssl_context, **optional_params)
+
+        coro = self.loop.create_connection(
+            lambda: _IrcProtocol(self), host=self.server, port=self.port, ssl=self.ssl_context, **optional_params
+        )
+
+        if timeout is not None:
+            coro = asyncio.wait_for(coro, timeout)
+
+        self._transport, self._protocol = yield from coro
 
         tasks = [
             self.bot.plugin_manager.launch(hook, Event(bot=self.bot, conn=self, hook=hook))

cloudbot/config.py

@@ -3,11 +3,12 @@
 import os
 import sys
 import time
+from collections import OrderedDict
 
 logger = logging.getLogger("cloudbot")
 
 
-class Config(dict):
+class Config(OrderedDict):
     """
     :type filename: str
     :type path: str
@@ -41,8 +42,10 @@ def load_config(self):
             sys.exit()
 
         with open(self.path) as f:
-            self.update(json.load(f))
-            logger.debug("Config loaded from file.")
+            data = json.load(f, object_pairs_hook=OrderedDict)
+
+        self.update(data)
+        logger.debug("Config loaded from file.")
 
         # reload permissions
         if self.bot.connections:
@@ -51,5 +54,7 @@ def load_config(self):
 
     def save_config(self):
         """saves the contents of the config dict to the config file"""
-        json.dump(self, open(self.path, 'w'), sort_keys=True, indent=4)
+        with open(self.path, 'w') as f:
+            json.dump(self, f, indent=4)
+
         logger.info("Config saved to file.")

cloudbot/util/formatting.py

@@ -44,7 +44,7 @@
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
-
+import copy
 import re
 import html.entities
 
@@ -318,3 +318,20 @@ def get_text_list(list_, last_word='or'):
         # Translators: This string is used as a separator between list elements
         ', '.join([i for i in list_][:-1]),
         last_word, list_[-1])
+
+
+def gen_markdown_table(headers, rows):
+    """
+    Generates a Markdown formatted table from the data
+    """
+    rows = copy.copy(rows)
+    rows.insert(0, headers)
+    rotated = zip(*reversed(rows))
+
+    sizes = tuple(map(lambda l: max(max(map(len, l)), 3), rotated))
+    rows.insert(1, tuple(('-' * size) for size in sizes))
+    lines = [
+        "| {} |".format(' | '.join(cell.ljust(sizes[i]) for i, cell in enumerate(row)))
+        for row in rows
+    ]
+    return '\n'.join(lines)

data/food/burger.json

@@ -75,26 +75,25 @@
             "sriracha aioli"
         ],
         "topping2": [
-           "crispy bacon strips",
-           "caramelized onions",
-           "fried onion straws",
-           "sauteed mushrooms",
-           "a fried egg",
-           "arugula",
-           "romaine lettuce"
-        ],    
+            "crispy bacon strips",
+            "caramelized onions",
+            "fried onion straws",
+            "sauteed mushrooms",
+            "a fried egg",
+            "arugula",
+            "romaine lettuce"
+        ],
         "side": [
-           "a side of fries tossed in parm and truffle oil",
-           "a side of sweet potato fries",
-           "a side of McDonald's fries",
-           "a side of curly fries",
-           "a side of thick-cut chips",
-           "a side of onion rings",
-           "side of sesame ginger coleslaw",
-           "side of macaroni and cheese",
-           "a large chilly soda",
-           "a cup of BBQ dip"
-        ]        
+            "a side of fries tossed in parm and truffle oil",
+            "a side of sweet potato fries",
+            "a side of McDonald's fries",
+            "a side of curly fries",
+            "a side of thick-cut chips",
+            "a side of onion rings",
+            "side of sesame ginger coleslaw",
+            "side of macaroni and cheese",
+            "a large chilly soda",
+            "a cup of BBQ dip"
+        ]
     }
 }
-

data/food/soup.json

@@ -15,7 +15,7 @@
             "Cazuela",
             "Chicken Noodle",
             "Cock-a-leekie",
-	    "Cream of crab",
+            "Cream of crab",
             "Fufu and Egusi",
             "Gomguk",
             "Goulash",
@@ -25,7 +25,7 @@
             "Lagman",
             "Leek",
             "Lentil",
-	    "Maryland crab",
+            "Maryland crab",
             "Matzah ball",
             "Menudo",
             "Minestrone",

data/reaction_macros.json

@@ -30,8 +30,8 @@
         "https://i.imgur.com/8VYMSq8.gif",
         "https://i.imgur.com/WVn7B8O.jpg",
         "https://i.imgur.com/GTxRRuv.gif"
-   ],
-   "head_desk_macros": [
+    ],
+    "head_desk_macros": [
         "https://i.imgur.com/Pg9nt.gif",
         "https://baudattitude.files.wordpress.com/2012/02/twilightsparkleheaddesk.gif",
         "https://i.imgur.com/LFzzTd8.gif",