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..581e19b7f180304fa145ff7e97f459ab2afb70ed 100644 (file)
--- a/matrix_shop_bot/bot.py
+++ b/matrix_shop_bot/bot.py
@@ -13,41 +13,46 @@ DATE_FORMAT = '%Y-%m-%d'
 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):
     '''
-    Prefix: !shop
+    Prefix: .shop
 
     Synax:
-      !shop COMMAND ARGS
+      .shop COMMAND ARGS
 
     Commands:
       help - show this help
+      extra.help - show extended help
       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
-      assign ITEM_ID - assign item to last used store id
+      add.store - add a store
+      at STORE_ID - use this store for future commands
       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
+      clear STORE - clear all purchased items for 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)
+      past STORE - re-show past purchased items from STORE 
+      stores - list all stores
+    '''
+    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.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('list-stores'):
+    if match.command('stores'):
         items = Data().get_stores()
         results = ['List of Stores']
         for item in items:
@@ -62,12 +67,12 @@ async def do_shop(match):
             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'):
+    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)
@@ -85,25 +90,26 @@ async def do_shop(match):
         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:])
-        Data().clear_list(store_id)
-        self.last_store_id = None
-        return ['Success']
-
-    if match.command('clear-all'):
-        store_id = ' '.join(match.args()[1:])
-        Data().clear_list(store_id, clear_all=True)
-        return ['Success']
+        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('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))
@@ -116,6 +122,16 @@ async def do_shop(match):
             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...']
+        for item in items:
+            results.append(str(item))
+        return results
+    
+
     if match.command('unsorted'):
         items = Data().get_unsorted_list()
         results = ['Items assigned to no store']
@@ -123,16 +139,20 @@ async def do_shop(match):
             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']
 
-    if match.command('remove-store'):
+    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__]
 
 async def shop_bot(room, message, bot):