X-Git-Url: https://us-delaporte.pagekite.me/gitweb/matrix-shop-bot.git/blobdiff_plain/6a132ab99f10f2b589fe6b4eb2ab034a1773f59b..68a445e04d48d94dc64145e3bce009f94d4d1eaf:/matrix_shop_bot/bot.py

diff --git a/matrix_shop_bot/bot.py b/matrix_shop_bot/bot.py
index 8a25f53..ae65bdc 100644
--- a/matrix_shop_bot/bot.py
+++ b/matrix_shop_bot/bot.py
@@ -4,7 +4,7 @@ import os
 
 import simplematrixbotlib as botlib
 
-from .db import Data, pretty_print
+from .db import Data
 
 MODULE='shop'
 
@@ -27,46 +27,130 @@ async def do_shop(match):
 
     Commands:
       help - show this help
+      extra.help - show extended help
       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
-      list STORE_ID - list all items assigned to store
-      list-unsorted - list all items not assigned to any store
+      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
+      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
+      unsorted - list all items not assigned to any store
+
     '''
 
     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)
-        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}']
 
+    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'):
+        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'):
+        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_name = ' '.join(match.args()[1:])
+        results = Data().clear_list(store_name)
+        return results
+
+    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('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
 
     if match.command('list'):
-        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('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'):
-        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
 
-    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
+    if match.command('remove.item'):
+        item_id = ' '.join(match.args()[1:])
+        Data().remove_item(item_id)
+        return ['Success']
+
+    if match.command('remove.store'):
+        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__]
 
@@ -83,6 +167,9 @@ async def shop_bot(room, message, bot):
                 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))
+