Configure locatoion of cache dir

This commit is contained in:
Michael Mandl 2018-11-08 09:00:00 +01:00
parent 41d7c104af
commit 13dc09c5b3
3 changed files with 13 additions and 9 deletions

1
.gitignore vendored
View file

@ -1 +1,2 @@
__pycache__/ __pycache__/
.*

View file

@ -1,2 +1,3 @@
imgdir = "." imgdir = "."
refresh = 5 refresh = 5
cachedir = ".webslider"

View file

@ -18,15 +18,16 @@ def random():
@app.route("/random_image/") @app.route("/random_image/")
def random_image(): def random_image():
img_glob = "*jpg"
imgdir = Path(config.imgdir) imgdir = Path(config.imgdir)
last_modified_time, last_modified_file = max( last_modified_time, last_modified_file = max(
(f.stat().st_mtime, f) for f in imgdir.glob("*.jpg") (f.stat().st_mtime, f) for f in imgdir.glob(img_glob)
) )
if time() - last_modified_time <= 60: if time() - last_modified_time <= 60:
selected_image = last_modified_file.relative_to(imgdir) selected_image = last_modified_file.relative_to(imgdir)
else: else:
images = list(imgdir.glob("*.jpg")) images = list(imgdir.glob(img_glob))
selected_image = choice(images).relative_to(imgdir) selected_image = choice(images).relative_to(imgdir)
return redirect(url_for("image", filename=selected_image)) return redirect(url_for("image", filename=selected_image))
@ -34,17 +35,18 @@ def random_image():
@app.route("/img/<path:filename>") @app.route("/img/<path:filename>")
def image(filename): def image(filename):
scaled_img_dir = Path(config.imgdir) / ".slider" / "fhd" cache_resolution = (1920, 1080)
cache_dir = Path(config.cachedir) / ("%sx%s" % cache_resolution)
if not scaled_img_dir.exists(): if not cache_dir.exists():
scaled_img_dir.mkdir(parents=True) cache_dir.mkdir(parents=True)
if not (scaled_img_dir / filename).exists(): if not (cache_dir / filename).exists():
img = Image.open(Path(config.imgdir) / filename) img = Image.open(Path(config.imgdir) / filename)
img.thumbnail((1920, 1080)) img.thumbnail(cache_resolution)
img.save(scaled_img_dir / filename) img.save(cache_dir / filename)
return send_from_directory(scaled_img_dir, filename) return send_from_directory(cache_dir, filename)
if __name__ == "__main__": if __name__ == "__main__":