bebop/__main__.py

@@ -11,6 +11,8 @@ def main():
 
     if args.url:
         start_url = args.url
+        if not start_url.startswith("gemini://"):
+            start_url = "gemini://" + start_url
     else:
         start_url = None
 

bebop/browser.py

@@ -25,7 +25,7 @@ class Browser:
         self.tab = None
         self.status_line = None
         self.command_line = None
-        self.status_data = ("", 0, 0)
+        self.status_data = ("", 0)
         self.current_url = ""
         self.running = True
         self.history = History()
@@ -65,21 +65,19 @@ class Browser:
         )
         self.command_line = CommandLine(command_line_window)
 
-        if start_url:
+        pending_url = start_url
-            self.open_url(start_url, assume_absolute=True)
-
         while self.running:
-            try:
+            if pending_url:
-                self.handle_inputs()
+                self.open_url(pending_url)
-            except KeyboardInterrupt:
+                pending_url = None
-                self.set_status("Cancelled.")
 
-    def handle_inputs(self):
             char = self.screen.getch()
             if char == ord(":"):
                 self.quick_command("")
             elif char == ord("r"):
                 self.reload_page()
+            elif char == ord("s"):
+                self.set_status(f"h {self.h} w {self.w}")
             elif char == ord("h"):
                 self.scroll_page_horizontally(-1)
             elif char == ord("H"):
@@ -116,14 +114,6 @@ class Browser:
                 self.handle_mouse(*curses.getmouse())
             elif char == curses.KEY_RESIZE:
                 self.handle_resize()
-        elif char == curses.ascii.ESC:  # Can be ESC or ALT char.
-            self.screen.nodelay(True)
-            ch = self.screen.getch()
-            if ch == -1:
-                self.set_status(self.current_url)
-            else:
-                pass  # No alt-key shortcuts for now!
-            self.screen.nodelay(False)
 
     @property
     def page_pad_size(self):
@@ -153,21 +143,20 @@ class Browser:
 
     def refresh_status_line(self):
         """Refresh status line contents."""
-        text, pair, attributes = self.status_data
+        text, pair = self.status_data
         text = text[:self.w - 1]
-        color = curses.color_pair(pair)
+        self.status_line.addstr(0, 0, text, curses.color_pair(pair))
-        self.status_line.addstr(0, 0, text, color | attributes)
         self.status_line.clrtoeol()
         self.status_line.refresh()
 
     def set_status(self, text):
         """Set a regular message in the status bar."""
-        self.status_data = text, ColorPair.NORMAL, curses.A_ITALIC
+        self.status_data = text, ColorPair.NORMAL
         self.refresh_status_line()
 
     def set_status_error(self, text):
         """Set an error message in the status bar."""
-        self.status_data = text, ColorPair.ERROR, 0
+        self.status_data = text, ColorPair.ERROR
         self.refresh_status_line()
 
     def open_url(self, url, base_url=None, redirects=0, assume_absolute=False):
@@ -202,8 +191,6 @@ class Browser:
             self.open_gemini_url(sanitize_url(url), redirects)
         elif parts.scheme.startswith("http"):
             self.open_web_url(url)
-        elif parts.scheme == "file":
-            self.open_file(parts.path)
         else:
             self.set_status_error(f"Protocol {parts.scheme} not supported.")
 
@@ -257,9 +244,6 @@ class Browser:
             self.set_status_error(error)
         elif response.generic_code == 10:
             self.handle_input_request(url, response)
-        else:
-            error = f"Unhandled response code {response.code}"
-            self.set_status_error(error)
 
     def load_page(self, gemtext: bytes):
         """Load Gemtext data as the current page."""
@@ -477,15 +461,3 @@ class Browser:
         """Open a Web URL. Currently relies in Python's webbrowser module."""
         self.set_status(f"Opening {url}")
         open_new_tab(url)
-
-    def open_file(self, filepath):
-        """Open a file and render it.
-
-        This should be used only on Gemtext files or at least text files.
-        Anything else will produce garbage and may crash the program.
-        """
-        try:
-            with open(filepath, "rb") as f:
-                self.load_page(f.read())
-        except (OSError, ValueError) as exc:
-            self.set_status_error(f"Failed to open file: {exc}")

bebop/colors.py

@@ -3,7 +3,6 @@ from enum import IntEnum
 
 
 class ColorPair(IntEnum):
-    # Colors for specific Gemtext line type.
     NORMAL       = 0
     ERROR        = 1
     LINK         = 2
@@ -13,9 +12,6 @@ class ColorPair(IntEnum):
     TITLE_3      = 6
     PREFORMATTED = 7
     BLOCKQUOTE   = 8
-
-    # Colors for other usage in the browser.
-    LINK_PREVIEW = 9
     DEBUG        = 99
 
 
@@ -30,5 +26,4 @@ def init_colors():
     curses.init_pair(ColorPair.TITLE_3, curses.COLOR_MAGENTA, -1)
     curses.init_pair(ColorPair.PREFORMATTED, curses.COLOR_YELLOW, -1)
     curses.init_pair(ColorPair.BLOCKQUOTE, curses.COLOR_CYAN, -1)
-    curses.init_pair(ColorPair.LINK_PREVIEW, curses.COLOR_WHITE, -1)
     curses.init_pair(ColorPair.DEBUG, curses.COLOR_BLACK, curses.COLOR_GREEN)

bebop/navigation.py

