fix delete_mine and some tidying

This commit is contained in:
John Burwell 2023-04-25 21:29:55 -05:00
parent 8b555ba26b
commit 190bb0742e
2 changed files with 9 additions and 7 deletions

View File

@ -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):

View File

@ -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