mandlm/WebSlider
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added filetype-globs to config, log requests to console

Browse source
This commit is contained in:
Michael Mandl 2019-01-01 17:46:33 +01:00
parent 30ee37bf74
commit 6c80f52f01
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config.py
View file

@ -3,3 +3,4 @@ recursive = True
refresh = 5 refresh = 5
cachedir = "auto" cachedir = "auto"
resolution = (1920, 1080) resolution = (1920, 1080)
filetypes = ["*.jpg", "*.JPG"]

27
slider.py
View file

@ -1,6 +1,13 @@
#!/usr/bin/python3 #!/usr/bin/python3
from flask import Flask, render_template, send_from_directory, redirect, url_for from flask import (
Flask,
render_template,
send_from_directory,
redirect,
url_for,
request,
)
from random import choice from random import choice
from pathlib import Path from pathlib import Path
from PIL import Image from PIL import Image
@ -15,7 +22,6 @@ import config
app = Flask(__name__) app = Flask(__name__)
imgdir = Path(config.imgdir).expanduser().resolve() imgdir = Path(config.imgdir).expanduser().resolve()
img_glob = "**/*.jpg" if config.recursive else "*.jpg"
cache_resolution = config.resolution cache_resolution = config.resolution
cache_dir = ( cache_dir = (
Path(gettempdir()) / "webslider" Path(gettempdir()) / "webslider"
@ -24,22 +30,32 @@ cache_dir = (
) / ("%sx%s" % cache_resolution) ) / ("%sx%s" % cache_resolution)
def find_images():
images = set()
for filetype in config.filetypes:
glob = "**/" + filetype if config.recursive else filetype
images.update(imgdir.glob(glob))
return list(images)
@app.route("/") @app.route("/")
def random(): def random():
print(request.remote_addr, request.base_url)
return render_template("random.html", refresh=config.refresh) return render_template("random.html", refresh=config.refresh)
@app.route("/random_image/") @app.route("/random_image/")
def random_image(): def random_image():
print(request.remote_addr, request.base_url)
try: try:
last_modified_time, last_modified_file = max( last_modified_time, last_modified_file = max(
(f.stat().st_mtime, f) for f in imgdir.glob(img_glob) (f.stat().st_mtime, f) for f in find_images()
) )
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(img_glob)) images = find_images()
selected_image = choice(images).relative_to(imgdir) selected_image = choice(images).relative_to(imgdir)
except ValueError: except ValueError:
return redirect(url_for("static", filename="clear.gif")) return redirect(url_for("static", filename="clear.gif"))
@ -52,6 +68,7 @@ def random_image():
@app.route("/img/<path:filename>") @app.route("/img/<path:filename>")
def image(filename): def image(filename):
print(request.remote_addr, request.base_url)
cache_filename = create_cache_file(filename) cache_filename = create_cache_file(filename)
return send_from_directory(cache_dir, cache_filename) return send_from_directory(cache_dir, cache_filename)
@ -88,7 +105,7 @@ def get_cache_filename(filename):
def pre_cache_images(): def pre_cache_images():
for image_file in sorted(imgdir.glob(img_glob)): for image_file in sorted(find_images()):
create_cache_file(image_file.relative_to(imgdir)) create_cache_file(image_file.relative_to(imgdir))