From bce65a1472b6d97dd0f9c022719ed1a26abd742a Mon Sep 17 00:00:00 2001 From: dece Date: Fri, 16 Apr 2021 19:30:14 +0200 Subject: [PATCH] browser: minor fixes --- bebop/__main__.py | 2 +- bebop/browser/browser.py | 6 ++++-- bebop/gemtext.py | 3 ++- bebop/metalines.py | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bebop/__main__.py b/bebop/__main__.py index 90e5d71..1ffd547 100644 --- a/bebop/__main__.py +++ b/bebop/__main__.py @@ -7,7 +7,7 @@ from bebop.tofu import load_cert_stash, save_cert_stash def main(): argparser = argparse.ArgumentParser() - argparser.add_argument("url", default=None) + argparser.add_argument("url", nargs="?", default=None) args = argparser.parse_args() if args.url: diff --git a/bebop/browser/browser.py b/bebop/browser/browser.py index 41f6294..15a127e 100644 --- a/bebop/browser/browser.py +++ b/bebop/browser/browser.py @@ -295,9 +295,11 @@ class Browser: def handle_digit_input(self, init_char: int): """Focus command-line to select the link ID to follow.""" - if not self.page_pad or self.page_pad.current_page.links is None: + if self.page_pad.current_page is None: return links = self.page_pad.current_page.links + if links is None: + return err, val = self.command_line.focus_for_link_navigation(init_char, links) if err == 0: self.open_link(links, val) # type: ignore @@ -411,7 +413,7 @@ class Browser: """Add the current URL as bookmark.""" if not self.current_url: return - self.set_status("Title?") + self.set_status("Bookmark title?") current_title = self.page_pad.current_page.title or "" title = self.command_line.focus(">", prefix=current_title) if title: diff --git a/bebop/gemtext.py b/bebop/gemtext.py index 6e2ec6a..330cd65 100644 --- a/bebop/gemtext.py +++ b/bebop/gemtext.py @@ -57,7 +57,7 @@ ParsedGemtext = namedtuple("ParsedGemtext", ("elements", "links", "title")) def parse_gemtext(text: str) -> ParsedGemtext: """Parse a string of Gemtext into a list of elements.""" elements = [] - links = Links + links = Links() last_link_id = 0 title = "" preformatted = None @@ -80,6 +80,7 @@ def parse_gemtext(text: str) -> ParsedGemtext: match_dict = match.groupdict() url, text = match_dict["url"], match_dict.get("text", "") last_link_id += 1 + links[last_link_id] = url elements.append(Link(url, text, last_link_id)) continue diff --git a/bebop/metalines.py b/bebop/metalines.py index 56e4532..3320abe 100644 --- a/bebop/metalines.py +++ b/bebop/metalines.py @@ -145,7 +145,7 @@ def format_preformatted(preformatted: Preformatted, context: dict): def format_blockquote(blockquote: Blockquote, context: dict): """Return metalines for this blockquote.""" - lines = wrap_words(blockquote.text, context["width"]) + lines = wrap_words(blockquote.text, context["width"], indent=2) return [({"type": LineType.BLOCKQUOTE}, line) for line in lines]