Re-enable error catch.

[matrix-chore-bot.git] / matrix_chore_bot / bot.py

diff --git a/matrix_chore_bot/bot.py b/matrix_chore_bot/bot.py
index 9c0bec0e754a6965220a7e4154d6a3ef274b21ea..3130d354bd0ac2805415a33505706b6262f540a9 100644 (file)
--- a/matrix_chore_bot/bot.py
+++ b/matrix_chore_bot/bot.py
@@ -4,169 +4,94 @@ import os
 
 import simplematrixbotlib as botlib
 
 
 import simplematrixbotlib as botlib
 

-from .db import Data, pretty_print
+from .db import Data as ChoreData
+
+CHORES = ChoreData()

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

-BOT_NAME = os.environ.get('GOAL_BOT')
-BOT_PWD = os.environ.get('GOAL_BOT_PWD')
+BOT_NAME = os.environ.get('MATRIX_BOT')
+BOT_PWD = os.environ.get('MATRIX_BOT_PWD')

 
 def get_bot():
     creds = botlib.Creds(SERVER, BOT_NAME, BOT_PWD)
     return botlib.Bot(creds)
 
 
 def get_bot():
     creds = botlib.Creds(SERVER, BOT_NAME, BOT_PWD)
     return botlib.Bot(creds)
 

-DATE_FORMAT = '%Y-%m-%d'
+logger = logging.getLogger(__name__)
+logging.basicConfig(filename='matrix-chore-bot.log', encoding='utf-8', level=logging.DEBUG)
+logging.getLogger('nio').setLevel(logging.WARNING)

 
 

-def today():
-    return dt.now().strftime(DATE_FORMAT)
+async def chore_bot(room, message, bot):
+    match = botlib.MessageMatch(room, message, bot, '!chore')

 
 

-PREFIX = '!goal'
+    if not match.is_not_from_this_bot() and match.prefix():
+        return
+
+    if match.prefix():
+        try:
+            result_lines = await handle_chore(match)
+            for line in result_lines:
+                await bot.api.send_text_message(
+                    room.room_id, str(line))
+        except Exception as ex:
+            line = 'Ye flask must be load bearing, or something...'
+            await bot.api.send_text_message(
+                room.room_id, str(line))

 
 

-logger = logging.getLogger(__name__)
-logging.basicConfig(filename='goals.log', encoding='utf-8', level=logging.DEBUG)
-logging.getLogger('nio').setLevel(logging.WARNING)

 
 

-async def do_goal(match):
+async def handle_chore(match):

     '''
     '''

-    Prefix: !goal
+    Prefix: !chore

 
     Synax:
 
     Synax:

-        !goal COMMAND ARGS
+        !chore COMMAND ARGS

 
     Commands:
       help - show this help
 
     Commands:
       help - show this help

-      add - add a goal
-      add-task ID - add a task under the goal specified by ID
-      add-vision - add a new vision (collection of goals)
-      close-goal ID - mark goal done by ID
-      close-vision ID - mark vision as complete by ID
-      done ID - mark task done by ID
-      list - list incomplete goals
-      list-all - list everything
-      list-done - list completed goals
-      print GOAL_ID - print a goal and all tasks
-      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
+      add - add a chore 
+      check - check status of a chore
+      done - mark a chore as done
+      list - print the chore list
+      undo - mark a chore as undone

     '''
 
     '''
 

-    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'):
     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('list-done'):
-        goals = Data().get_done_goals()
-        results = ['# Completed Goals...']
-        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)
-        goal,tasks = Data().get_goal(goal_id)
-        results = pretty_print(goal, tasks)
-        return results
-    # 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)
+        results = ['## Listing chores...']
+        for item in CHORES.list():
+            results.append(item)
+        results.append('-- End of List --')

         return results
         return results

-
-    if match.command('close-goal'):
-        goal_id = int(match.args()[1])
-        vision_id = Data().complete_goal(goal_id)
-        vision,goals = Data().get_vision(vision_id)
-        results = pretty_print(vision, goals)
+    
+    if match.command('setup'):
+        results = []
+        results.append('Doing chore setup...')
+        result = CHORES.setup()
+        results.append(str(result))

         return results
 
         return results
 

-    if match.command('close-vision'):
-        vision_id = int(match.args()[1])
-        Data().complete_vision(vision_id)
-        vision,goals = Data().get_vision(vision_id)
-        results = pretty_print(vision, goals)
-        return results
+    if match.command('add'):
+        new_chore = ' '.join(match.args()[1:])
+        result = CHORES.add(new_chore)
+        return [result]

 
 

+    if match.command('check'):
+        chore_id = match.args()[1]
+        result = CHORES.check(chore_id)
+        return [result]

 
     if match.command('done'):
 
     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']
-        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()[2])
-        Data().assign_vision(goal_id=goal_id, vision_id=vision_id)
-        vision,goals = Data().get_vision(vision_id)
-        results = pretty_print(vision, goals)
-        return results
-
-    return [do_goal.__doc__]
-
-async def goal_bot(room, message, bot):
-    match = botlib.MessageMatch(room, message, bot, PREFIX)
+        chore_id = match.args()[1]
+        result = CHORES.done(chore_id)
+        return [result]

 
 

-    if not match.is_not_from_this_bot() and match.prefix():
-        return
+    if match.command('undo'):
+        chore_id = match.args()[1]
+        result = CHORES.undo(chore_id)
+        return [result]

 
 

-    try:
-        if match.prefix():
-            result_lines = await do_goal(match)
-            for line in result_lines:
-                await bot.api.send_text_message(
-                    room.room_id, str(line))
-    except Exception as ex:
-        return ['Ye cannot get ye flask.']
+    if match.command('remove'):
+        chore_id = match.args()[1]
+        result = CHORES.remove(chore_id)
+        return [result]

 
 

+    return [handle_chore.__doc__]