Fixup commands

[matrix-shop-bot.git] / matrix_shop_bot / bot.py

diff --git a/matrix_shop_bot/bot.py b/matrix_shop_bot/bot.py
index f426663a8b8a6f42cb2a6f00a516e62ab13618c3..0b52d76d5d6f72b7d04d3c54d9aa2234d82dbdbd 100644 (file)
--- a/matrix_shop_bot/bot.py
+++ b/matrix_shop_bot/bot.py
@@ -13,39 +13,45 @@ DATE_FORMAT = '%Y-%m-%d'
 def today():
     return dt.now().strftime(DATE_FORMAT)
 
 def today():
     return dt.now().strftime(DATE_FORMAT)
 

-PREFIX = f'!{MODULE}'
+PREFIX = f'.{MODULE}'

 logger = logging.getLogger(__name__)
 logging.basicConfig(filename=f'{MODULE}.log', encoding='utf-8', level=logging.DEBUG)
 logging.getLogger('nio').setLevel(logging.WARNING)
 
 async def do_shop(match):
     '''
 logger = logging.getLogger(__name__)
 logging.basicConfig(filename=f'{MODULE}.log', encoding='utf-8', level=logging.DEBUG)
 logging.getLogger('nio').setLevel(logging.WARNING)
 
 async def do_shop(match):
     '''

-    Prefix: !shop
+    Prefix: .shop

 
     Synax:
 
     Synax:

-      !shop COMMAND ARGS
+      .shop COMMAND ARGS

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

+      extra.help - show extended help

       add  - add an item to shop for
       add  - add an item to shop for

-      add-store - add a store
-      assign STORE_ID ITEM_ID - plan to shop for at store for item
+      add.store - add a store
+      clear STORE - clear all purchased items for STORE
+      list - re-show list from last used store
+      stores - list all stores
+      at STORE_ID - use this store for future commands

       buy - mark item as purchased
       buy - mark item as purchased

-      clear STORE_ID - clear all purchased items for STORE_ID from database
-      clear-all STORE_ID - clear **all** items for STORE_ID from database
-      list STORE_ID - list all items assigned to store
-      list-stores - list all stores
-      list-unsorted - list all items not assigned to any store
+    '''
+    extended_help = '''
+      assign ITEM_ID - assign item to last used store id
+      assign.item.to.store ITEM_ID STORE_ID - plan to shop for at store for item
+      clear.all STORE - clear **all** items for STORE

       remove ITEM_ID - remove a shopping item from the datatbase
       remove ITEM_ID - remove a shopping item from the datatbase

-      remove-store STORE_ID - remove a store from the datatbase (requires clearing the list first)
+      remove.store STORE_ID - remove a store from the datatbase (requires clearing the list first)

       setup - run one time database setup
       setup - run one time database setup

+      unsorted - list all items not assigned to any store
+

     '''
 
     if match.command('setup'):
         result = Data().setup()
         return [result]
 
     '''
 
     if match.command('setup'):
         result = Data().setup()
         return [result]
 

-    if match.command('list-stores'):
+    if match.command('stores'):

         items = Data().get_stores()
         results = ['List of Stores']
         for item in items:
         items = Data().get_stores()
         results = ['List of Stores']
         for item in items:


@@ -55,69 +61,97 @@ async def do_shop(match):
     if match.command('add'):
         new = ' '.join(match.args()[1:])
         result = Data().add_item(new)
     if match.command('add'):
         new = ' '.join(match.args()[1:])
         result = Data().add_item(new)

-        return [f'Item added with id {result}']
+        results = [f'Item added with id {result}']
+        for item in Data().get_last_shopping_list():
+            results.append(str(item))
+        return results

 
 

-    if match.command('add-store'):
+    if match.command('add.store'):

         new = ' '.join(match.args()[1:])
         result = Data().add_store(new)
         return [f'Store added with id {result}']
 
         new = ' '.join(match.args()[1:])
         result = Data().add_store(new)
         return [f'Store added with id {result}']
 

+    if match.command('assign.item.to.store'):
+        item_id  = int(match.args()[1])
+        store_id = int(match.args()[2])
+        Data().assign_store(item_id, store_id)
+        return ['Success']
+

     if match.command('assign'):
     if match.command('assign'):

