From cc4174fd7f8603891ce221f8670ff2ef6290970b Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 26 Dec 2023 12:17:54 +0100 Subject: [PATCH] make the linter happy --- frontend.py | 102 +++++++++++++++++++++++------------------------ redis_session.py | 2 +- syncer.py | 3 -- 3 files changed, 52 insertions(+), 55 deletions(-) diff --git a/frontend.py b/frontend.py index ddbd917..3ad66ce 100644 --- a/frontend.py +++ b/frontend.py @@ -7,7 +7,7 @@ import tempfile import time from datetime import datetime -from logging import basicConfig, getLogger +from logging import basicConfig from secrets import token_hex import iso8601 @@ -449,56 +449,56 @@ def content_live(): return resp -@app.route("/content/last") -def content_last(): - assets = get_all_live_assets() - asset_by_id = dict((asset["id"], asset) for asset in assets) - - last = {} - - for room in CONFIG["ROOMS"]: - proofs = [ - json.loads(data) - for data in r.zrange("last:{}".format(room["device_id"]), 0, -1) - ] - - last[room["name"]] = room_last = [] - for proof in reversed(proofs): - asset = asset_by_id.get(proof["asset_id"]) - if asset is None: - continue - room_last.append( - { - "id": proof["id"], - "user": asset["userdata"]["user"], - "filetype": asset["filetype"], - "shown": int(proof["ts"]), - "thumb": asset["thumb"], - "url": url_for("static", filename=cached_asset_name(asset)), - } - ) - if len(room_last) > 10: - break - - resp = jsonify( - last=[[room["name"], last.get(room["name"], [])] for room in CONFIG["ROOMS"]] - ) - resp.headers["Cache-Control"] = "public, max-age=5" - return resp - - -@app.route("/proof", methods=["POST"]) -def proof(): - proofs = [(json.loads(row), row) for row in request.stream.read().split("\n")] - device_ids = set() - p = r.pipeline() - for proof, row in proofs: - p.zadd("last:{}".format(proof["device_id"]), row, proof["ts"]) - device_ids.add(proof["device_id"]) - for device_id in device_ids: - p.zremrangebyscore(f"last:{device_id}", 0, time.time() - 1200) - p.execute() - return "ok" +#@app.route("/content/last") +#def content_last(): +# assets = get_all_live_assets() +# asset_by_id = dict((asset["id"], asset) for asset in assets) +# +# last = {} +# +# for room in CONFIG["ROOMS"]: +# proofs = [ +# json.loads(data) +# for data in r.zrange("last:{}".format(room["device_id"]), 0, -1) +# ] +# +# last[room["name"]] = room_last = [] +# for proof in reversed(proofs): +# asset = asset_by_id.get(proof["asset_id"]) +# if asset is None: +# continue +# room_last.append( +# { +# "id": proof["id"], +# "user": asset["userdata"]["user"], +# "filetype": asset["filetype"], +# "shown": int(proof["ts"]), +# "thumb": asset["thumb"], +# "url": url_for("static", filename=cached_asset_name(asset)), +# } +# ) +# if len(room_last) > 10: +# break +# +# resp = jsonify( +# last=[[room["name"], last.get(room["name"], [])] for room in CONFIG["ROOMS"]] +# ) +# resp.headers["Cache-Control"] = "public, max-age=5" +# return resp +# +# +#@app.route("/proof", methods=["POST"]) +#def proof(): +# proofs = [(json.loads(row), row) for row in request.stream.read().split("\n")] +# device_ids = set() +# p = r.pipeline() +# for proof, row in proofs: +# p.zadd("last:{}".format(proof["device_id"]), row, proof["ts"]) +# device_ids.add(proof["device_id"]) +# for device_id in device_ids: +# p.zremrangebyscore(f"last:{device_id}", 0, time.time() - 1200) +# p.execute() +# return "ok" @app.route("/robots.txt") diff --git a/redis_session.py b/redis_session.py index 925a69c..94221f2 100644 --- a/redis_session.py +++ b/redis_session.py @@ -1,6 +1,6 @@ import pickle -from flask import session, sessions +from flask import sessions from redis import Redis from helper import get_random diff --git a/syncer.py b/syncer.py index b6a35c6..a054d9e 100644 --- a/syncer.py +++ b/syncer.py @@ -1,10 +1,7 @@ from json import dumps as json_dumps from logging import getLogger -from flask import url_for - from conf import CONFIG -from frontend import app from helper import get_all_live_assets from ib_hosted import ib