Merge pull request #75 from Textualize/fix-loading-local-documents

Fix loading local documents

Author: davep

frogmouth/__init__.py

@@ -5,5 +5,5 @@
 __credits__ = ["Dave Pearson"]
 __maintainer__ = "Dave Pearson"
 __email__ = "[email protected]"
-__version__ = "0.8.0"
+__version__ = "0.9.0"
 __licence__ = "MIT"

frogmouth/widgets/viewer.py

@@ -188,19 +188,17 @@ async def _local_load(self, location: Path, remember: bool = True) -> None:
             location: The location to load from.
             remember: Should we remember the location in th ehistory?
         """
-        # At the moment Textual's Markdown widget's load method captures
-        # *all* exceptions and just returns a true/false. It would be
-        # better to get an exception here and be able to properly report
-        # the problem. Alas, right now, we can't.
-        if await self.document.load(location):
-            self._post_load(location, remember)
-        else:
+        try:
+            await self.document.load(location)
+        except OSError as error:
             self.app.push_screen(
                 ErrorDialog(
                     "Error loading local document",
-                    f"{location}\n\nThere was an error loading the document.",
+                    f"{location}\n\n{error}.",
                 )
             )
+        else:
+            self._post_load(location, remember)
 
     @work(exclusive=True)
     async def _remote_load(self, location: URL, remember: bool = True) -> None:

poetry.lock

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "frogmouth"
 homepage = "https://github.com/Textualize/frogmouth"
-version = "0.8.0"
+version = "0.9.0"
 description = "A Markdown document viewer for the terminal"
 authors = ["Dave Pearson <[email protected]>"]
 license = "MIT"
@@ -28,14 +28,14 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-textual = {version = ">=0.30.0"}
+textual = {version = "^0.32"}
 typing-extensions = "^4.5.0"
 httpx = "^0.24.1"
 xdg = "^6.0.0"
 
 
 [tool.poetry.group.dev.dependencies]
-textual-dev = "*"
+textual-dev = "^1.1"
 mypy = "^1.1.1"
 pylint = "^2.17.1"
 pre-commit = "^3.2.1"