X-Git-Url: https://apps.delaporte.us/gitweb/matrix-goal-bot.git/blobdiff_plain/04946021957ba7daaad42df10973e2e5dfaf89bd..a82ef10eea38d5cec30ae6e4b2d6a7257735ac53:/bot.py?ds=sidebyside

diff --git a/bot.py b/bot.py
index 02bead0..efc56a5 100644
--- a/bot.py
+++ b/bot.py
@@ -38,6 +38,7 @@ async def do_goal(match):
       list - list incomplete goals
       list-all - list everything
       print ID - print a goal and all tasks
+      print-vision ID - print a vision and all goals
       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
@@ -45,90 +46,96 @@ async def do_goal(match):
 
     '''
 
-    if match.command('setup'):
-        result = Data().setup()
-        return [result]
-
-    if match.command('add'):
-        new = ' '.join(match.args()[1:])
-        result = Data().add_goal(new)
-        return [f'Goal added with id {result}']
-
-    if match.command('list'):
-        goals = Data().get_all_goals()
-        results = ['Goals list...']
-        for goal in goals:
-            results.append(str(goal))
-        return results
-
-    if match.command('add-task'):
-        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'):
-        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
-    
-
-    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__]
-
+    try:
+
+        if match.command('setup'):
+            result = Data().setup()
+            return [result]
+
+        if match.command('add'):
+            new = ' '.join(match.args()[1:])
+            result = Data().add_goal(new)
+            return [f'Goal added with id {result}']
+
+        if match.command('list'):
+            goals = Data().get_all_goals()
+            results = ['Goals list...']
+            for goal in goals:
+                results.append(str(goal))
+            return results
+
+        if match.command('add-task'):
+            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'):
+            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
+        
+
+        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']
+            if not items:
+                results.append('-- No current visions --')
+
+            for item in items:
+                results.append(item)
+            return results
+
+
+        if match.command('set-vision'):
+            goal_id = int(match.args()[1])
+            vision_id = int(match.args()[1])
+            Data().assign_vision(goal_id, vision_id)
+            vision,goals = Data().get_vision(vision_id)
+            results = pretty_print(vision, goals)
+            return results
+
+        return [do_goal.__doc__]
+    except Exception as ex:
+        return ['Ye cannot get ye flask.']
 
 @bot.listener.on_message_event
 async def goals(room, message):