4 files changed, 66 insertions, 32 deletions

diff --git a/bin/dbolla b/bin/dbolla
index 78fe482..6c0b573 100755
--- a/bin/dbolla
+++ b/bin/dbolla
@@ -4,6 +4,8 @@ import asyncio
 import datetime
 import functools
 import logging.config
+import os
+
 
 from warmachine.config import Config
 from warmachine.connections.irc import AioIRC
@@ -53,6 +55,8 @@ class Bot(object):
         self.load_plugin('warmachine.addons.giphy.GiphySearch')
         self.load_plugin('warmachine.addons.standup.StandUpPlugin')
 
+        # TODO: Ensure the config directory has been created
+
     def start(self):
         for connection in self.connections:
             t = asyncio.ensure_future(connection.connect())
@@ -64,6 +68,9 @@ class Bot(object):
         self.connections[connection] = {}
 
     def on_connect(self, connection, task):
+        for p in self.loaded_plugins:
+            if hasattr(p, 'on_connect'):
+                p.on_connect(connection)
         asyncio.ensure_future(self.process_message(connection))
 
     async def process_message(self, connection):
diff --git a/warmachine/addons/base.py b/warmachine/addons/base.py
index aa23c78..e605c2c 100644
--- a/warmachine/addons/base.py
+++ b/warmachine/addons/base.py
@@ -1,6 +1,8 @@
+import asyncio
 import logging
 
 
 class WarMachinePlugin(object):
     def __init__(self):
+        self._loop = asyncio.get_event_loop()
         self.log = logging.getLogger(self.__class__.__name__)
diff --git a/warmachine/addons/standup.py b/warmachine/addons/standup.py
index dc5f70a..99094d5 100644
--- a/warmachine/addons/standup.py
+++ b/warmachine/addons/standup.py
@@ -30,6 +30,9 @@ class StandUpPlugin(WarMachinePlugin):
         # }
         self.users_awaiting_reply = {}
 
+    def on_connect(self, connection):
+        self.load_schedule(connection)
+
     async def recv_msg(self, connection, message):
         """
         When the connection receives a message this method is called. We parse
@@ -73,39 +76,12 @@ class StandUpPlugin(WarMachinePlugin):
         cmd = message['message'].split(' ')[0]
         parts = message['message'].split(' ')[1:]
 
-        self._loop = asyncio.get_event_loop()
-
         ################
         # !standup-add #
         ################
         if cmd == '!standup-add':
-            next_standup = self.get_next_standup_secs(parts[0])
-
-            standup_td = next_standup - datetime.now()
-            next_standup_secs = standup_td.seconds
-
-            f = self._loop.call_later(
-                next_standup_secs, functools.partial(
-                    self.standup_schedule_func, connection, message['channel']))
-
-            self.standup_schedules[message['channel']] = {
-                'future': f,
-                'datetime': next_standup,
-                'time24h': parts[0],
-            }
-
-            self.log.info('New schedule added to channel {} for {}'.format(
-                connection.channel_map[message['channel']]['name'],
-                parts[0]
-            ))
-
-            await connection.say('Next standup at {} ({}s)'.format(
-                next_standup.ctime(), next_standup_secs), message['channel'])
-
-            # d = json.dumps(self.standup_schedules)
-            # with open('~/.warmachine/standup_schedules.json', 'w') as f:
-            #     f.write(d)
-
+            self.schedule_standup(connection, message['channel'], parts[0])
+            self.save_schedule(connection)
 
         ######################
         # !standup-schedules #
@@ -122,6 +98,7 @@ class StandUpPlugin(WarMachinePlugin):
                 'Current Time: {}'.format(datetime.now()), message['channel'])
             await connection.say(
                 pformat(self.standup_schedules), message['channel'])
+
         ############################
         # !standup-waiting_replies #
         ############################
@@ -134,6 +111,30 @@ class StandUpPlugin(WarMachinePlugin):
             await connection.say(
                 pformat(self.users_awaiting_reply), message['channel'])
 
+    def schedule_standup(self, connection, channel, time24h):
+        """
+        Schedules a standup
+        """
+        next_standup = self.get_next_standup_secs(time24h)
+
+        standup_td = next_standup - datetime.now()
+        next_standup_secs = standup_td.seconds
+
+        f = self._loop.call_later(
+            next_standup_secs, functools.partial(
+                self.standup_schedule_func, connection, channel))
+
+        self.standup_schedules[channel] = {
+            'future': f,
+            'datetime': next_standup,
+            'time24h': time24h,
+        }
+
+        self.log.info('New schedule added to channel {} for {}'.format(
+            connection.channel_map[channel]['name'],
+            time24h
+        ))
+
     def standup_schedule_func(self, connection, channel):
         """
         Non-async function used to schedule the standup for a channel.
@@ -249,12 +250,30 @@ class StandUpPlugin(WarMachinePlugin):
 
         return next_standup
 
-    def save_schedule(self):
+    def save_schedule(self, connection):
         """
         Save all channel schedules to a file.
         """
+        keys_to_save = ['time24h', ]
+        data = {}
+        for channel in self.standup_schedules:
+            data[channel] = {}
+            for key in keys_to_save:
+                data[channel][key] = self.standup_schedules[channel][key]
+
+        data = {connection.id: data}
+        with open('/home/jason/.warmachine/standup_schedules.json', 'w') as f:
+            f.write(json.dumps(data))
 
-    def load_schedule(self):
+        self.log.info('Schedules saved to disk')
+
+    def load_schedule(self, connection):
         """
         Load the channel schedules from a file.
         """
+        with open('/home/jason/.warmachine/standup_schedules.json', 'r') as f:
+            data = json.loads(f.read())
+
+        for channel in data[connection.id]:
+            self.schedule_standup(
+                connection, channel, data[connection.id][channel]['time24h'])
diff --git a/warmachine/connections/slack.py b/warmachine/connections/slack.py
index 0cc69d4..8ae52da 100644
--- a/warmachine/connections/slack.py
+++ b/warmachine/connections/slack.py
@@ -8,7 +8,7 @@ import urllib.request
 import websockets
 
 from .base import Connection, INITALIZED, CONNECTED
-
+from ..utils.decorators import memoize
 
 #: Define slack as a config section prefix
 __config_prefix__ = 'slack'
@@ -36,6 +36,12 @@ class SlackWS(Connection):
 
         self.status = INITALIZED
 
+    @property
+    @memoize
+    def id(self):
+        from hashlib import md5
+        return md5(self.token.encode()).hexdigest()
+
     async def connect(self):
         self.host = self.authenticate()
         self.log.info('Connecting to {}'.format(self.host))