Add ability to complete tasks

[matrix-goal-bot.git] / bot.py

diff --git a/bot.py b/bot.py
index 0a40532ed72c217d7e81a2aeceb20efb071c5387..649cfe69e753333464ed4dd65cb6ee02ad218a7b 100644 (file)
--- 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')
@@ -31,38 +31,54 @@ async def do_goal(match):
     '''
     # logger.debug(f'match {str(match)}')
     if match.command('help'):
-        return 'help'
+        return ['help']
 
     if match.command('setup'):
         result = Data().setup()
-        return result
+        return [result]
 
     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()
-        return 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 = new = match.args()[1]
-        goal,tasks = Data().get_goal(id)
-
-        results = []
-        results.append(f' ## {goal}')
-        for task in tasks:
-            if(task.complete_date):
-                results.append(f' - [x] {task}')
-            else:
-                results.append(f' - [ ] {task}')
+        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
+
+    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
+
+    return __doc__
 
 
 @bot.listener.on_message_event
@@ -73,9 +89,10 @@ async def goals(room, message):
         return
 
     if match.prefix():
-        result = await do_goal(match)
-        await bot.api.send_text_message(
-            room.room_id, result)
+        result_lines = await do_goal(match)
+        for line in result_lines:
+            await bot.api.send_text_message(
+                room.room_id, str(line))
 
 
 bot.run()