From dcd7c97b99f78eef2ea70be6178fce887a4b6265 Mon Sep 17 00:00:00 2001 From: Ville Rantanen Date: Sun, 20 Aug 2023 11:12:39 +0300 Subject: [PATCH] adding simple list --- code/app.py | 10 ++++++++++ code/templates/mfl | 6 ++++++ code/utils/files.py | 7 +++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/code/app.py b/code/app.py index 3a0158a..4434eef 100644 --- a/code/app.py +++ b/code/app.py @@ -159,6 +159,16 @@ def ls(): return "Error", 401 return "\n".join(file_list()), 200 +@app.route("/ls-simple", methods=["GET"]) +def ls_simple(): + """ + Lists token/names + """ + secret = request.headers.get("Secret", "") + if secret != app.config["ACCESS_TOKEN"]: + return "Error", 401 + return "\n".join(file_list_simple()), 200 + @app.route("/maintenance", methods=["GET"]) def maintenance(): diff --git a/code/templates/mfl b/code/templates/mfl index 3d63498..a6e964f 100755 --- a/code/templates/mfl +++ b/code/templates/mfl @@ -142,6 +142,12 @@ _details() { # name "$MFL_ROOTURL"/details/"$1" } +_simple_list() { + curl -fL -w "\n" \ + -H "Secret: $MFL_TOKEN" \ + "$MFL_ROOTURL"/ls-simple +} + _maintain() { curl -fL -w "\n" \ -H "Secret: $MFL_TOKEN" \ diff --git a/code/utils/files.py b/code/utils/files.py index 9992839..f44dfe8 100644 --- a/code/utils/files.py +++ b/code/utils/files.py @@ -183,14 +183,17 @@ def file_full_url(token, name): def file_list(): - files = list(db_get_files()) details = [] details.append(" Added/Expiry DL/MaxDL URL") details.append("=" * 75) - for file in files: + for file in db_get_files(): url = file_full_url(file[0], file[1]) added = file_date_human(file[2]) expiry = file_date_human(file[3]) details.append(f"{added}/{expiry} {file[4]:4d}/{file[5]:4d} {url}") return details + + +def file_list_simple(): + return [f"{r[0]}/{r[1]}" for r in db_get_files()]