bebop/browser/browser.py

@@ -99,12 +99,12 @@ class Browser:
         return self.dim[1]
 
     @property
-    def current_url(self) -> str:
+    def current_url(self):
         """Return the current URL."""
         return self._current_url
 
     @current_url.setter
-    def current_url(self, url: str):
+    def current_url(self, url):
         """Set the current URL and show it in the status line."""
         self._current_url = url
         self.set_status(url)
@@ -244,7 +244,7 @@ class Browser:
         elif char == ord("o"):
             self.quick_command("open")
         elif char == ord("O"):
-            self.quick_command(f"open {self.current_url}")
+            self.open_last_download()
         elif char == ord("p"):
             self.go_back()
         elif char == ord("u"):
@@ -291,8 +291,6 @@ class Browser:
                     self.scroll_page_vertically(-1)
                 elif char == ord("l"):
                     self.scroll_page_horizontally(1)
-                elif char == ord("o"):
-                    self.open_last_download()
 
     @property
     def page_pad_size(self):
@@ -388,18 +386,11 @@ class Browser:
         elif command == "set-render-mode":
             self.set_render_mode(words[1])
 
-    def get_user_text_input(self, status_text, char, prefix="", strip=False,
+    def get_user_text_input(self, status_text, char, prefix="", strip=False):
-                            escape_to_none=False):
         """Get user input from the command-line."""
         self.set_status(status_text)
-        result = self.command_line.focus(
+        result = self.command_line.focus(char, prefix=prefix)
-            char,
-            prefix=prefix,
-            escape_to_none=escape_to_none
-        )
         self.reset_status()
-        if result is None:
-            return None
         if strip:
             result = result.strip()
         return result

bebop/browser/file.py

@@ -35,11 +35,7 @@ def open_file(browser: Browser, filepath: str, encoding="utf-8"):
         except (OSError, ValueError) as exc:
             browser.set_status_error(f"Failed to open file: {exc}")
             return None
-        if path.suffix == ".gmi":
+        browser.load_page(Page.from_text(text))
-            page = Page.from_gemtext(text, browser.config["text_width"])
-        else:
-            page = Page.from_text(text)
-        browser.load_page(page)
     elif path.is_dir():
         gemtext = str(path) + "\n\n"
         for entry in sorted(path.iterdir()):

bebop/browser/gemini.py

@@ -294,7 +294,7 @@ def _handle_cert_required(
 
     url_identities = get_identities_for_url(browser.identities, url)
     if not url_identities:
-        identity = create_identity(browser, url, reason=response.meta)
+        identity = create_identity(browser, url)
         if not identity:
             return None
         browser.identities[url] = [identity]
@@ -317,27 +317,23 @@ def select_identity(identities: list):
     return identities[0] if identities else None
 
 
-def create_identity(browser: Browser, url: str, reason: Optional[str] =None):
+def create_identity(browser: Browser, url: str):
     """Walk the user through identity creation.
 
     Returns:
     The created identity on success (already registered in identities
     """
-    prompt_text = "Create client certificate?"
+    key = browser.prompt("Create client certificate?")
-    if reason:
-        prompt_text += f" Reason: {reason}"
-    key = browser.prompt(prompt_text)
     if key != "y":
         browser.reset_status()
         return None
 
     common_name = browser.get_user_text_input(
-        "Name? The server may use it as your username.",
+        "Name? The server will see this, you can leave it empty.",
         CommandLine.CHAR_TEXT,
         strip=True,
-        escape_to_none=True
     )
-    if common_name is None:
+    if not common_name:
         browser.reset_status()
         return None
 

bebop/config.py

@@ -22,7 +22,6 @@ DEFAULT_CONFIG = {
         "-nodes",
         "-keyform", "PEM",
         "-keyout", "{key_path}",
-        "-utf8",
         "-x509",
         "-days", "28140",  # https://www.youtube.com/watch?v=F9L4q-0Pi4E
         "-outform", "PEM",

bebop/help.py

@@ -27,8 +27,7 @@ Keybinds using the SHIFT key are written uppercase. Keybinds using the ALT (or M
 * gg: go to the top of the page
 * G: go to the bottom of the page
 * o: open an URL
-* O: edit current URL
+* O: open last download with an external command
-* M-o: open last download with an external command
 * p: go to the previous page
 * u: go to the parent page (up a level in URL)
 * U: go to the root page (root URL for the current domain)

bebop/metalines.py

@@ -3,9 +3,6 @@
 In Bebop we use a list of elements as produced by our parser. These elements are
 converted into so-called "metalines", which are the text lines as they will be
 displayed, along with associated meta-data such as its type or a link's URL.
-
-Note that metalines can be generated by custom functions without relying on the
-elements classes as they are quite coupled to Gemtext parsing/rendering.
 """
 
 import string
@@ -36,7 +33,6 @@ class LineType(IntEnum):
     PREFORMATTED = 6
     BLOCKQUOTE = 7
     LIST_ITEM = 8
-    ERROR = 9  # Not part of Gemtext but useful internally.
 
 
 def generate_metalines(elements, width, dumb=False):

bebop/rendering.py

@@ -70,7 +70,5 @@ def get_base_line_attributes(line_type) -> int:
         return curses.color_pair(ColorPair.PREFORMATTED)
     elif line_type == LineType.BLOCKQUOTE:
         return curses.color_pair(ColorPair.BLOCKQUOTE) | A_ITALIC
-    elif line_type == LineType.ERROR:
-        return curses.color_pair(ColorPair.ERROR) | curses.A_BOLD
     else:  # includes LineType.PARAGRAPH
         return curses.color_pair(ColorPair.NORMAL)

plugins/gopher/bebop_gopher/plugin.py

@@ -53,6 +53,7 @@ USER_FRIENDLY_TYPES = {t.name.lower(): t for t in ItemType}
 ICONS = {
     ItemType.FILE: "📄",
     ItemType.DIR: "📂",
+    ItemType.ERROR: "❌",
     ItemType.SEARCH: "✍ ",
     ItemType.HTML: "🌐",
 }
@@ -255,26 +256,19 @@ def parse_source(source: str, item_type: ItemType):
                 break
 
             parts = tline.split("\t")
-            # If the map is poorly formatted and parts are missing, pad with
+            if len(parts) != 4:
-            # empty parts.
+                # TODO move me away
-            while len(parts) < 4:
+                # Does not seem to be split by tabs, may be a file.
-                parts.append("")
+                metalines.append(({"type": LineType.PARAGRAPH}, line))
+                continue
 
             item_type = ItemType(ltype)
             label, path, host, port = parts
-
-            # INFO: render as a simple text line.
             if item_type == ItemType.INFO:
-                metalines.append(({"type": LineType.PARAGRAPH}, label))
+                meta = {"type": LineType.PARAGRAPH}
+                metalines.append((meta, label))
                 continue
 
-            # ERROR: render as an error line.
-            if item_type == ItemType.ERROR:
-                metalines.append(({"type": LineType.ERROR}, label))
-                continue
-
-            # Other item types are rendered as links, with a special case for
-            # "URL:"-type selectors in HTML items.
             if item_type == ItemType.HTML and path[:4].upper() == "URL:":
                 link_url = path[4:]
             else: