moonq/mini-flees
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove maintenance prints, better mfl upload function

Browse Source
This commit is contained in:
q
2025-11-21 22:49:39 +02:00
parent 6bb6941287
commit 0cfaaaf9dd
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/entrypoint.sh
View File

@@ -21,6 +21,7 @@ sh ./init_db.sh "$FLASK_DB"
echo "Dowload script: curl -H 'Secret: [FLASK_ACCESS_TOKEN]' http://${FLASK_PUBLIC_URL}/script/mfl" echo "Dowload script: curl -H 'Secret: [FLASK_ACCESS_TOKEN]' http://${FLASK_PUBLIC_URL}/script/mfl"
exec "$SERVER" \ exec "$SERVER" \
-w "$WORKERS" \ -w "$WORKERS" \
--threads 8 \
--worker-tmp-dir "$TMPDIR" \ --worker-tmp-dir "$TMPDIR" \
--timeout "$TIMEOUT" \ --timeout "$TIMEOUT" \
--pid="$PID" \ --pid="$PID" \

6
code/templates/mfl
View File

@@ -165,7 +165,11 @@ curl -fL -g --upload-file "file_to_upload.ext" \\
"$MFL_ROOTURL"/upload "$MFL_ROOTURL"/upload
# Simplified: # Simplified:
FN=file_to_upload.ext; curl -fL -g --upload-file "\$FN" -H "Name: \$( basename "\$FN" )" -H "Token: $token" "$MFL_ROOTURL"/upload function $SELF-upload() {
local TOKEN="$1";
local FN="$2";
curl -fL -g --upload-file "\$FN" -H "Name: \$( basename "\$FN" )" -H "Token: \$TOKEN" "$MFL_ROOTURL"/upload
}
EOF EOF
} }

11
code/utils/files.py
View File

@@ -2,6 +2,7 @@ import os
import shutil import shutil
import sqlite3 import sqlite3
import time import time
import logging
from datetime import datetime from datetime import datetime
from flask import current_app as app from flask import current_app as app
@@ -117,7 +118,7 @@ def db_maintenance():
deleted_tokens = [] deleted_tokens = []
for row in rows: for row in rows:
deleted_tokens.append((row[0],)) deleted_tokens.append((row[0],))
messages.append(f"Deleting DB {row[0]}/{row[1]}") logging.info(f"Deleting DB {row[0]}/{row[1]}")
if len(deleted_tokens) > 0: if len(deleted_tokens) > 0:
db, c = get_db() db, c = get_db()
c.executemany("DELETE FROM files WHERE token = ?", deleted_tokens) c.executemany("DELETE FROM files WHERE token = ?", deleted_tokens)
@@ -135,11 +136,11 @@ def db_maintenance():
try: try:
for fname in os.listdir(os.path.join(app.config["DATAFOLDER"], d)): for fname in os.listdir(os.path.join(app.config["DATAFOLDER"], d)):
os.remove(os.path.join(app.config["DATAFOLDER"], d, fname)) os.remove(os.path.join(app.config["DATAFOLDER"], d, fname))
messages.append(f"Deleting file {d}/{fname}") logging.info(f"Deleting file {d}/{fname}")
except Exception: except Exception:
pass pass
shutil.rmtree(os.path.join(app.config["DATAFOLDER"], d), ignore_errors=True) shutil.rmtree(os.path.join(app.config["DATAFOLDER"], d), ignore_errors=True)
messages.append(f"Deleting folder {d}") logging.info(f"Deleting folder {d}")
# Delete DB entries, if files have been deleted (probably manually) # Delete DB entries, if files have been deleted (probably manually)
db, c = get_db() db, c = get_db()
@@ -155,7 +156,7 @@ def db_maintenance():
full_path = file_full_path(row[0], row[1]) full_path = file_full_path(row[0], row[1])
if not os.path.exists(full_path): if not os.path.exists(full_path):
deleted_tokens.append((row[0],)) deleted_tokens.append((row[0],))
messages.append(f"Deleting DB {row[0]}/{row[1]} - files missing") logging.info(f"Deleting DB {row[0]}/{row[1]} - files missing")
if len(deleted_tokens) > 0: if len(deleted_tokens) > 0:
db, c = get_db() db, c = get_db()
c.executemany("DELETE FROM files WHERE token = ?", deleted_tokens) c.executemany("DELETE FROM files WHERE token = ?", deleted_tokens)
@@ -176,7 +177,7 @@ def db_maintenance():
deleted_tokens = [] deleted_tokens = []
for row in rows: for row in rows:
deleted_tokens.append((row[0],)) deleted_tokens.append((row[0],))
messages.append(f"Deleting upload_token {row[0]}") logging.info(f"Deleting upload_token {row[0]}")
if len(deleted_tokens) > 0: if len(deleted_tokens) > 0:
db, c = get_db() db, c = get_db()
c.executemany("DELETE FROM upload_tokens WHERE token = ?", deleted_tokens) c.executemany("DELETE FROM upload_tokens WHERE token = ?", deleted_tokens)