Fixup

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

diff --git a/matrix_shop_bot/bot.py b/matrix_shop_bot/bot.py
index 4c0a916c148a9072cafa710e67f7ba53e8117dad..037de7fdcb461d6dc5b09a8ad536ec89272d00e8 100644 (file)
--- a/matrix_shop_bot/bot.py
+++ b/matrix_shop_bot/bot.py
@@ -27,27 +27,31 @@ async def do_shop(match):
 
     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-item-to-store ITEM_ID STORE_ID - plan to shop for at store for item
+      add.store - add a store
+      stores - list all stores
+      at STORE_ID - (!shop at STORE_ID) list all items assigned to store and use this store for future commands

       assign ITEM_ID - assign item to last used store id
       buy - mark item as purchased
       clear STORE_ID - clear all purchased items for STORE_ID from database
       assign ITEM_ID - assign item to last used store id
       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 - re-show list from last used store
       list - re-show list from last used store

-      list-for-store STORE_ID - list all items assigned to store
-      list-stores - list all stores
-      unsorted - list all items not assigned to any store
-      remove-item ITEM_ID - remove a shopping item from the datatbase
-      remove-store STORE_ID - remove a store from the datatbase (requires clearing the list first)
+    '''
+    extended_help = '''
+      assign.item.to.store ITEM_ID STORE_ID - plan to shop for at store for item
+      clear.all STORE_ID - clear **all** items for STORE_ID from database
+      remove.item ITEM_ID - remove a shopping item from the datatbase
+      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:


@@ -62,12 +66,12 @@ async def do_shop(match):
             results.append(str(item))
         return results
 
             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'):
+    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)
         item_id  = int(match.args()[1])
         store_id = int(match.args()[2])
         Data().assign_store(item_id, store_id)


@@ -85,9 +89,12 @@ async def do_shop(match):
         return results
 
     if match.command('buy'):
         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'):
         store_id = ' '.join(match.args()[1:])
 
     if match.command('clear'):
         store_id = ' '.join(match.args()[1:])


@@ -95,15 +102,15 @@ async def do_shop(match):
         self.last_store_id = None
         return ['Success']
 
         self.last_store_id = None
         return ['Success']
 

-    if match.command('clear-all'):
+    if match.command('clear.all'):

         store_id = ' '.join(match.args()[1:])
         Data().clear_list(store_id, clear_all=True)
         return ['Success']
 
 
         store_id = ' '.join(match.args()[1:])
         Data().clear_list(store_id, clear_all=True)
         return ['Success']
 
 

-    if match.command('list-for-store'):
-        store_id = ' '.join(match.args()[1])
-        items = Data().get_shopping_list_for_store(store_id)
+    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))
         results = ['Shopping List']
         for item in items:
             results.append(str(item))


@@ -123,16 +130,20 @@ async def do_shop(match):
             results.append(str(item))
         return results
 
             results.append(str(item))
         return results
 

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

         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):