X-Git-Url: https://us-delaporte.pagekite.me/gitweb/matrix-shop-bot.git/blobdiff_plain/3466966ba8583c9f2e0cba3a2dfb6c6f803625e9..refs/heads/main:/matrix_shop_bot/bot.py diff --git a/matrix_shop_bot/bot.py b/matrix_shop_bot/bot.py index 387cf18..ee56105 100644 --- a/matrix_shop_bot/bot.py +++ b/matrix_shop_bot/bot.py @@ -13,38 +13,56 @@ 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 - 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 + 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 - show purchased items from STORE in last 90 days + 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_ID - clear **all** items for STORE_ID from database - remove.item ITEM_ID - remove a shopping item from the datatbase + clear.all STORE - clear **all** items for STORE, including un-purchased + rename OLD,NEW - rename an item + rename.store OLD,NEW - rename a 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 + zone ZONE ITEM - list ITEM under given ZONE - ZONE may not contain spaces + Example: + shop zone dairy sour cream ''' if match.command('setup'): @@ -77,6 +95,12 @@ async def do_shop(match): Data().assign_store(item_id, store_id) return ['Success'] + if match.command('zone'): + zone = match.args()[1] + item = ' '.join(match.args()[2:]) + Data().assign_zone(item, zone) + return ['Success'] + if match.command('assign'): item_id = int(match.args()[1]) Data().assign_last_store(item_id) @@ -89,28 +113,26 @@ async def do_shop(match): return results if match.command('buy'): - item_id = ' '.join(match.args()[1:]) - Data().purchase_item(item_id) - results = [] - for item in Data().get_last_shopping_list(): - results.append(str(item)) + 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'] + store_name = ' '.join(match.args()[1:]) + results = Data().clear_list(store_name) + return results 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, clear_all=True) + return results if match.command('at'): - store_id = ' '.join(match.args()[1]) - items = Data().get_shopping_list_for_store(store_id) + store_name = ' '.join(match.args()[1:]) + items = Data().get_shopping_list(store_name) results = ['Shopping List'] for item in items: results.append(str(item)) @@ -123,6 +145,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 = [f'# Previously purchased at {store_name}'] + 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'] @@ -130,7 +162,17 @@ async def do_shop(match): results.append(str(item)) return results - if match.command('remove.item'): + if match.command('rename'): + old,new = ' '.join(match.args()[1:]).split(',') + Data().rename_item(old,new) + return ['Success'] + + if match.command('rename.store'): + old,new = ' '.join(match.args()[1:]).split(',') + Data().rename_store(old,new) + return ['Success'] + + if match.command('remove'): item_id = ' '.join(match.args()[1:]) Data().remove_item(item_id) return ['Success'] @@ -155,9 +197,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(