From f7619d5b22b3b01b4c77afd9ed1c4d8079936120 Mon Sep 17 00:00:00 2001 From: Ivan Habunek Date: Tue, 12 Jun 2018 12:03:49 +0200 Subject: [PATCH] Move parsing functions to separate file --- toot/ui/app.py | 33 ++------------------------------- toot/ui/parsers.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 31 deletions(-) create mode 100644 toot/ui/parsers.py diff --git a/toot/ui/app.py b/toot/ui/app.py index db962f6..d9fb784 100644 --- a/toot/ui/app.py +++ b/toot/ui/app.py @@ -5,8 +5,9 @@ import webbrowser from toot import __version__ from toot.exceptions import ConsoleError +from toot.ui.parsers import parse_status from toot.ui.utils import draw_horizontal_divider, draw_lines -from toot.utils import format_content, trunc +from toot.utils import trunc # Attempt to load curses, which is not available on windows try: @@ -446,33 +447,3 @@ class TimelineApp: def draw_footer_status(self): self.footer.draw_status(self.selected, len(self.statuses)) - - -def parse_status(status): - _status = status.get('reblog') or status - account = parse_account(_status['account']) - content = list(format_content(_status['content'])) - spoiler_text = list(format_content(_status['spoiler_text'])) if _status['spoiler_text'] else [] - - created_at = status['created_at'][:19].split('T') - boosted_by = parse_account(status['account']) if status['reblog'] else None - - return { - 'account': account, - 'boosted_by': boosted_by, - 'created_at': created_at, - 'content': content, - 'media_attachments': _status['media_attachments'], - 'url': _status['url'], - 'spoiler_text': spoiler_text, - 'sensitive': _status['sensitive'], - 'show_sensitive': False, - } - - -def parse_account(account): - return { - 'id': account['id'], - 'acct': account['acct'], - 'display_name': account['display_name'], - } diff --git a/toot/ui/parsers.py b/toot/ui/parsers.py new file mode 100644 index 0000000..01993f7 --- /dev/null +++ b/toot/ui/parsers.py @@ -0,0 +1,31 @@ +from toot.utils import format_content + + +def parse_status(status): + _status = status.get('reblog') or status + account = parse_account(_status['account']) + content = list(format_content(_status['content'])) + spoiler_text = list(format_content(_status['spoiler_text'])) if _status['spoiler_text'] else [] + + created_at = status['created_at'][:19].split('T') + boosted_by = parse_account(status['account']) if status['reblog'] else None + + return { + 'account': account, + 'boosted_by': boosted_by, + 'created_at': created_at, + 'content': content, + 'media_attachments': _status['media_attachments'], + 'url': _status['url'], + 'spoiler_text': spoiler_text, + 'sensitive': _status['sensitive'], + 'show_sensitive': False, + } + + +def parse_account(account): + return { + 'id': account['id'], + 'acct': account['acct'], + 'display_name': account['display_name'], + }