@@ -17,9 +17,6 @@ def parse_url(url: str, absolute: bool =False):
       though it technically is not, e.g. "dece.space" is not absolute as it
       misses either the // delimiter.
     """
-    url = url.strip()
-    if url.startswith("file://"):
-        return urllib.parse.urlparse(url)
     if url.startswith("gemini://"):
         url = url[7:]
     parts = urllib.parse.urlparse(url, scheme="gemini")
@@ -45,5 +42,5 @@ def set_parameter(url: str, user_input: str):
     """Return a new URL with the user input escaped (RFC 3986) appended."""
     quoted_input = urllib.parse.quote(user_input)
     if "?" in url:
-        url = url.split("?", maxsplit=1)[0]
+        url = url.rsplit("?", maxsplit=1)[0]
     return url + "?" + quoted_input

bebop/rendering.py

@@ -46,12 +46,9 @@ def format_elements(elements, width):
     context = {"last_link_id": 0, "width": width}
     separator = ({"type": LineType.NONE}, "")
     has_margins = False
-    thin_type = None
     for index, element in enumerate(elements):
         previous_had_margins = has_margins
-        last_thin_type = thin_type
         has_margins = False
-        thin_type = None
         if isinstance(element, Title):
             element_metalines = format_title(element, context)
             has_margins = True
@@ -60,7 +57,6 @@ def format_elements(elements, width):
             has_margins = True
         elif isinstance(element, Link):
             element_metalines = format_link(element, context)
-            thin_type = LineType.LINK
         elif isinstance(element, Preformatted):
             element_metalines = format_preformatted(element, context)
             has_margins = True
@@ -69,21 +65,17 @@ def format_elements(elements, width):
             has_margins = True
         elif isinstance(element, ListItem):
             element_metalines = format_list_item(element, context)
-            thin_type = LineType.LIST_ITEM
         else:
             continue
         # If current element requires margins and is not the first elements,
         # separate from previous element. Also do it if the current element does
         # not require margins but follows an element that required it (e.g. link
-        # after a paragraph). Also do it if both the current and previous
+        # after a paragraph).
-        # elements do not require margins but differ in type.
         if (
             (has_margins and index > 0)
             or (not has_margins and previous_had_margins)
-            or (not has_margins and thin_type != last_thin_type)
         ):
             metalines.append(separator)
-        # Append the element metalines now.
         metalines += element_metalines
     return metalines
 
@@ -231,49 +223,27 @@ def render_lines(metalines, window, max_width):
     new_dimensions = num_lines, max_width
     window.resize(*new_dimensions)
     for line_index, metaline in enumerate(metalines):
+        meta, line = metaline
+        line = line[:max_width - 1]
+        line_type = meta["type"]
+        if line_type == LineType.TITLE_1:
+            attr = curses.color_pair(ColorPair.TITLE_1) | curses.A_BOLD
+        elif line_type == LineType.TITLE_2:
+            attr = curses.color_pair(ColorPair.TITLE_2) | curses.A_BOLD
+        elif line_type == LineType.TITLE_3:
+            attr = curses.color_pair(ColorPair.TITLE_3)
+        elif line_type == LineType.LINK:
+            attr = curses.color_pair(ColorPair.LINK)
+        elif line_type == LineType.PREFORMATTED:
+            attr = curses.color_pair(ColorPair.PREFORMATTED)
+        elif line_type == LineType.BLOCKQUOTE:
+            attr = curses.color_pair(ColorPair.BLOCKQUOTE) | curses.A_ITALIC
+        else:  # includes LineType.PARAGRAPH
+            attr = curses.color_pair(ColorPair.NORMAL)
         try:
-            render_line(metaline, window, max_width)
+            window.addstr(line, attr)
         except ValueError:
             return new_dimensions
         if line_index < num_lines - 1:
             window.addstr("\n")
     return new_dimensions
-
-
-def render_line(metaline, window, max_width):
-    """Write a single line to the window."""
-    meta, line = metaline
-    line_type = meta["type"]
-    attributes = get_base_line_attributes(line_type)
-    line = line[:max_width - 1]
-    window.addstr(line, attributes)
-    if meta["type"] == LineType.LINK and "url" in meta:
-        url_text = f'  {meta["url"]}'
-        attributes = (
-            curses.color_pair(ColorPair.LINK_PREVIEW)
-            | curses.A_DIM
-            | curses.A_ITALIC
-        )
-        window.addstr(url_text, attributes)
-
-
-def get_base_line_attributes(line_type):
-    """Return the base attributes for this line type.
-
-    Other attributes may be freely used later for this line type but this is
-    what is used at the start of most lines of the given type.
-    """
-    if line_type == LineType.TITLE_1:
-        return curses.color_pair(ColorPair.TITLE_1) | curses.A_BOLD
-    elif line_type == LineType.TITLE_2:
-        return curses.color_pair(ColorPair.TITLE_2) | curses.A_BOLD
-    elif line_type == LineType.TITLE_3:
-        return curses.color_pair(ColorPair.TITLE_3)
-    elif line_type == LineType.LINK:
-        return curses.color_pair(ColorPair.LINK)
-    elif line_type == LineType.PREFORMATTED:
-        return curses.color_pair(ColorPair.PREFORMATTED)
-    elif line_type == LineType.BLOCKQUOTE:
-        return curses.color_pair(ColorPair.BLOCKQUOTE) | curses.A_ITALIC
-    else:  # includes LineType.PARAGRAPH
-        return curses.color_pair(ColorPair.NORMAL)

bebop/tests/test_navigation.py

@@ -24,10 +24,6 @@ class TestNavigation(unittest.TestCase):
         self.assertEqual(res.netloc, "dece.space")
         self.assertEqual(res.path, "/index.html")
 
-        res = parse_url("file:///home/dece/gemini/index.gmi")
-        self.assertEqual(res.scheme, "file")
-        self.assertEqual(res.path, "/home/dece/gemini/index.gmi")
-
     def test_join_url(self):
         url = join_url("gemini://dece.space/", "some-file.gmi")
         self.assertEqual(url, "gemini://dece.space/some-file.gmi")