{% endif %}
{% block page_content %}{% endblock %}
- {% if page_resource is has_links %}
- {% set links = page_resource.links | rejectattr('label', 'none') | list %}
+ {% if file_resource is has_links %}
+ {% set links = file_resource.links | rejectattr('label', 'none') | list %}
{% set links = links | select_localizeds | list + links | selectattr('locale', 'none') | list %}
{% if links | length > 0 %}
diff --git a/betty/assets/templates/page/list-file.html.j2 b/betty/assets/templates/page/list-file.html.j2
deleted file mode 100644
index 20afdf9c1..000000000
--- a/betty/assets/templates/page/list-file.html.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends 'base.html.j2' %}
-{% set page_title = _('Media') %}
-{% block page_content %}
- {% with files=entities %}
- {% include 'list-file.html.j2' %}
- {% endwith %}
-{% endblock %}
diff --git a/betty/assets/templates/page/list-event.html.j2 b/betty/assets/templates/resource-collection/event/index.html.j2
similarity index 53%
rename from betty/assets/templates/page/list-event.html.j2
rename to betty/assets/templates/resource-collection/event/index.html.j2
index d55a2c333..a3fbc06ed 100644
--- a/betty/assets/templates/page/list-event.html.j2
+++ b/betty/assets/templates/resource-collection/event/index.html.j2
@@ -1,7 +1,6 @@
{% extends 'base.html.j2' %}
+{% set events = file_resources %}
{% set page_title = _('Events') %}
{% block page_content %}
- {% with events=entities %}
- {% include 'list-event.html.j2' %}
- {% endwith %}
+ {% include 'list-event.html.j2' %}
{% endblock %}
diff --git a/betty/assets/templates/resource-collection/event/index.json.j2 b/betty/assets/templates/resource-collection/event/index.json.j2
new file mode 100644
index 000000000..b9bc12f6d
--- /dev/null
+++ b/betty/assets/templates/resource-collection/event/index.json.j2
@@ -0,0 +1,4 @@
+{{ {
+ '$schema': 'schema.json#/definitions/eventCollection' | static_url(absolute=True),
+ 'collection': file_resources | list,
+} | json | safe }}
diff --git a/betty/assets/templates/page/list-person.html.j2 b/betty/assets/templates/resource-collection/person/index.html.j2
similarity index 56%
rename from betty/assets/templates/page/list-person.html.j2
rename to betty/assets/templates/resource-collection/person/index.html.j2
index 246d81cae..f22fcab35 100644
--- a/betty/assets/templates/page/list-person.html.j2
+++ b/betty/assets/templates/resource-collection/person/index.html.j2
@@ -1,7 +1,8 @@
{% extends 'base.html.j2' %}
+{% set people = file_resources %}
{% set page_title = _('People') %}
{% block page_content %}
- {% with persons=entities | rejectattr('private', 'eq', True), group_by_affiliation=True %}
+ {% with persons=people | rejectattr('private', 'eq', True), group_by_affiliation=True %}
{% include 'list-person.html.j2' %}
{% endwith %}
{% endblock %}
diff --git a/betty/assets/templates/resource-collection/person/index.json.j2 b/betty/assets/templates/resource-collection/person/index.json.j2
new file mode 100644
index 000000000..8c9061961
--- /dev/null
+++ b/betty/assets/templates/resource-collection/person/index.json.j2
@@ -0,0 +1,4 @@
+{{ {
+ '$schema': 'schema.json#/definitions/personCollection' | static_url(absolute=True),
+ 'collection': file_resources | list,
+} | json | safe }}
diff --git a/betty/assets/templates/page/list-place.html.j2 b/betty/assets/templates/resource-collection/place/index.html.j2
similarity index 71%
rename from betty/assets/templates/page/list-place.html.j2
rename to betty/assets/templates/resource-collection/place/index.html.j2
index 30ddaef30..4f4ccb0cc 100644
--- a/betty/assets/templates/page/list-place.html.j2
+++ b/betty/assets/templates/resource-collection/place/index.html.j2
@@ -1,7 +1,8 @@
{% extends 'base.html.j2' %}
+{% set places = file_resources %}
{% set page_title = _('Places') %}
{% block page_content %}
- {% with places=entities, canonical=True %}
+ {% with canonical=True %}
{% include 'list-place.html.j2' %}
{% endwith %}
{% endblock %}
\ No newline at end of file
diff --git a/betty/assets/templates/resource-collection/place/index.json.j2 b/betty/assets/templates/resource-collection/place/index.json.j2
new file mode 100644
index 000000000..eef0e176b
--- /dev/null
+++ b/betty/assets/templates/resource-collection/place/index.json.j2
@@ -0,0 +1,4 @@
+{{ {
+ '$schema': 'schema.json#/definitions/placeCollection' | static_url(absolute=True),
+ 'collection': file_resources | list,
+} | json | safe }}
diff --git a/betty/assets/templates/page/list-source.html.j2 b/betty/assets/templates/resource-collection/source/index.html.j2
similarity index 75%
rename from betty/assets/templates/page/list-source.html.j2
rename to betty/assets/templates/resource-collection/source/index.html.j2
index 99b58760e..d80d08ba9 100644
--- a/betty/assets/templates/page/list-source.html.j2
+++ b/betty/assets/templates/resource-collection/source/index.html.j2
@@ -1,8 +1,9 @@
{% extends 'base.html.j2' %}
+{% set sources = file_resources %}
{% set page_title = _('Sources') %}
{% block page_content %}
- {% for source in entities | sort(attribute='name') %}
+ {% for source in sources | sort(attribute='name') %}
-
{% include 'label/source.html.j2' %}
diff --git a/betty/assets/templates/resource-collection/source/index.json.j2 b/betty/assets/templates/resource-collection/source/index.json.j2
new file mode 100644
index 000000000..69c42ccce
--- /dev/null
+++ b/betty/assets/templates/resource-collection/source/index.json.j2
@@ -0,0 +1,4 @@
+{{ {
+ '$schema': 'schema.json#/definitions/sourceCollection' | static_url(absolute=True),
+ 'collection': file_resources | list,
+} | json | safe }}
diff --git a/betty/assets/templates/page/citation.html.j2 b/betty/assets/templates/resource/citation/index.html.j2
similarity index 96%
rename from betty/assets/templates/page/citation.html.j2
rename to betty/assets/templates/resource/citation/index.html.j2
index 1e338db46..a1c25366a 100644
--- a/betty/assets/templates/page/citation.html.j2
+++ b/betty/assets/templates/resource/citation/index.html.j2
@@ -1,4 +1,5 @@
{% extends 'base.html.j2' %}
+{% set citation = file_resource %}
{% set page_title = citation.location %}
{% block page_content %}
diff --git a/betty/assets/templates/resource/citation/index.json.j2 b/betty/assets/templates/resource/citation/index.json.j2
new file mode 100644
index 000000000..1b8670df4
--- /dev/null
+++ b/betty/assets/templates/resource/citation/index.json.j2
@@ -0,0 +1 @@
+{{ file_resource | json | safe }}
diff --git a/betty/assets/templates/page/event.html.j2 b/betty/assets/templates/resource/event/index.html.j2
similarity index 98%
rename from betty/assets/templates/page/event.html.j2
rename to betty/assets/templates/resource/event/index.html.j2
index 1b1590d06..17c1514e6 100644
--- a/betty/assets/templates/page/event.html.j2
+++ b/betty/assets/templates/resource/event/index.html.j2
@@ -1,4 +1,5 @@
{% extends 'base.html.j2' %}
+{% set event = file_resource %}
{% set page_title %}
{% with embedded=True %}
{% include 'label/event.html.j2' %}
diff --git a/betty/assets/templates/resource/event/index.json.j2 b/betty/assets/templates/resource/event/index.json.j2
new file mode 100644
index 000000000..1b8670df4
--- /dev/null
+++ b/betty/assets/templates/resource/event/index.json.j2
@@ -0,0 +1 @@
+{{ file_resource | json | safe }}
diff --git a/betty/assets/templates/page/file.html.j2 b/betty/assets/templates/resource/file/index.html.j2
similarity index 98%
rename from betty/assets/templates/page/file.html.j2
rename to betty/assets/templates/resource/file/index.html.j2
index 69c1d5c15..b31cb54de 100644
--- a/betty/assets/templates/page/file.html.j2
+++ b/betty/assets/templates/resource/file/index.html.j2
@@ -1,4 +1,5 @@
{% extends 'base.html.j2' %}
+{% set file = file_resource %}
{% set page_title = file.description %}
{% block page_content %}
{% if file.media_type and file.media_type.startswith('image/') %}
diff --git a/betty/assets/templates/resource/file/index.json.j2 b/betty/assets/templates/resource/file/index.json.j2
new file mode 100644
index 000000000..1b8670df4
--- /dev/null
+++ b/betty/assets/templates/resource/file/index.json.j2
@@ -0,0 +1 @@
+{{ file_resource | json | safe }}
diff --git a/betty/assets/templates/page/person.html.j2 b/betty/assets/templates/resource/person/index.html.j2
similarity index 99%
rename from betty/assets/templates/page/person.html.j2
rename to betty/assets/templates/resource/person/index.html.j2
index 3782da080..a188002f6 100644
--- a/betty/assets/templates/page/person.html.j2
+++ b/betty/assets/templates/resource/person/index.html.j2
@@ -1,4 +1,5 @@
{% extends 'base.html.j2' %}
+{% set person = file_resource %}
{% set page_title %}
{% with embedded=True %}
{% include 'label/person.html.j2' %}
diff --git a/betty/assets/templates/resource/person/index.json.j2 b/betty/assets/templates/resource/person/index.json.j2
new file mode 100644
index 000000000..1b8670df4
--- /dev/null
+++ b/betty/assets/templates/resource/person/index.json.j2
@@ -0,0 +1 @@
+{{ file_resource | json | safe }}
diff --git a/betty/assets/templates/page/place.html.j2 b/betty/assets/templates/resource/place/index.html.j2
similarity index 97%
rename from betty/assets/templates/page/place.html.j2
rename to betty/assets/templates/resource/place/index.html.j2
index 260e3c42b..fc3ec8924 100644
--- a/betty/assets/templates/page/place.html.j2
+++ b/betty/assets/templates/resource/place/index.html.j2
@@ -1,4 +1,5 @@
{% extends 'base.html.j2' %}
+{% set place = file_resource %}
{% set page_title = place.names | negotiate_localizeds %}
{% block page_content %}
{% include 'meta/place.html.j2' %}
diff --git a/betty/assets/templates/resource/place/index.json.j2 b/betty/assets/templates/resource/place/index.json.j2
new file mode 100644
index 000000000..1b8670df4
--- /dev/null
+++ b/betty/assets/templates/resource/place/index.json.j2
@@ -0,0 +1 @@
+{{ file_resource | json | safe }}
diff --git a/betty/assets/templates/page/source.html.j2 b/betty/assets/templates/resource/source/index.html.j2
similarity index 97%
rename from betty/assets/templates/page/source.html.j2
rename to betty/assets/templates/resource/source/index.html.j2
index b0808b859..f0a8bb926 100644
--- a/betty/assets/templates/page/source.html.j2
+++ b/betty/assets/templates/resource/source/index.html.j2
@@ -1,4 +1,5 @@
{% extends 'base.html.j2' %}
+{% set source = file_resource %}
{% set page_title = source.name %}
{% block page_content %}
{% include 'meta/source.html.j2' %}
diff --git a/betty/assets/templates/resource/source/index.json.j2 b/betty/assets/templates/resource/source/index.json.j2
new file mode 100644
index 000000000..1b8670df4
--- /dev/null
+++ b/betty/assets/templates/resource/source/index.json.j2
@@ -0,0 +1 @@
+{{ file_resource | json | safe }}
diff --git a/betty/cli.py b/betty/cli.py
index e78d341cd..3fc681326 100644
--- a/betty/cli.py
+++ b/betty/cli.py
@@ -1,4 +1,6 @@
+import cProfile
import logging
+import pstats
import shutil
import sys
from contextlib import suppress, contextmanager
@@ -132,5 +134,7 @@ async def _clear_caches():
@click.command(help='Generate a static site.')
@site_command
async def _generate(site: Site):
- await parse.parse(site)
- await generate.generate(site)
+ with cProfile.Profile() as pr:
+ await parse.parse(site)
+ await generate.generate(site)
+ pstats.Stats(pr).strip_dirs().sort_stats(pstats.SortKey.CUMULATIVE).print_stats()
diff --git a/betty/fs.py b/betty/fs.py
index b774b1e13..25e7dc055 100644
--- a/betty/fs.py
+++ b/betty/fs.py
@@ -4,58 +4,78 @@
from collections import deque
from contextlib import suppress
from os import walk, path
-from os.path import join, dirname, exists, relpath, getmtime
-from shutil import copy2
from tempfile import mkdtemp
-from typing import AsyncIterable
+from typing import Iterable, Dict
-async def iterfiles(path: str) -> AsyncIterable[str]:
- for dir_path, _, filenames in walk(path):
+def iterfiles(file_path: str) -> Iterable[str]:
+ for dir_path, _, filenames in walk(file_path):
for filename in filenames:
- yield join(dir_path, filename)
+ yield path.join(dir_path, filename)
-def makedirs(path: str) -> None:
- os.makedirs(path, 0o755, True)
+def makedirs(file_path: str) -> None:
+ os.makedirs(file_path, 0o755, True)
-def hashfile(path: str) -> str:
- return hashlib.md5(':'.join([str(getmtime(path)), path]).encode('utf-8')).hexdigest()
+def hashfile(file_path: str) -> str:
+ return hashlib.md5(':'.join([str(path.getmtime(file_path)), file_path]).encode('utf-8')).hexdigest()
+
+
+async def copy_directory(source_path: str, destination_path: str):
+ for file_source_path in iterfiles(source_path):
+ file_destination_path = path.join(destination_path, path.relpath(file_source_path, source_path))
+ try:
+ shutil.copy2(file_source_path, file_destination_path)
+ except FileNotFoundError:
+ makedirs(path.dirname(file_destination_path))
+ shutil.copy2(file_source_path, file_destination_path)
class FileSystem:
- def __init__(self, *paths):
+ def __init__(self, *paths: str):
+ """
+ :param paths: The paths to each individual layer of the file system, from high to low priority.
+ """
self._paths = deque(paths)
@property
def paths(self) -> deque:
return self._paths
- async def open(self, *file_paths: str):
- for file_path in file_paths:
- for fs_path in self._paths:
- with suppress(FileNotFoundError):
- return open(join(fs_path, file_path))
- raise FileNotFoundError
+ async def copy_file(self, source_path: str, destination_path: str) -> None:
+ makedirs(path.dirname(destination_path))
- async def copy2(self, source_path: str, destination_path: str) -> str:
for fs_path in self._paths:
with suppress(FileNotFoundError):
- return copy2(join(fs_path, source_path), destination_path)
- tried_paths = [join(fs_path, source_path) for fs_path in self._paths]
- raise FileNotFoundError('Could not find any of %s.' %
- ', '.join(tried_paths))
-
- async def copytree(self, source_path: str, destination_path: str) -> str:
- for fs_path in self._paths:
- async for file_source_path in iterfiles(join(fs_path, source_path)):
- file_destination_path = join(destination_path, relpath(
- file_source_path, join(fs_path, source_path)))
- if not exists(file_destination_path):
- makedirs(dirname(file_destination_path))
- copy2(file_source_path, file_destination_path)
- return destination_path
+ return shutil.copyfile(path.join(fs_path, source_path), destination_path)
+
+ tried_paths = [path. join(fs_path, source_path) for fs_path in self._paths]
+ raise FileNotFoundError('Could not find any of %s.' % ', '.join(tried_paths))
+
+ async def copy_directory(self, source_path: str, destination_path: str) -> None:
+ makedirs(destination_path)
+
+ tries = []
+ for fs_path in reversed(self._paths):
+ try:
+ await copy_directory(path.join(fs_path, source_path), destination_path)
+ tries.append(True)
+ except FileNotFoundError:
+ tries.append(False)
+
+ if True not in tries:
+ tried_paths = [path. join(fs_path, source_path) for fs_path in self._paths]
+ raise FileNotFoundError('Could not find any of %s.' % ', '.join(tried_paths))
+
+ def iterfiles(self, directory_path: str) -> Dict[str, str]:
+ file_paths = {}
+ for fs_path in reversed(self._paths):
+ for dir_path, _, filenames in walk(directory_path):
+ for filename in filenames:
+ file_path = path.join(dir_path, filename)
+ file_paths[path.relpath(file_path, fs_path)] = file_path
+ return file_paths
class DirectoryBackup:
diff --git a/betty/functools.py b/betty/functools.py
index 6c4d0b730..e87a8a1a4 100644
--- a/betty/functools.py
+++ b/betty/functools.py
@@ -22,18 +22,13 @@ def walk(item, attribute_name):
yield from walk(child, attribute_name)
-async def asynciter(items: Union[Iterable, AsyncIterable]) -> AsyncIterable:
- if hasattr(items, '__aiter__'):
- async for item in items:
- yield item
- return
- for item in items:
- yield item
-
-
def sync(f):
if iscoroutine(f):
- return asyncio.get_event_loop().run_until_complete(f)
+ try:
+ loop = asyncio.get_running_loop()
+ except RuntimeError:
+ loop = asyncio.get_event_loop()
+ return loop.run_until_complete(f)
elif iscoroutinefunction(f):
@wraps(f)
def _synced(*args, **kwargs):
diff --git a/betty/generate.py b/betty/generate.py
index 26e085213..6bb345a0b 100644
--- a/betty/generate.py
+++ b/betty/generate.py
@@ -1,20 +1,20 @@
import logging
import os
-from contextlib import suppress
from json import dump
-from os import chmod
-from os.path import join
-from typing import Iterable, Any
+from os import chmod, path
+from tempfile import TemporaryDirectory
+from typing import Iterable, Union
from babel import Locale
-from jinja2 import Environment, TemplateNotFound
-from betty.fs import makedirs
-from betty.json import JSONEncoder
+from betty.ancestry import Resource, Identifiable
from betty.openapi import build_specification
from betty.site import Site
+IdentifiableResource = Union[Resource, Identifiable]
+
+
class PostStaticGenerator:
async def post_static_generate(self) -> None:
raise NotImplementedError
@@ -27,131 +27,65 @@ async def post_generate(self) -> None:
async def generate(site: Site) -> None:
logger = logging.getLogger()
- await site.assets.copytree(join('public', 'static'),
- site.configuration.www_directory_path)
- await site.renderer.render_tree(site.configuration.www_directory_path)
+ await site.assets.copy_directory(path.join('public', 'static'),
+ site.configuration.www_directory_path)
+ await site.renderer.render_directory(site.configuration.www_directory_path)
await site.dispatcher.dispatch(PostStaticGenerator, 'post_static_generate')()
for locale, locale_configuration in site.configuration.locales.items():
async with site.with_locale(locale) as site:
if site.configuration.multilingual:
- www_directory_path = join(
+ www_directory_path = path.join(
site.configuration.www_directory_path, locale_configuration.alias)
else:
www_directory_path = site.configuration.www_directory_path
- await site.assets.copytree(join('public', 'localized'), www_directory_path)
- await site.renderer.render_tree(www_directory_path)
+ await site.assets.copy_directory(path.join('public', 'localized'), www_directory_path)
+ await site.renderer.render_directory(www_directory_path)
locale_label = Locale.parse(locale, '-').get_display_name()
- await _generate_entity_type(www_directory_path, site.ancestry.files.values(
- ), 'file', site, locale, site.jinja2_environment)
- logger.info('Generated pages for %d files in %s.' %
- (len(site.ancestry.files), locale_label))
- await _generate_entity_type(www_directory_path, site.ancestry.people.values(
- ), 'person', site, locale, site.jinja2_environment)
- logger.info('Generated pages for %d people in %s.' %
- (len(site.ancestry.people), locale_label))
- await _generate_entity_type(www_directory_path, site.ancestry.places.values(
- ), 'place', site, locale, site.jinja2_environment)
- logger.info('Generated pages for %d places in %s.' %
- (len(site.ancestry.places), locale_label))
- await _generate_entity_type(www_directory_path, site.ancestry.events.values(
- ), 'event', site, locale, site.jinja2_environment)
- logger.info('Generated pages for %d events in %s.' %
- (len(site.ancestry.events), locale_label))
- await _generate_entity_type(www_directory_path, site.ancestry.citations.values(
- ), 'citation', site, locale, site.jinja2_environment)
- logger.info('Generated pages for %d citations in %s.' %
- (len(site.ancestry.citations), locale_label))
- await _generate_entity_type(www_directory_path, site.ancestry.sources.values(
- ), 'source', site, locale, site.jinja2_environment)
- logger.info('Generated pages for %d sources in %s.' %
- (len(site.ancestry.sources), locale_label))
+ resources_by_type = {
+ 'file': site.ancestry.files.values(),
+ 'person': site.ancestry.people.values(),
+ 'place': site.ancestry.places.values(),
+ 'event': site.ancestry.events.values(),
+ 'citation': site.ancestry.citations.values(),
+ 'source': site.ancestry.sources.values(),
+ }
+ for resource_type, resources in resources_by_type.items():
+ await _generate_resource_type(www_directory_path, resources, resource_type, site)
+ logger.info('Generated %d %s resources in %s.' %
+ (len(site.ancestry.files), resource_type, locale_label))
_generate_openapi(www_directory_path, site)
logger.info('Generated OpenAPI documentation in %s.', locale_label)
chmod(site.configuration.www_directory_path, 0o755)
for directory_path, subdirectory_names, file_names in os.walk(site.configuration.www_directory_path):
for subdirectory_name in subdirectory_names:
- chmod(join(directory_path, subdirectory_name), 0o755)
+ chmod(path.join(directory_path, subdirectory_name), 0o755)
for file_name in file_names:
- chmod(join(directory_path, file_name), 0o644)
+ chmod(path.join(directory_path, file_name), 0o644)
await site.dispatcher.dispatch(PostGenerator, 'post_generate')()
-def _create_file(path: str) -> object:
- makedirs(os.path.dirname(path))
- return open(path, 'w')
-
-
-def _create_html_resource(path: str) -> object:
- return _create_file(os.path.join(path, 'index.html'))
-
-
-def _create_json_resource(path: str) -> object:
- return _create_file(os.path.join(path, 'index.json'))
-
-
-async def _generate_entity_type(www_directory_path: str, entities: Iterable[Any], entity_type_name: str, site: Site,
- locale: str, environment: Environment) -> None:
- await _generate_entity_type_list_html(
- www_directory_path, entities, entity_type_name, environment)
- _generate_entity_type_list_json(
- www_directory_path, entities, entity_type_name, site)
- for entity in entities:
- await _generate_entity(www_directory_path, entity,
- entity_type_name, site, locale, environment)
-
-
-async def _generate_entity_type_list_html(www_directory_path: str, entities: Iterable[Any], entity_type_name: str,
- environment: Environment) -> None:
- entity_type_path = os.path.join(www_directory_path, entity_type_name)
- with suppress(TemplateNotFound):
- template = environment.get_template(
- 'page/list-%s.html.j2' % entity_type_name)
- with _create_html_resource(entity_type_path) as f:
- f.write(await template.render_async({
- 'page_resource': '/%s/index.html' % entity_type_name,
- 'entity_type_name': entity_type_name,
- 'entities': entities,
- }))
-
-
-def _generate_entity_type_list_json(www_directory_path: str, entities: Iterable[Any], entity_type_name: str, site: Site) -> None:
- entity_type_path = os.path.join(www_directory_path, entity_type_name)
- with _create_json_resource(entity_type_path) as f:
- data = {
- '$schema': site.static_url_generator.generate('schema.json#/definitions/%sCollection' % entity_type_name, absolute=True),
- 'collection': []
- }
- for entity in entities:
- data['collection'].append(site.localized_url_generator.generate(
- entity, 'application/json', absolute=True))
- dump(data, f)
-
-
-async def _generate_entity(www_directory_path: str, entity: Any, entity_type_name: str, site: Site, locale: str, environment: Environment) -> None:
- await _generate_entity_html(www_directory_path, entity,
- entity_type_name, environment)
- _generate_entity_json(www_directory_path, entity,
- entity_type_name, site, locale)
-
-
-async def _generate_entity_html(www_directory_path: str, entity: Any, entity_type_name: str, environment: Environment) -> None:
- entity_path = os.path.join(www_directory_path, entity_type_name, entity.id)
- with _create_html_resource(entity_path) as f:
- f.write(await environment.get_template('page/%s.html.j2' % entity_type_name).render_async({
- 'page_resource': entity,
- 'entity_type_name': entity_type_name,
- entity_type_name: entity,
- }))
-
+async def _generate_resource_type(www_directory_path: str, resources: Iterable[IdentifiableResource], resource_type_name: str, site: Site) -> None:
+ resources_template_directory_path = path.join('templates', 'resource-collection', resource_type_name)
+ resources_destination_path = path.join(www_directory_path, resource_type_name)
+ await site.assets.copy_directory(resources_template_directory_path, resources_destination_path)
+ if path.exists(resources_destination_path):
+ await site.renderer.render_directory(resources_destination_path, {
+ 'file_resources': resources,
+ })
-def _generate_entity_json(www_directory_path: str, entity: Any, entity_type_name: str, site: Site, locale: str) -> None:
- entity_path = os.path.join(www_directory_path, entity_type_name, entity.id)
- with _create_json_resource(entity_path) as f:
- dump(entity, f, cls=JSONEncoder.get_factory(site, locale))
+ resource_template_directory_path = path.join('templates', 'resource', resource_type_name)
+ with TemporaryDirectory() as intermediate_directory_path:
+ await site.assets.copy_directory(resource_template_directory_path, intermediate_directory_path)
+ render_directory_to = await site.renderer.render_directory_to(intermediate_directory_path)
+ for resource in resources:
+ resource_destination_path = path.join(www_directory_path, resource.resource_type_name, resource.id)
+ await render_directory_to(resource_destination_path, {
+ 'file_resource': resource,
+ })
def _generate_openapi(www_directory_path: str, site: Site) -> None:
- with open(join(www_directory_path, 'api', 'index.json'), 'w') as f:
+ with open(path.join(www_directory_path, 'api', 'index.json'), 'w') as f:
dump(build_specification(site), f)
diff --git a/betty/jinja2.py b/betty/jinja2.py
index 7f4aa6fd5..d1f68ad8c 100644
--- a/betty/jinja2.py
+++ b/betty/jinja2.py
@@ -16,7 +16,6 @@
from geopy import units
from geopy.format import DEGREES_FORMAT
from jinja2 import Environment, select_autoescape, evalcontextfilter, escape, FileSystemLoader, contextfilter, Template
-from jinja2.asyncsupport import auto_await
from jinja2.filters import prepare_map, make_attrgetter
from jinja2.runtime import Macro, resolve_or_missing, StrictUndefined
from jinja2.utils import htmlsafe_json_dumps
@@ -27,7 +26,6 @@
RESOURCE_TYPES
from betty.config import Configuration
from betty.fs import makedirs, hashfile, iterfiles
-from betty.functools import walk, asynciter
from betty.html import HtmlProvider
from betty.importlib import import_any
from betty.json import JSONEncoder
@@ -36,7 +34,7 @@
from betty.media_type import MediaType
from betty.path import extension
from betty.plugin import Plugin
-from betty.render import Renderer
+from betty.render import Renderer, TemplateArguments
from betty.search import Index
from betty.site import Site
@@ -96,7 +94,7 @@ def __init__(self, site: Site):
template_directory_paths = [join(path, 'templates') for path in site.assets.paths]
Environment.__init__(self,
- enable_async=True,
+ # enable_async=True,
loader=FileSystemLoader(template_directory_paths),
undefined=StrictUndefined,
autoescape=select_autoescape(['html']),
@@ -201,16 +199,33 @@ def _filter_url(context, resource, media_type=None, locale=None, **kwargs):
class Jinja2Renderer(Renderer):
+ _EXTENSIONS = {'j2'}
+
def __init__(self, environment: Environment, configuration: Configuration):
self._environment = environment
self._configuration = configuration
- async def render_file(self, file_path: str) -> None:
- if not file_path.endswith('.j2'):
- return
+ def _assert_file_path(self, file_path: str) -> None:
+ if not self.consumes_file_path(file_path):
+ raise ValueError('Cannot consume "%s".' % file_path)
+
+ def consumes_file_path(self, file_path: str) -> bool:
+ return file_path.endswith('.j2')
+
+ def update_file_path(self, file_path: str) -> str:
+ self._assert_file_path(file_path)
+ return file_path[:-3]
+
+ async def render_string(self, template: str, template_arguments: TemplateArguments = None) -> str:
+ return self._environment.from_string(template).render(**template_arguments)
+
+ async def render_file(self, file_path: str, template_arguments: TemplateArguments = None) -> None:
+ self._assert_file_path(file_path)
file_destination_path = file_path[:-3]
- data = {}
- if file_destination_path.startswith(self._configuration.www_directory_path):
+ template = _root_loader.load(self._environment, file_path, self._environment.globals)
+ if template_arguments is None:
+ template_arguments = {}
+ if 'file_resource' not in template_arguments and file_destination_path.startswith(self._configuration.www_directory_path):
# Unix-style paths use forward slashes, so they are valid URL paths.
resource = file_destination_path[len(
self._configuration.www_directory_path):]
@@ -218,21 +233,23 @@ async def render_file(self, file_path: str) -> None:
resource_parts = resource.lstrip('/').split('/')
if resource_parts[0] in map(lambda x: x.alias, self._configuration.locales.values()):
resource = '/'.join(resource_parts[1:])
- data['page_resource'] = resource
- template = _root_loader.load(self._environment, file_path, self._environment.globals)
+ template_arguments['file_resource'] = resource
with open(file_destination_path, 'w') as f:
- f.write(await template.render_async(data))
+ f.write(template.render(**template_arguments))
os.remove(file_path)
- async def render_tree(self, tree_path: str) -> None:
- await asyncio.gather(
- *[self.render_file(file_path) async for file_path in iterfiles(tree_path) if file_path.endswith('.j2')],
- )
+ async def render_directory(self, directory_path: str, template_arguments: TemplateArguments = None) -> None:
+ # await asyncio.gather(
+ # *[self.render_file(file_path, template_arguments) for file_path in iterfiles(directory_path) if self.consumes_file_path(file_path)],
+ # )
+ for file_path in iterfiles(directory_path):
+ if self.consumes_file_path(file_path):
+ await self.render_file(file_path, template_arguments)
-async def _filter_flatten(items):
- async for item in asynciter(items):
- async for child in asynciter(item):
+def _filter_flatten(items):
+ for item in items:
+ for child in item:
yield child
@@ -270,18 +287,18 @@ def _filter_format_degrees(degrees):
@contextfilter
-async def _filter_map(*args, **kwargs):
+def _filter_map(*args, **kwargs):
if len(args) == 3 and isinstance(args[2], Macro):
seq = args[1]
func = args[2]
else:
seq, func = prepare_map(args, kwargs)
if seq:
- async for item in asynciter(seq):
- yield await auto_await(func(item))
+ for item in seq:
+ yield func(item)
-async def _filter_file(site: Site, file: File) -> str:
+def _filter_file(site: Site, file: File) -> str:
file_directory_path = os.path.join(site.configuration.www_directory_path, 'file')
destination_name = '%s.%s' % (file.id, file.extension)
@@ -300,7 +317,7 @@ def _do_filter_file(file_path: str, destination_directory_path: str, destination
os.link(file_path, destination_file_path)
-async def _filter_image(site: Site, file: File, width: Optional[int] = None, height: Optional[int] = None) -> str:
+def _filter_image(site: Site, file: File, width: Optional[int] = None, height: Optional[int] = None) -> str:
if width is None and height is None:
raise ValueError('At least the width or height must be given.')
diff --git a/betty/plugin/maps/__init__.py b/betty/plugin/maps/__init__.py
index 757f482da..ed6b9dc81 100644
--- a/betty/plugin/maps/__init__.py
+++ b/betty/plugin/maps/__init__.py
@@ -37,7 +37,7 @@ async def _render(self) -> None:
with suppress(FileNotFoundError):
shutil.rmtree(build_directory_path)
shutil.copytree(path.join(self.assets_directory_path, 'js'), build_directory_path)
- await self._site.renderer.render_tree(build_directory_path)
+ await self._site.renderer.render_directory(build_directory_path)
self._site.executor.submit(_do_render, build_directory_path, self._site.configuration.www_directory_path)
diff --git a/betty/plugin/nginx/__init__.py b/betty/plugin/nginx/__init__.py
index 865d1ff5c..ab9c44453 100644
--- a/betty/plugin/nginx/__init__.py
+++ b/betty/plugin/nginx/__init__.py
@@ -53,8 +53,8 @@ async def _generate_config(self) -> None:
# Render the ngnix configuration.
file_name = 'nginx.conf.j2'
destination_file_path = os.path.join(output_directory_path, file_name)
- await self._site.assets.copy2(file_name, destination_file_path)
- await self._site.renderer.render_file(destination_file_path)
+ await self._site.assets.copy_file(file_name, destination_file_path)
+ await self._site.renderer.render_directory(output_directory_path)
# Render the Dockerfile.
copyfile(os.path.join(DOCKER_PATH, 'Dockerfile'), os.path.join(output_directory_path, 'Dockerfile'))
diff --git a/betty/plugin/trees/__init__.py b/betty/plugin/trees/__init__.py
index 5f2768e2b..611309cc2 100644
--- a/betty/plugin/trees/__init__.py
+++ b/betty/plugin/trees/__init__.py
@@ -37,7 +37,7 @@ async def _render(self) -> None:
with suppress(FileNotFoundError):
shutil.rmtree(build_directory_path)
shutil.copytree(path.join(self.assets_directory_path, 'js'), build_directory_path)
- await self._site.renderer.render_tree(build_directory_path)
+ await self._site.renderer.render_directory(build_directory_path)
self._site.executor.submit(_do_render, build_directory_path, self._site.configuration.www_directory_path)
diff --git a/betty/plugin/trees/assets/public/localized/people.json.j2 b/betty/plugin/trees/assets/public/localized/people.json.j2
index 437ee5c67..f676f8a7d 100644
--- a/betty/plugin/trees/assets/public/localized/people.json.j2
+++ b/betty/plugin/trees/assets/public/localized/people.json.j2
@@ -10,8 +10,8 @@
'id': person.id,
'label': person_label | striptags,
'url': person | url,
- 'parentIds': person.parents | map(attribute='id') | list,
- 'childIds': person.children | map(attribute='id') | list,
+ 'parentIds': person.parents | list,
+ 'childIds': person.children | list,
}
}) %}
{% endfor %}
diff --git a/betty/plugin/wikipedia/__init__.py b/betty/plugin/wikipedia/__init__.py
index 52542bae5..ea470cfbd 100644
--- a/betty/plugin/wikipedia/__init__.py
+++ b/betty/plugin/wikipedia/__init__.py
@@ -15,6 +15,7 @@
from betty.ancestry import Link, HasLinks, Resource
from betty.fs import makedirs
+from betty.functools import sync
from betty.jinja2 import Jinja2Provider
from betty.locale import Localized, negotiate_locale
from betty.parse import PostParser
@@ -227,6 +228,7 @@ def filters(self) -> Dict[str, Callable]:
}
@contextfilter
+ @sync
async def _filter_wikipedia_links(self, context, links: Iterable[Link]) -> Iterable[Entry]:
locale = parse_locale(resolve_or_missing(context, 'locale'), '-')[0]
return filter(None, await asyncio.gather(*[self._filter_wikipedia_link(locale, link) for link in links]))
diff --git a/betty/render.py b/betty/render.py
index ed400133e..2ddc52379 100644
--- a/betty/render.py
+++ b/betty/render.py
@@ -1,22 +1,150 @@
-from typing import List
+from os import path
+from typing import Optional, Dict, Any, Sequence, Callable, Tuple, Awaitable, List
+
+from betty.fs import iterfiles, makedirs
+
+_Pipeline = Sequence[Callable]
+_PipelineKwargs = Dict
+_Pipe = Callable[[_PipelineKwargs], Awaitable[_PipelineKwargs]]
+TemplateArguments = Optional[Dict[str, Any]]
+
+
+class SequentialRenderDirectoryTo:
+ def __init__(self, renderers: Sequence['Renderer'], source_directory_path: str):
+ self._renderers = renderers
+ self._source_directory_path = source_directory_path
+ self._pipelines = []
+ self._initialized = False
+
+ async def __call__(self, destination_directory_path: str, template_arguments: TemplateArguments = None) -> None:
+ await self._build_pipelines()
+ for pipeline, initial_pipeline_kwargs in self._pipelines:
+ pipeline_kwargs = initial_pipeline_kwargs.copy()
+ pipeline_kwargs['destination_directory_path'] = destination_directory_path
+ await self._execute_pipeline(pipeline, pipeline_kwargs, template_arguments)
+
+ async def _execute_pipeline(self, pipeline, pipeline_kwargs, template_arguments: TemplateArguments) -> None:
+ pipeline_kwargs['template_arguments'] = template_arguments
+ for pipe in pipeline:
+ pipeline_kwargs = await pipe(pipeline_kwargs)
+
+ async def _build_pipelines(self):
+ if self._initialized:
+ return
+ self._initialized = True
+
+ for file_path in iterfiles(self._source_directory_path):
+ self._pipelines.append(await self._build_pipeline(file_path, self._collect_renderers(file_path)))
+
+ def _collect_renderers(self, file_path: str) -> List['Renderer']:
+ for renderer in self._renderers:
+ if renderer.consumes_file_path(file_path):
+ return [renderer] + self._collect_renderers(renderer.update_file_path(file_path))
+ return []
+
+ async def _build_pipeline(self, file_path: str, renderers: Sequence['Renderer']) -> Tuple[_Pipeline, _PipelineKwargs]:
+ initial_pipeline_kwargs = {
+ 'file_path': file_path,
+ 'destination_directory_path': None,
+ 'template': None,
+ 'bytes': None,
+ 'template_arguments': {},
+ }
+ if renderers:
+ initial_pipeline_kwargs = await self._render_file_to_string()(initial_pipeline_kwargs)
+ pipeline = []
+ for renderer in renderers:
+ pipeline.append(self._render_string(renderer))
+ pipeline.append(self._render_string_to_file())
+ else:
+ initial_pipeline_kwargs = await self._render_file_to_bytes()(initial_pipeline_kwargs)
+ pipeline = [lambda pipeline_kwargs: self._render_bytes_to_file()]
+
+ return pipeline, initial_pipeline_kwargs
+
+ def _render_string(self, renderer: 'Renderer') -> _Pipe:
+ async def _render(pipeline_kwargs: _PipelineKwargs) -> _PipelineKwargs:
+ pipeline_kwargs['file_path'] = renderer.update_file_path(pipeline_kwargs['file_path'])
+ pipeline_kwargs['template'] = await renderer.render_string(template=pipeline_kwargs['template'], template_arguments=pipeline_kwargs['template_arguments'])
+ return pipeline_kwargs
+ return _render
+
+ def _render_file_to_string(self) -> _Pipe:
+ async def _render(pipeline_kwargs: _PipelineKwargs) -> _PipelineKwargs:
+ with open(pipeline_kwargs['file_path']) as f:
+ pipeline_kwargs['template'] = f.read()
+ return pipeline_kwargs
+ return _render
+
+ def _render_string_to_file(self) -> _Pipe:
+ async def _render(pipeline_kwargs: _PipelineKwargs) -> _PipelineKwargs:
+ destination_file_path = path.join(pipeline_kwargs['destination_directory_path'], path.relpath(pipeline_kwargs['file_path'], self._source_directory_path))
+ makedirs(path.dirname(destination_file_path))
+ with open(destination_file_path, 'w') as f:
+ f.write(pipeline_kwargs['template'])
+ return pipeline_kwargs
+ return _render
+
+ def _render_file_to_bytes(self) -> _Pipe:
+ async def _render(pipeline_kwargs: _PipelineKwargs) -> _PipelineKwargs:
+ with open(pipeline_kwargs['file_path'], 'rb') as f:
+ pipeline_kwargs['bytes'] = f.read()
+ return pipeline_kwargs
+ return _render
+
+ def _render_bytes_to_file(self) -> _Pipe:
+ async def _render(pipeline_kwargs: _PipelineKwargs) -> _PipelineKwargs:
+ destination_file_path = path.join(pipeline_kwargs['destination_directory_path'], path.relpath(pipeline_kwargs['file_path'], self._source_directory_path))
+ makedirs(path.dirname(destination_file_path))
+ with open(destination_file_path, 'wb') as f:
+ f.write(pipeline_kwargs['bytes'])
+ return pipeline_kwargs
+ return _render
class Renderer:
- async def render_file(self, file_path: str) -> None:
+ async def render_string(self, template: str, template_arguments: TemplateArguments = None) -> str:
+ raise NotImplementedError
+
+ def consumes_file_path(self, file_path: str) -> bool:
+ raise NotImplementedError
+
+ def update_file_path(self, file_path: str) -> str:
+ """
+ Update a file path as if it has been rendered by this renderer.
+ """
raise NotImplementedError
- async def render_tree(self, tree_path: str) -> None:
+ async def render_file(self, file_path: str, template_arguments: TemplateArguments = None) -> None:
raise NotImplementedError
+ async def render_directory(self, directory_path: str, template_arguments: TemplateArguments = None) -> None:
+ raise NotImplementedError
+
+ async def render_directory_to(self, directory_path: str) -> SequentialRenderDirectoryTo:
+ return SequentialRenderDirectoryTo([self], directory_path)
+
class SequentialRenderer(Renderer):
- def __init__(self, renderers: List[Renderer]):
+ def __init__(self, renderers: Sequence[Renderer]):
self._renderers = renderers
- async def render_file(self, file_path: str) -> None:
+ def consumes_file_path(self, file_path: str) -> bool:
+ return True
+
+ def update_file_path(self, file_path: str) -> str:
for renderer in self._renderers:
- await renderer.render_file(file_path)
+ if renderer.consumes_file_path(file_path):
+ file_path = renderer.update_file_path(file_path)
+ return file_path
- async def render_tree(self, tree_path: str) -> None:
+ async def render_file(self, file_path: str, template_arguments: TemplateArguments = None) -> None:
for renderer in self._renderers:
- await renderer.render_tree(tree_path)
+ await renderer.render_file(file_path, template_arguments)
+
+ async def render_directory(self, directory_path: str, template_arguments: TemplateArguments = None) -> None:
+ for renderer in self._renderers:
+ await renderer.render_directory(directory_path, template_arguments)
+
+ async def render_directory_to(self, directory_path: str) -> SequentialRenderDirectoryTo:
+ return SequentialRenderDirectoryTo(self._renderers, directory_path)
diff --git a/betty/sass.py b/betty/sass.py
index 768387856..1464e8d95 100644
--- a/betty/sass.py
+++ b/betty/sass.py
@@ -3,30 +3,40 @@
import sass
-from betty.render import Renderer
+from betty.render import Renderer, TemplateArguments
class SassRenderer(Renderer):
- _EXTENSIONS = ('sass', 'scss')
+ _EXTENSIONS = {'sass', 'scss'}
- async def render_file(self, file_path: str) -> None:
- if not file_path.endswith(self._EXTENSIONS):
- return
- self._compile(filename=file_path)
+ def _assert_file_path(self, file_path: str) -> None:
+ if not self.consumes_file_path(file_path):
+ raise ValueError('Cannot consume "%s".' % file_path)
+
+ def consumes_file_path(self, file_path: str) -> bool:
+ return file_path.endswith(tuple(self._EXTENSIONS))
+
+ def update_file_path(self, file_path: str) -> str:
+ self._assert_file_path(file_path)
+ return file_path[:-3]
+
+ async def render_string(self, template: str, template_arguments: TemplateArguments = None) -> str:
+ return sass.compile(string=template)
+
+ async def render_file(self, file_path: str, file_arguments: TemplateArguments = None) -> None:
+ self._assert_file_path(file_path)
+ sass.compile(filename=(file_path, file_path))
os.remove(file_path)
- async def render_tree(self, tree_path: str) -> None:
- self._compile(dirname=(tree_path, tree_path))
+ async def render_directory(self, directory_path: str, file_arguments: TemplateArguments = None) -> None:
+ sass.compile(dirname=(directory_path, directory_path))
for extension in self._EXTENSIONS:
patterns = [
# Files in the path.
- os.path.join(tree_path, '*.' + extension),
+ os.path.join(directory_path, '*.' + extension),
# Files in the path's subdirectories.
- os.path.join(tree_path, '**', '*.' + extension),
+ os.path.join(directory_path, '**', '*.' + extension),
]
for pattern in patterns:
for file_path in glob(pattern):
os.remove(file_path)
-
- def _compile(self, **kwargs) -> None:
- sass.compile(output_style='compressed', **kwargs)
diff --git a/betty/search.py b/betty/search.py
index 80a1732f3..86f92177b 100644
--- a/betty/search.py
+++ b/betty/search.py
@@ -9,15 +9,16 @@ class Index:
def __init__(self, site: Site):
self._site = site
- async def build(self) -> Iterable[Dict]:
- return filter(None, await asyncio.gather(*[
- *[self._build_person(person) for person in self._site.ancestry.people.values()],
- *[self._build_place(place) for place in self._site.ancestry.places.values()],
- *[self._build_file(file) for file in self._site.ancestry.files.values()],
- ]))
+ def build(self) -> Iterable[Dict]:
+ return [{}]
+ # return filter(None, await asyncio.gather(*[
+ # *[self._build_person(person) for person in self._site.ancestry.people.values()],
+ # *[self._build_place(place) for place in self._site.ancestry.places.values()],
+ # *[self._build_file(file) for file in self._site.ancestry.files.values()],
+ # ]))
async def _render_resource(self, resource: Resource):
- return await self._site.jinja2_environment.get_template('search/result-%s.html.j2' % resource.resource_type_name).render_async({
+ return self._site.jinja2_environment.get_template('search/result-%s.html.j2' % resource.resource_type_name).render({
resource.resource_type_name: resource,
})
diff --git a/betty/site.py b/betty/site.py
index e8aeb9786..751622784 100644
--- a/betty/site.py
+++ b/betty/site.py
@@ -8,7 +8,7 @@
from betty.concurrent import ExceptionRaisingExecutor
from betty.dispatch import Dispatcher
from betty.lock import Locks
-from betty.render import Renderer, SequentialRenderer
+from betty.render import SequentialRenderer
from betty.sass import SassRenderer
try:
@@ -178,7 +178,7 @@ def jinja2_environment(self) -> Environment:
return self._jinja2_environment
@property
- def renderer(self) -> Renderer:
+ def renderer(self) -> SequentialRenderer:
if not self._renderer:
from betty.jinja2 import Jinja2Renderer
self._renderer = SequentialRenderer([
diff --git a/betty/tests/test_fs.py b/betty/tests/test_fs.py
index 5dee3f39d..d563b9a50 100644
--- a/betty/tests/test_fs.py
+++ b/betty/tests/test_fs.py
@@ -9,8 +9,7 @@
class IterfilesTest(TestCase):
- @sync
- async def test_iterfiles(self):
+ def test_iterfiles(self):
with TemporaryDirectory() as path:
subdirpath = join(path, 'subdir')
mkdir(subdirpath)
@@ -18,7 +17,7 @@ async def test_iterfiles(self):
open(join(path, '.hiddenrootfile'), 'a').close()
open(join(subdirpath, 'subdirfile'), 'a').close()
actual = [actualpath[len(path) + 1:]
- async for actualpath in iterfiles(path)]
+ for actualpath in iterfiles(path)]
expected = [
'.hiddenrootfile',
'rootfile',
@@ -43,81 +42,7 @@ def test_hashfile_with_different_files(self):
class FileSystemTest(TestCase):
@sync
- async def test_open(self):
- with TemporaryDirectory() as source_path_1:
- with TemporaryDirectory() as source_path_2:
- with open(join(source_path_1, 'apples'), 'w') as f:
- f.write('apples')
- with open(join(source_path_2, 'apples'), 'w') as f:
- f.write('notapples')
- with open(join(source_path_1, 'oranges'), 'w') as f:
- f.write('oranges')
- with open(join(source_path_2, 'bananas'), 'w') as f:
- f.write('bananas')
-
- sut = FileSystem(source_path_1, source_path_2)
-
- with await sut.open('apples') as f:
- self.assertEquals('apples', f.read())
- with await sut.open('oranges') as f:
- self.assertEquals('oranges', f.read())
- with await sut.open('bananas') as f:
- self.assertEquals('bananas', f.read())
-
- with self.assertRaises(FileNotFoundError):
- with await sut.open('mangos'):
- pass
-
- @sync
- async def test_open_with_first_file_path_alternative_first_source_path(self):
- with TemporaryDirectory() as source_path_1:
- with TemporaryDirectory() as source_path_2:
- with open(join(source_path_1, 'pinkladies'), 'w') as f:
- f.write('pinkladies')
- with open(join(source_path_2, 'pinkladies'), 'w') as f:
- f.write('notpinkladies')
- with open(join(source_path_1, 'apples'), 'w') as f:
- f.write('notpinkladies')
- with open(join(source_path_2, 'apples'), 'w') as f:
- f.write('notpinkladies')
-
- sut = FileSystem(source_path_1, source_path_2)
-
- with await sut.open('pinkladies', 'apples') as f:
- self.assertEquals('pinkladies', f.read())
-
- @sync
- async def test_open_with_first_file_path_alternative_second_source_path(self):
- with TemporaryDirectory() as source_path_1:
- with TemporaryDirectory() as source_path_2:
- with open(join(source_path_2, 'pinkladies'), 'w') as f:
- f.write('pinkladies')
- with open(join(source_path_1, 'apples'), 'w') as f:
- f.write('notpinkladies')
- with open(join(source_path_2, 'apples'), 'w') as f:
- f.write('notpinkladies')
-
- sut = FileSystem(source_path_1, source_path_2)
-
- with await sut.open('pinkladies', 'apples') as f:
- self.assertEquals('pinkladies', f.read())
-
- @sync
- async def test_open_with_second_file_path_alternative_first_source_path(self):
- with TemporaryDirectory() as source_path_1:
- with TemporaryDirectory() as source_path_2:
- with open(join(source_path_1, 'apples'), 'w') as f:
- f.write('apples')
- with open(join(source_path_2, 'apples'), 'w') as f:
- f.write('notapples')
-
- sut = FileSystem(source_path_1, source_path_2)
-
- with await sut.open('pinkladies', 'apples') as f:
- self.assertEquals('apples', f.read())
-
- @sync
- async def test_copy2(self):
+ async def test_copy(self):
with TemporaryDirectory() as source_path_1:
with TemporaryDirectory() as source_path_2:
with open(join(source_path_1, 'apples'), 'w') as f:
@@ -132,22 +57,22 @@ async def test_copy2(self):
with TemporaryDirectory() as destination_path:
sut = FileSystem(source_path_1, source_path_2)
- await sut.copy2('apples', destination_path)
- await sut.copy2('oranges', destination_path)
- await sut.copy2('bananas', destination_path)
+ await sut.copy_file('apples', join(destination_path, 'apples'))
+ await sut.copy_file('oranges', join(destination_path, 'oranges'))
+ await sut.copy_file('bananas', join(destination_path, 'bananas'))
- with await sut.open(join(destination_path, 'apples')) as f:
+ with open(join(destination_path, 'apples')) as f:
self.assertEquals('apples', f.read())
- with await sut.open(join(destination_path, 'oranges')) as f:
+ with open(join(destination_path, 'oranges')) as f:
self.assertEquals('oranges', f.read())
- with await sut.open(join(destination_path, 'bananas')) as f:
+ with open(join(destination_path, 'bananas')) as f:
self.assertEquals('bananas', f.read())
with self.assertRaises(FileNotFoundError):
- await sut.copy2('mangos', destination_path)
+ await sut.copy_file('mangos', destination_path)
@sync
- async def test_copytree(self):
+ async def test_copy_tree(self):
with TemporaryDirectory() as source_path_1:
os.makedirs(join(source_path_1, 'basket'))
with TemporaryDirectory() as source_path_2:
@@ -164,11 +89,11 @@ async def test_copytree(self):
with TemporaryDirectory() as destination_path:
sut = FileSystem(source_path_1, source_path_2)
- await sut.copytree('', destination_path)
+ await sut.copy_directory('', destination_path)
- with await sut.open(join(destination_path, 'basket', 'apples')) as f:
+ with open(join(destination_path, 'basket', 'apples')) as f:
self.assertEquals('apples', f.read())
- with await sut.open(join(destination_path, 'basket', 'oranges')) as f:
+ with open(join(destination_path, 'basket', 'oranges')) as f:
self.assertEquals('oranges', f.read())
- with await sut.open(join(destination_path, 'basket', 'bananas')) as f:
+ with open(join(destination_path, 'basket', 'bananas')) as f:
self.assertEquals('bananas', f.read())
diff --git a/betty/tests/test_generate.py b/betty/tests/test_generate.py
index 412b1d87e..0342bd9c3 100644
--- a/betty/tests/test_generate.py
+++ b/betty/tests/test_generate.py
@@ -42,7 +42,7 @@ def assert_betty_json(self, path: str, schema_definition: str) -> str:
return file_path
-class RenderTest(GenerateTestCase):
+class GenerateTest(GenerateTestCase):
def setUp(self):
GenerateTestCase.setUp(self)
configuration = Configuration(
@@ -54,12 +54,6 @@ async def test_front_page(self):
await generate(self.site)
self.assert_betty_html('/index.html')
- @sync
- async def test_files(self):
- await generate(self.site)
- self.assert_betty_html('/file/index.html')
- self.assert_betty_json('/file/index.json', 'fileCollection')
-
@sync
async def test_file(self):
with NamedTemporaryFile() as f: