Fixup

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

diff --git a/matrix_goal_bot/bot.py b/matrix_goal_bot/bot.py
index 2417d04f505288abaac8c1e9803f993b47447ad4..ec3e97d377579869ccf0ba3538f3eb4f6c897ddb 100644 (file)
--- a/matrix_goal_bot/bot.py
+++ b/matrix_goal_bot/bot.py
@@ -20,8 +20,9 @@ ex_help = '''
 More commands:
     add.vision - add a new vision (collection of goals)
     close.vision ID - mark vision as complete by ID
 More commands:
     add.vision - add a new vision (collection of goals)
     close.vision ID - mark vision as complete by ID

+    dump - dump the full data set - BEWARE - so many messages

     later GOAL_ID - put off goal for 14 days
     later GOAL_ID - put off goal for 14 days

-    list.all - list everything
+    list.later - list all 'later' goals

     print.vision ID - print a vision and all goals
     set.vision GOAL_ID VISION_ID- associate GOAL_ID with VISION_ID
     visions - list incomplete visions
     print.vision ID - print a vision and all goals
     set.vision GOAL_ID VISION_ID- associate GOAL_ID with VISION_ID
     visions - list incomplete visions


@@ -122,8 +123,8 @@ class GoalBot():
             return results
 
         if match.command('list'):
             return results
 
         if match.command('list'):

-            logger.debug('Asked to list goals...')
-            goals = self.data.get_all_goals()
+            logger.debug('Asked to list current goals...')
+            goals = self.data.get_current_goals()

             results = ['# Goals list...']
             for goal in goals:
                 results.append(str(goal))
             results = ['# Goals list...']
             for goal in goals:
                 results.append(str(goal))


@@ -190,8 +191,7 @@ class GoalBot():
 
         if match.command('start'):
             goal_id = int(match.args()[1])
 
         if match.command('start'):
             goal_id = int(match.args()[1])

-            vision_id = self.data.start(goal_id)
-            vision,goals = self.data.get_vision(vision_id)
+            vision,goals  = self.data.start_goal(goal_id)

             results = pretty_print(vision, goals)
             return results
 
             results = pretty_print(vision, goals)
             return results
 


@@ -219,15 +219,21 @@ class GoalBot():
             results = pretty_print(goal, tasks)
             return results
 
             results = pretty_print(goal, tasks)
             return results
 

-        if match.command('list.all'):
+        if match.command('dump'):

             goals = self.data.get_all_goals()
             goals = self.data.get_all_goals()

-            results = ['# Everything is...']
+            results = ['# Everything ... ']

             for goal in goals:
                 _,tasks = self.data.get_goal(goal.id)
                 details = pretty_print(goal, tasks)
                 results += details
             return results
 
             for goal in goals:
                 _,tasks = self.data.get_goal(goal.id)
                 details = pretty_print(goal, tasks)
                 results += details
             return results
 

+
+        if match.command('list.later'):
+            goals = self.data.get_all_goals()
+            results = ['# All Goals ... ']
+            return results
+

         if match.command('visions'):
             items = self.data.get_all_visions()
             results = ['# Visions']
         if match.command('visions'):
             items = self.data.get_all_visions()
             results = ['# Visions']