diff --git a/rsbbs/console.py b/rsbbs/console.py index 76f4791..d672d67 100644 --- a/rsbbs/console.py +++ b/rsbbs/console.py @@ -148,8 +148,10 @@ class Console(): else: try: result = self.controller.delete_mine(args) - if result['count'] > 0: - self._write_output(f"Deleted {result['count']} messages") + messages = result.all() + count = len(messages) + if count > 0: + self._write_output(f"Deleted {count} messages") else: self._write_output(f"No messages to delete.") except Exception as e: @@ -226,7 +228,6 @@ class Console(): subject -- message subject message -- the message itself """ - print(is_private) if not args.callsign: args.callsign = self._read_line("Callsign:") if not args.subject: @@ -252,7 +253,7 @@ class Console(): """ # - # Main run method + # Main input loop # def run(self): diff --git a/rsbbs/controller.py b/rsbbs/controller.py index cae3971..dbcc9d6 100644 --- a/rsbbs/controller.py +++ b/rsbbs/controller.py @@ -85,10 +85,11 @@ class Controller(): statement = delete(Message).where( Message.recipient == self.config.calling_station ).returning(Message) - result = session.execute(statement) - count = len(result.all()) + result = session.execute( + statement, + execution_options={"prebuffer_rows": True}) session.commit() - return {'count': count, 'result': result} + return result except Exception: raise