X-Git-Url: https://apps.delaporte.us/gitweb/matrix-shop-bot.git/blobdiff_plain/895434f80adf39e2122f592c09a8ade36209a8a7..aa3ac50778f5cfcd643274d07e702b01bb8de7cf:/matrix_shop_bot/bot.py diff --git a/matrix_shop_bot/bot.py b/matrix_shop_bot/bot.py index 734cdb2..02c59bc 100644 --- a/matrix_shop_bot/bot.py +++ b/matrix_shop_bot/bot.py @@ -13,39 +13,61 @@ 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_ID STORE_ID - plan to shop for at store for item - 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-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) + add.store - add a store + at STORE_ID - use this store for future commands + buy ID ID ID - mark items as purchased + clear STORE - clear all purchased items for STORE + list - re-show list from last used store + past STORE - re-show past purchased items from STORE + stores - list all stores + + Examples: + .shop past costco + .shop at costco + + .shop add sour cream + .shop add milk + + .shop list + + .shop buy 1 2 5 7 + + ''' + 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, including un-purchased + 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 + zone ZONE ITEM - list ITEM under given ZONE + + Example: + .shop zone dairy sour cream ''' 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: @@ -55,57 +77,82 @@ async def do_shop(match): 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'): + 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 not isinstance(store_id, int): - store_id = None + if match.command('zone'): + zone = match.args()[1] + item = ' '.join(match.args()[2:]) + Data().assign_zone(item, zone) + return ['Success'] - Data().assign_store(item_id, store_id) + 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_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('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('list'): - store_id_str = ' '.join(match.args()[1]) + if match.command('clear.all'): + store_name = ' '.join(match.args()[1:]) + results = Data().clear_list(store_name, clear_all=True) + return results - store_id = int(store_id_str) if store_id_str else None - items = Data().get_shopping_list(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)) + return results + 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('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'] @@ -113,16 +160,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): @@ -134,9 +185,16 @@ async def shop_bot(room, message, bot): try: if match.prefix(): result_lines = await do_shop(match) + + message_lines = [] for line in result_lines: - await bot.api.send_text_message( - room.room_id, str(line)) + message_lines.append(str(line)) + + message = '\n'.join(message_lines) + + await bot.api.send_text_message( + room.room_id, message) + except Exception as ex: for line in ['You have:', ' no tea', str(ex)]: await bot.api.send_text_message(