Clean up 'page' listing output
This commit is contained in:
parent
cdd74e73b4
commit
8c443a9b07
1 changed files with 27 additions and 10 deletions
|
|
@ -808,17 +808,34 @@ class CmdPage(COMMAND_DEFAULT_CLASS):
|
||||||
lastpages = pages[-number:]
|
lastpages = pages[-number:]
|
||||||
else:
|
else:
|
||||||
lastpages = pages
|
lastpages = pages
|
||||||
template = "|w%s|n |c%s|n to |c%s|n: %s"
|
to_template = "|w{date}|n{sender}|n |cto {receiver}|n:> {message}"
|
||||||
lastpages = "\n ".join(
|
from_template = "|w{date}|n{receiver}|n |gfrom {sender}|n:< {message}"
|
||||||
template
|
listing = []
|
||||||
% (
|
for page in lastpages:
|
||||||
utils.datetime_format(page.date_created),
|
receiver = ""
|
||||||
",".join(obj.key for obj in page.senders),
|
sender = ""
|
||||||
"|n,|c ".join([obj.name for obj in page.receivers]),
|
template = from_template
|
||||||
page.message,
|
sending = False
|
||||||
|
if self.caller in page.senders:
|
||||||
|
template = to_template
|
||||||
|
sending = True
|
||||||
|
|
||||||
|
if len(page.receivers) > 1 or sending:
|
||||||
|
receiver = "|n,|c ".join([obj.name for obj in page.receivers])
|
||||||
|
|
||||||
|
if len(page.senders) > 1 or not sending:
|
||||||
|
sender = "|n,|c".join(obj.key for obj in page.senders)
|
||||||
|
|
||||||
|
listing.append(
|
||||||
|
template.format(
|
||||||
|
date=utils.datetime_format(page.date_created),
|
||||||
|
sender=sender,
|
||||||
|
receiver=receiver,
|
||||||
|
message=page.message,
|
||||||
|
)
|
||||||
|
|
||||||
)
|
)
|
||||||
for page in lastpages
|
lastpages = "\n ".join(listing)
|
||||||
)
|
|
||||||
|
|
||||||
if lastpages:
|
if lastpages:
|
||||||
string = "Your latest pages:\n %s" % lastpages
|
string = "Your latest pages:\n %s" % lastpages
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue