Fixup;

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

diff --git a/bot.py b/bot.py
index 0a40532ed72c217d7e81a2aeceb20efb071c5387..02bead0555fdf8a8638976c3b2b90203988c917a 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -4,7 +4,7 @@ import os
 
 import simplematrixbotlib as botlib
 
 
 import simplematrixbotlib as botlib
 

-from goals.db import Data
+from goals.db import Data, pretty_print

 
 
 SERVER = os.environ.get('MATRIX_SERVER')
 
 
 SERVER = os.environ.get('MATRIX_SERVER')


@@ -26,43 +26,108 @@ logging.getLogger('nio').setLevel(logging.WARNING)
 
 async def do_goal(match):
     '''
 
 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
+      set-vision GOAL_ID VISION_ID - associate GOAL_ID with VISION_ID
+      visions - list incomplete visions

 
     '''
 
     '''

-    # logger.debug(f'match {str(match)}')
-    if match.command('help'):
-        return 'help'

 
     if match.command('setup'):
         result = Data().setup()
 
     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)
 
     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'):
 
     if match.command('list'):

-        goals = Data().list_goals()
-        return goals
+        goals = Data().get_all_goals()
+        results = ['Goals list...']
+        for goal in goals:
+            results.append(str(goal))
+        return results

 
     if match.command('add-task'):
 
     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('add-vision'):
+        new = ' '.join(match.args()[1:])
+        result = Data().add_vision(new)
+        return [f'Vision added with id {result}']

 
     if match.command('print'):
 
     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('print-vision'):
+        get_id = int(match.args()[1])
+        vision,goals = Data().get_vision(get_id)
+        results = pretty_print(vision, goals)
+        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
+
+    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
+
+    if match.command('visions'):
+        items = Data().get_all_visions()
+        results = ['Visions are']
+        for item in items:
+            results.append(item)
+        else:
+            results.append('-- No current visions --')
+        return results
+
+
+    if match.command('set-vision'):
+        goal_id = int(match.args()[1])
+        vision_id = int(match.args()[1])
+        result = Data().assign_vision(goal_id, vision_id)
+        return [result]
+
+    return [do_goal.__doc__]

 
 
 @bot.listener.on_message_event
 
 
 @bot.listener.on_message_event


@@ -73,9 +138,10 @@ async def goals(room, message):
         return
 
     if match.prefix():
         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()
 
 
 bot.run()