🔀 Merge pull request #71 from davep/handle-other-text

Don't attempt to render plain text

Author: davep

ChangeLog.md

@@ -6,6 +6,8 @@
 
 - Added the MIME type of the document to the viewer's status bar.
   ([#70](https://github.com/davep/rogallo/pull/70))
+- Handle showing plain text content without attempting to render it as
+  Gemtext. ([#71](https://github.com/davep/rogallo/pull/71))
 
 ## v0.4.0
 

src/rogallo/screens/main.py

@@ -247,8 +247,10 @@ def check_action(self, action: str, parameters: tuple[object, ...]) -> bool | No
             return len(self._location_history) > 0 or None
         if action in (Reload.action_name(), CopyLocationToClipboard.action_name()):
             return bool(self._viewer.document.location)
-        if action in (CopyDocumentToClipboard.action_name(), ToggleView.action_name()):
+        if action == CopyDocumentToClipboard.action_name():
             return bool(self._viewer.document)
+        if action == ToggleView.action_name():
+            return bool(self._viewer.document) and self._viewer.is_viewing_gemtext
         return True
 
     async def _handle_input_request(self, location: GeminiURI, sensitive: bool) -> None:
@@ -554,7 +556,8 @@ def action_copy_document_to_clipboard_command(self) -> None:
 
     def action_toggle_view_command(self) -> None:
         """Toggle the view between rendered and source."""
-        self._viewer.view_source = not self._viewer.view_source
+        if self._viewer.is_viewing_gemtext:
+            self._viewer.view_source = not self._viewer.view_source
 
 
 ### main.py ends here

src/rogallo/widgets/viewer/widget.py

@@ -20,7 +20,7 @@
 
 ##############################################################################
 # Local imports.
-from ...types import GeminiLocation
+from ...types import GEMINI_MIME_TYPE, GeminiLocation
 from .document_view import DocumentView
 from .gemtext_blocks import GemtextLink, GemtextWidget, get_block_widget
 from .status import ViewerStatus
@@ -69,6 +69,14 @@ def __bool__(self) -> bool:
     _status = query_one(ViewerStatus)
     """The status bar widget."""
 
+    @property
+    def is_viewing_gemtext(self) -> bool:
+        """`True` if the viewer is showing a Gemtext document, `False` otherwise.
+
+        Note that this is regardless of the 'view source' status.
+        """
+        return self.document.mime_type == GEMINI_MIME_TYPE
+
     def compose(self) -> ComposeResult:
         """Compose the viewer widget."""
         yield ViewerTitle()
@@ -81,7 +89,7 @@ async def _watch_document(self) -> None:
         self._status.mime_type = self.document.mime_type or ""
         await self._view.remove_children()
         blocks: list[Static] | list[GemtextWidget]
-        if self.view_source:
+        if (self.document.mime_type != GEMINI_MIME_TYPE) or self.view_source:
             blocks = [Static(self.document.content, markup=False)]
         else:
             for widget in (