Commits on Jun 6, 2023

1. Fix#908: Omit shadowed assets from build (#1147) …

   * test: add test to exercise#908* refactor(lektor.assets): present a single merged asset treeWhen themes are in use, assets can be located in one of multiple assetdirectories.Previously, in this case, we dealt with multiple asset roots, eachwith their own heirarchy of descendant assets. Some of thesedescendants can be shadowed by assets in one of the other asset roots,and should be ignored. This is difficult to manage.Here we refactor the code in `lektor.assets` to present a singlelogical merged asset tree which overlays the assets from the primaryproject `assets` directory with the `assets` directories of anythemes.* refactor(lektor.assets): be more careful about validating path components* refactor(lektor.assets): refactor Asset.resolve_url_pathThis cleans up the logic for detecting cases where the URL (or asset)name differs from the source file name. (There are cases where thesuffixes of the names can differ.)This disuses and deprecates the `from_url` parameter to`Asset.get_child`.* refactor(lektor.assets)!: remove vestigial method `Asset.build_asset``Asset.build_asset` is an undocumented no-op. It appears to beunreferenced by Lektor itself as well as all Lektor plugins that I'vebeen able to find.* tests(lektor.assets): enough annotations to get mypy to pass* tests(lektor.assets): increase test coverage* fix: do not Path.resolve() asset rootsThis was breaking the (imperfect) logic in`lektor.builder.PathCache.to_source_file` which checks that sourcefiles are contained within the project tree.* refactor(lektor.assets): cache child assets on DirectoryOptimization.Since Assets are tied to a Pad, the cache lifetime will match that ofthe Pad. This seems appropriate.

   

   dairiki authoredJun 6, 2023
   Configuration menu

   • View commit details
   • Copy full SHA for 998e50d
   • Browse repository at this point

   Copy the full SHA

   998e50dView commit details

   Browse the repository at this point in the history

2. Release 3.4.0b8

   

   dairiki committedJun 6, 2023
   Configuration menu

   • View commit details
   • Copy full SHA for 05ba62f
   • Browse repository at this point

   Copy the full SHA

   05ba62fView commit details

   Browse the repository at this point in the history