Make path patching more robust (#1316)

betty/app/__init__.py

@@ -20,7 +20,7 @@
 from betty.cache import FileCache
 from betty.config import Configurable, FileBasedConfiguration
 from betty.dispatch import Dispatcher
-from betty.fs import FileSystem, ASSETS_DIRECTORY_PATH, HOME_DIRECTORY_PATH
+from betty.fs import FileSystem, ASSETS_DIRECTORY_PATH
 from betty.locale import LocalizerRepository, get_data, DEFAULT_LOCALE, Localizer, Str
 from betty.model import Entity, EntityTypeProvider
 from betty.model.event_type import EventType, EventTypeProvider, Birth, Baptism, Adoption, Death, Funeral, Cremation, \
@@ -36,7 +36,7 @@
     from betty.serve import Server
     from betty.url import StaticUrlGenerator, LocalizedUrlGenerator
 
-CONFIGURATION_DIRECTORY_PATH = HOME_DIRECTORY_PATH / 'configuration'
+CONFIGURATION_DIRECTORY_PATH = fs.HOME_DIRECTORY_PATH / 'configuration'
 
 
 class _AppExtensions(ListExtensions):

betty/jinja2/filter.py

@@ -28,8 +28,8 @@
 from markupsafe import Markup, escape
 from pdf2image.pdf2image import convert_from_path
 
-from betty import _resizeimage
-from betty.fs import hashfile, CACHE_DIRECTORY_PATH
+from betty import _resizeimage, fs
+from betty.fs import hashfile
 from betty.functools import walk
 from betty.locale import negotiate_localizeds, Localized, Datey, negotiate_locale, Localey, get_data, Localizable
 from betty.model import get_entity_type_name
@@ -259,7 +259,7 @@ async def filter_image(
 
     job_id = f'filter_image:{file.id}:{width or ""}:{height or ""}'
     if job_context is None or job_context.claim(job_id):
-        cache_directory_path = CACHE_DIRECTORY_PATH / 'image'
+        cache_directory_path = fs.CACHE_DIRECTORY_PATH / 'image'
         await task_callable(file, cache_directory_path, file_directory_path, destination_name, width, height)
 
     destination_public_path = f'/file/{quote(destination_name)}'

betty/tests/__init__.py

@@ -25,19 +25,18 @@
 
 def patch_cache(f: Callable[P, Awaitable[T]]) -> Callable[P, Awaitable[T]]:
     """
-    Patch Betty's cache with a temporary directory.
+    Patch Betty's default global file cache with a temporary directory.
     """
     @functools.wraps(f)
     async def _patch_cache(*args: P.args, **kwargs: P.kwargs) -> T:
         original_cache_directory_path = fs.CACHE_DIRECTORY_PATH
-        cache_directory = TemporaryDirectory()
-        fs.CACHE_DIRECTORY_PATH = Path(await cache_directory.__aenter__())
-        try:
-            return await f(*args, **kwargs)
-
-        finally:
-            fs.CACHE_DIRECTORY_PATH = original_cache_directory_path
-            await cache_directory.__aexit__(None, None, None)
+        async with TemporaryDirectory() as cache_directory:
+            fs.CACHE_DIRECTORY_PATH = Path(cache_directory)
+            try:
+                return await f(*args, **kwargs)
+
+            finally:
+                fs.CACHE_DIRECTORY_PATH = original_cache_directory_path
 
     return _patch_cache