remove maintenance prints, better mfl upload function
This commit is contained in:
@@ -2,6 +2,7 @@ import os
|
||||
import shutil
|
||||
import sqlite3
|
||||
import time
|
||||
import logging
|
||||
from datetime import datetime
|
||||
|
||||
from flask import current_app as app
|
||||
@@ -117,7 +118,7 @@ def db_maintenance():
|
||||
deleted_tokens = []
|
||||
for row in rows:
|
||||
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:
|
||||
db, c = get_db()
|
||||
c.executemany("DELETE FROM files WHERE token = ?", deleted_tokens)
|
||||
@@ -135,11 +136,11 @@ def db_maintenance():
|
||||
try:
|
||||
for fname in os.listdir(os.path.join(app.config["DATAFOLDER"], d)):
|
||||
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:
|
||||
pass
|
||||
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)
|
||||
db, c = get_db()
|
||||
@@ -155,7 +156,7 @@ def db_maintenance():
|
||||
full_path = file_full_path(row[0], row[1])
|
||||
if not os.path.exists(full_path):
|
||||
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:
|
||||
db, c = get_db()
|
||||
c.executemany("DELETE FROM files WHERE token = ?", deleted_tokens)
|
||||
@@ -176,7 +177,7 @@ def db_maintenance():
|
||||
deleted_tokens = []
|
||||
for row in rows:
|
||||
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:
|
||||
db, c = get_db()
|
||||
c.executemany("DELETE FROM upload_tokens WHERE token = ?", deleted_tokens)
|
||||
|
||||
Reference in New Issue
Block a user