X-Git-Url: https://apps.delaporte.us/gitweb/matrix-goal-bot.git/blobdiff_plain/6ccc70cb5cedd13170bac22b7efe6d0874e62a03..d56541ea72dcddf4f67fdfe5d2627533265bc657:/bot.py?ds=sidebyside

diff --git a/bot.py b/bot.py
index 0ac709e..b720c9b 100644
--- a/bot.py
+++ b/bot.py
@@ -4,7 +4,7 @@ import os
 
 import simplematrixbotlib as botlib
 
-from goals.db import Data
+from goals.db import Data, pretty_print
 
 
 SERVER = os.environ.get('MATRIX_SERVER')
@@ -26,12 +26,22 @@ logging.getLogger('nio').setLevel(logging.WARNING)
 
 async def do_goal(match):
     '''
-    Bot help here?
+    Prefix: !goal
+
+    Synax:
+        !goal COMMAND ARGS
+
+    Commands:
+      help - show this help
+      add - add a goal
+      add-task ID - add a task under the goal specified by ID
+      list - list incomplete goals
+      list-all - list everything
+      print ID - print a goal and all tasks
+      done ID - mark task done by ID
+      goal-done ID - mark goal done by ID
 
     '''
-    # logger.debug(f'match {str(match)}')
-    if match.command('help'):
-        return ['help']
 
     if match.command('setup'):
         result = Data().setup()
@@ -40,34 +50,54 @@ async def do_goal(match):
     if match.command('add'):
         new = ' '.join(match.args()[1:])
         result = Data().add_goal(new)
-        return [result]
+        return [f'Goal added with id {result}']
 
     if match.command('list'):
-        goals = Data().list_goals()
+        goals = Data().get_all_goals()
         results = ['Goals list...']
         for goal in goals:
             results.append(str(goal))
         return results
 
     if match.command('add-task'):
-        result = Data().add_task(goal_id=goal_id, name=name)
-        return [result]
+        goal_id = int(match.args()[1])
+        new = ' '.join(match.args()[2:])
+        result = Data().add_task(goal_id=goal_id, name=new)
+        return [f'Added task with id {result}']
 
     if match.command('print'):
         goal_id = int(match.args()[1])
         logger.debug(f'Searching for goal {goal_id}...')
         goal,tasks = Data().get_goal(goal_id)
+        results = pretty_print(goal, tasks)
+        return results
 
-        results = []
-        results.append(f' ## {goal}')
-        for task in tasks:
-            if(task.complete_date):
-                results.append(f' - [x] {task}')
-            else:
-                results.append(f' - [ ] {task}')
+    if match.command('goal-done'):
+        goal_id = int(match.args()[1])
+        logger.debug(f'Searching for goal {goal_id}...')
+        Data().complete_goal(goal_id)
+        goal,tasks = Data().get_goal(goal_id)
+        results = pretty_print(goal, tasks)
         return results
     
-    return 'Ye flask must be load bearing or something.'
+
+    if match.command('done'):
+        task_id = int(match.args()[1])
+        goal_id = Data().complete_task(task_id)
+        goal,tasks = Data().get_goal(goal_id)
+        results = pretty_print(goal, tasks)
+        return results
+
+    if match.command('list-all'):
+        goals = Data().get_all_goals()
+        results = ['Everything is...']
+        for goal in goals:
+            _,tasks = Data().get_goal(goal.id)
+            details = pretty_print(goal, tasks)
+            results += details
+        return results
+
+    return [do_goal.__doc__]
 
 
 @bot.listener.on_message_event