Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion prosopopee/autogen.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def build_template(folder, force):
cover=gallery_settings["cover"],
files=sorted(files_grabbed, key=get_exif),
)
settings = open(Path(".").joinpath(folder, "settings.yaml").abspath(), "w")
settings = open(Path(".").joinpath(folder, "settings.yaml").absolute(), "w")
settings.write(msg)
logging.info("Generation: %s gallery", folder)

Expand Down
7 changes: 3 additions & 4 deletions prosopopee/prosopopee.py
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ def get_gallery_templates(
theme_path = Path(__file__).parent.joinpath("themes", theme).exists()

available_themes = theme, "', '".join(
Path(__file__).parent.joinpath("themes").listdir()
Path(__file__).parent.joinpath("themes").iterdir()
)

if not theme_path:
Expand Down Expand Up @@ -540,7 +540,7 @@ def process_directory(

sub_galleries = [
x
for x in Path(".").joinpath(gallery_path).listdir()
for x in Path(".").joinpath(gallery_path).iterdir()
if x.joinpath("settings.yaml").exists()
]

Expand Down Expand Up @@ -758,7 +758,7 @@ def main():
front_page_galleries_cover = []

galleries_dirs = [
x for x in Path(".").listdir() if x.joinpath("settings.yaml").exists()
x for x in Path(".").iterdir() if x.joinpath("settings.yaml").exists()
]
includes = [x for x in settings["include"] if Path(".").joinpath(x).exists()]

Expand Down Expand Up @@ -828,7 +828,6 @@ def main():
theme = settings["settings"].get("theme", "exposure")
date_locale = settings["settings"].get("date_locale")
templates = get_gallery_templates(theme, date_locale=date_locale)
templates.add_extension("jinja2.ext.with_")

if Path("custom.js").exists():
shutil.copy(Path("custom.js"), Path(".").joinpath("build", "", "static", "js"))
Expand Down
2 changes: 1 addition & 1 deletion prosopopee/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def load_settings(folder):
try:
set_yaml = yaml.YAML(typ='safe', pure=True)
with open(
Path(".").joinpath(folder, "settings.yaml").abspath(), "r"
Path(".").joinpath(folder, "settings.yaml").absolute(), "r"
) as settings:
gallery_settings = set_yaml.load(settings.read())
except (yaml.error.MarkedYAMLError, yaml.YAMLError) as exc:
Expand Down
5 changes: 2 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Babel
jinja2
jinja2<3.1.0
path
ruamel.yaml
future
pillow>=6
pillow>=10.0.0
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@
"themes/*/templates/section/*.html",
],
},
python_requires=">=3.12",
)