Fix error code

[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..f426663a8b8a6f42cb2a6f00a516e62ab13618c3 100644 (file)
--- 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'
 
@@ -34,6 +34,7 @@ async def do_shop(match):
       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
       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)
@@ -44,6 +45,13 @@ async def do_shop(match):
         result = Data().setup()
         return [result]
 
+    if match.command('list-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)
@@ -57,32 +65,42 @@ async def do_shop(match):
     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
+        Data().assign_store(store_id, item_id)
+
+        # Now print the list for the assigned store
+        items = Data().get_shopping_list(store_id)
+        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']
 
     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']
 
     if match.command('list'):
+        store_id = ' '.join(match.args()[1:])
+        if len(store_id) == 0:
+            store_id = None
+
         items = Data().get_shopping_list(store_id)
+        results = ['Shopping List']
         for item in items:
             results.append(str(item))
         return results
 
-    if match.command('list-stores'):
-        items = Data().get_stores()
-        for item in items:
-            results.append(str(item))
-        return results
 
     if match.command('unsorted'):
         items = Data().list_unsorted()
@@ -93,10 +111,12 @@ async def do_shop(match):
     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']
 
     return [do_shop.__doc__]
 
@@ -113,6 +133,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']:
+            await bot.api.send_text_message(
+                room.room_id, str(line))
+