aniani/toot
1
0
Fork 0
mirror of https://github.com/ihabunek/toot.git synced 2024-12-04 14:46:33 -05:00
Code

Simplify linebox rendering in status details

Browse Source
This commit is contained in:
Ivan Habunek 2019-08-27 14:59:06 +02:00
parent f6fcb2a821
commit db76b004cf
No known key found for this signature in database
GPG Key ID: CDBD63C43A30BB95
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
toot/tui/timeline.py
View File

@ -164,12 +164,12 @@ class StatusDetails(urwid.Pile):
poll = status.data.get("poll") poll = status.data.get("poll")
if poll: if poll:
yield ("pack", urwid.Divider()) yield ("pack", urwid.Divider())
yield ("pack", self.build_poll(poll)) yield ("pack", self.build_linebox(self.poll_generator(poll)))
card = status.data.get("card") card = status.data.get("card")
if card: if card:
yield ("pack", urwid.Divider()) yield ("pack", urwid.Divider())
yield ("pack", self.build_card(card)) yield ("pack", self.build_linebox(self.card_generator(card)))
# Push things to bottom # Push things to bottom
yield ("weight", 1, urwid.SolidFill(" ")) yield ("weight", 1, urwid.SolidFill(" "))
@ -181,6 +181,11 @@ class StatusDetails(urwid.Pile):
("cyan_bold", "H"), ("cyan", "elp"), " ", ("cyan_bold", "H"), ("cyan", "elp"), " ",
])) ]))
def build_linebox(self, contents):
contents = urwid.Pile(list(contents))
contents = urwid.Padding(contents, left=1, right=1)
return urwid.LineBox(contents)
def card_generator(self, card): def card_generator(self, card):
yield urwid.Text(("green", card["title"].strip())) yield urwid.Text(("green", card["title"].strip()))
if card["author_name"]: if card["author_name"]:
@ -191,12 +196,6 @@ class StatusDetails(urwid.Pile):
yield urwid.Text("") yield urwid.Text("")
yield urwid.Text(("link", card["url"])) yield urwid.Text(("link", card["url"]))
def build_card(self, card):
contents = list(self.card_generator(card))
card = urwid.Pile(contents)
card = urwid.Padding(card, left=1, right=1)
return urwid.LineBox(card)
def poll_generator(self, poll): def poll_generator(self, poll):
for option in poll["options"]: for option in poll["options"]:
perc = (round(100 * option["votes_count"] / poll["votes_count"]) perc = (round(100 * option["votes_count"] / poll["votes_count"])
@ -213,12 +212,6 @@ class StatusDetails(urwid.Pile):
status = "Poll · {} votes · {}".format(poll["votes_count"], status) status = "Poll · {} votes · {}".format(poll["votes_count"], status)
yield urwid.Text(("gray", status)) yield urwid.Text(("gray", status))
def build_poll(self, poll):
contents = list(self.poll_generator(poll))
poll = urwid.Pile(contents)
poll = urwid.Padding(poll, left=1, right=1)
return urwid.LineBox(poll)
class StatusListItem(SelectableColumns): class StatusListItem(SelectableColumns):
def __init__(self, status): def __init__(self, status):