🔨 Handle gopher-sourced MIME types better

Author: davep

src/rogallo/data/config.py

@@ -29,12 +29,7 @@ class Configuration:
     command_line_on_top: bool = False
     """Should the command line live at the top of the screen?"""
 
-    displayable_content_types: list[str] = field(
-        default_factory=lambda: [
-            "text/gemini",
-            "text/plain",
-        ]
-    )
+    displayable_content_types: list[str] = field(default_factory=list)
     """The content types that can be displayed in the viewer."""
 
     handle_ansi_escape_sequences: bool = True

src/rogallo/screens/main.py

@@ -451,7 +451,12 @@ def _is_displayable(self, mime_type: str | None) -> bool:
         """
         if isinstance(mime_type, str):
             mime_type, _, _ = mime_type.partition(";")
-        return mime_type in load_configuration().displayable_content_types
+        return mime_type in {
+            "text/gemini",
+            "text/plain",
+            "text/gopher-menu",
+            *load_configuration().displayable_content_types,
+        }
 
     async def _handle_input_request(
         self, location: GeminiURI, prompt: str, sensitive: bool
@@ -696,6 +701,11 @@ async def _load_from_gopher(self, request: OpenLocation) -> None:
         uri = request.location
         assert isinstance(uri, GopherURI)
 
+        mime_type = ItemType(uri.item_type).mime_type
+        if not self._is_displayable(mime_type):
+            self.post_message(OpenUnsupportedMIMEType(uri, mime_type))
+            return
+
         try:
             self._command_line.working = True
             self.post_message(
@@ -704,7 +714,7 @@ async def _load_from_gopher(self, request: OpenLocation) -> None:
                         location=uri,
                         original_location=uri,
                         content=(await GopherClient().request(uri)).text,
-                        mime_type=ItemType(uri.item_type).mime_type,
+                        mime_type=mime_type,
                     ),
                     original_request=request,
                 )
@@ -881,8 +891,8 @@ async def _open_unsupported_mime_type(
             message: The message containing the unsupported MIME type.
         """
 
-        # There's no reason why we should be here for Finger or Gopher URIs.
-        if isinstance(message.location, (FingerURI, GopherURI)):
+        # There's no reason why we should be here for Finger URIs.
+        if isinstance(message.location, FingerURI):
             self.notify(
                 f"Unexpected request to open {message.location}: please let Dave know",
                 severity="warning",
@@ -911,7 +921,7 @@ async def _open_unsupported_mime_type(
         if open_uri:
             open_in_browser(
                 str(message.location)
-                if isinstance(message.location, GeminiURI)
+                if isinstance(message.location, (GeminiURI, GopherURI))
                 else message.location.resolve().as_uri()
             )