Fix for buying multiple items in one command

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

diff --git a/matrix_shop_bot/bot.py b/matrix_shop_bot/bot.py
index 0e898e6036a008b4aaa4b07450cf680952d15279..37677c53bec9e3762b3327f87f27f545bea3aeec 100644 (file)
--- a/matrix_shop_bot/bot.py
+++ b/matrix_shop_bot/bot.py
@@ -4,7 +4,7 @@ import os
 
 import simplematrixbotlib as botlib
 
 
 import simplematrixbotlib as botlib
 

-from .db import Data, pretty_print
+from .db import Data

 
 MODULE='shop'
 
 
 MODULE='shop'
 


@@ -27,76 +27,122 @@ 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 STORE_ID ITEM_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
       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-unsorted - list all items not assigned to any store
-      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)
+      list - re-show list from last used store
+    '''
+    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('stores'):
+        items = Data().get_stores()
+        results = ['List of Stores']
+        for item in items:
+            results.append(str(item))
+        return results
+

     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])
-        result = Data().assign_store(store_id, item_id)
-        return result
+        item_id  = int(match.args()[1])
+        Data().assign_last_store(item_id)
+
+        # Now print the list for the assigned store
+        items = Data().get_last_shopping_list()
+        results = ['Shopping List']
+        for item in items:
+            results.append(str(item))
+        return results

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

-        item_id = ' '.join(match.args()[1:])
-        Data().purchase_item(item_id)
+        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:])
         Data().clear_list(store_id)
 
     if match.command('clear'):
         store_id = ' '.join(match.args()[1:])
         Data().clear_list(store_id)

+        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)
         store_id = ' '.join(match.args()[1:])
         Data().clear_list(store_id, clear_all=True)

+        return ['Success']

 
 

-    if match.command('list'):
-        items = Data().get_shopping_list(store_id)
+
+    if match.command('at'):
+        store_id = ' '.join(match.args()[1])
+        items = Data().get_shopping_list_for_store(store_id)
+        results = ['Shopping List']

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

-    if match.command('list-stores'):
-        items = Data().get_stores()
+    if match.command('list'):
+        items = Data().get_last_shopping_list()
+        results = ['Shopping List']

         for item in items:
             results.append(str(item))
         return results
 
     if match.command('unsorted'):
         for item in items:
             results.append(str(item))
         return results
 
     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'):

         item_id = ' '.join(match.args()[1:])
         Data().remove_item(item_id)
         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)
         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__]
 
 
     return [do_shop.__doc__]
 


@@ -113,6 +159,9 @@ 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:

-        return ['You have:', '    no tea']
+        for line in ['You have:', '    no tea', str(ex)]:
+            await bot.api.send_text_message(
+                room.room_id, str(line))
+