-        store_id = int(match.args()[1])
-        item_id  = int(match.args()[2])
-        Data().assign_store(store_id, item_id)
+        item_id  = int(match.args()[1])
+        Data().assign_last_store(item_id)

 
         # Now print the list for the assigned store
 
         # Now print the list for the assigned store

-        items = Data().get_shopping_list(store_id)
+        items = Data().get_last_shopping_list()

         results = ['Shopping List']
         for item in items:
             results.append(str(item))
         return results
 
     if match.command('buy'):
         results = ['Shopping List']
         for item in items:
             results.append(str(item))
         return results
 
     if match.command('buy'):

-        item_id = ' '.join(match.args()[1:])
-        Data().purchase_item(item_id)
-        return ['Success']
+        items = ' '.join(match.args()[1:])
+        results = Data().purchase_items(items)
+        # results = []
+        # for item in Data().get_last_shopping_list():
+        #    results.append(str(item))
+        return results

 
     if match.command('clear'):
 
     if match.command('clear'):

-        store_id = ' '.join(match.args()[1:])
-        Data().clear_list(store_id)
-        self.last_store_id = None
-        return ['Success']
+        store_name = ' '.join(match.args()[1:])
+        results = Data().clear_list(store_name)
+        return results

 
 

-    if match.command('clear-all'):
-        store_id = ' '.join(match.args()[1:])
-        Data().clear_list(store_id, clear_all=True)
-        return ['Success']
+    if match.command('clear.all'):
+        store_name = ' '.join(match.args()[1:])
+        results = Data().clear_list(store_name, clear_all=True)
+        return results

 
 

-    if match.command('list'):
-        store_id = ' '.join(match.args()[1:])
-        if len(store_id) == 0:
-            store_id = None
+    if match.command('at'):
+        store_name = ' '.join(match.args()[1:])
+        items = Data().get_shopping_list(store_name)
+        results = ['Shopping List']
+        for item in items:
+            results.append(str(item))
+        return results

 
 

-        items = Data().get_shopping_list(store_id)
+    if match.command('list'):
+        items = Data().get_last_shopping_list()

         results = ['Shopping List']
         for item in items:
             results.append(str(item))
         return results
 
 
         results = ['Shopping List']
         for item in items:
             results.append(str(item))
         return results
 
 

+    if match.command('past'):
+        store_name = ' '.join(match.args()[1:])
+        items = Data().list_purchases(store_name)
+        results = ['Past purchases at {store_name}']
+        for item in items:
+            results.append(str(item))
+        return results
+    
+

     if match.command('unsorted'):
     if match.command('unsorted'):

-        items = Data().list_unsorted()
+        items = Data().get_unsorted_list()
+        results = ['Items assigned to no store']

         for item in items:
             results.append(str(item))
         return results
 
         for item in items:
             results.append(str(item))
         return results
 

-    if match.command('remove-item'):
+    if match.command('remove'):

         item_id = ' '.join(match.args()[1:])
         Data().remove_item(item_id)
         return ['Success']
 
         item_id = ' '.join(match.args()[1:])
         Data().remove_item(item_id)
         return ['Success']
 

-    if match.command('remove-store'):
+    if match.command('remove.store'):

         store_id = ' '.join(match.args()[1:])
         Data().remove_store(store_id)
         return ['Success']
 
         store_id = ' '.join(match.args()[1:])
         Data().remove_store(store_id)
         return ['Success']
 

+
+    if match.command('extra.help'):
+        return [extended_help]
+

     return [do_shop.__doc__]
 
 async def shop_bot(room, message, bot):
     return [do_shop.__doc__]
 
 async def shop_bot(room, message, bot):


@@ -133,7 +167,7 @@ async def shop_bot(room, message, bot):
                 await bot.api.send_text_message(
                     room.room_id, str(line))
     except Exception as ex:
                 await bot.api.send_text_message(
                     room.room_id, str(line))
     except Exception as ex:

-        for line in ['You have:', '    no tea']:
+        for line in ['You have:', '    no tea', str(ex)]:

             await bot.api.send_text_message(
                 room.room_id, str(line))
 
             await bot.api.send_text_message(
                 room.room_id, str(line))