allow to edit files

2026-04-01 19:45:22 +02:00
parent 0681bd398c
commit eeda177182
6 changed files with 370 additions and 62 deletions
@@ -2,10 +2,27 @@ from my_modules.decoratory.header import login_required, feature_flag_required
 from my_modules.functions import get_ip
 from my_modules.app.setup import LIMITER
 from my_modules.app.logger import logger
+from my_modules.expiry import parse_expires

-from quart import Blueprint, request, session, Response, send_file, render_template, abort, current_app
+from quart import (
+  Blueprint,
+  request,
+  session,
+  Response,
+  send_file,
+  render_template,
+  abort,
+  current_app,
+  jsonify,
+)

-side_main_bp = Blueprint('side_main', __name__)
+side_main_bp = Blueprint("side_main", __name__)
+
+def find_file(files: list[dict], file_id: str):
+  for file_data in files:
+    if file_data.get("file_id") == file_id:
+      return file_data
+  return None

@side_main_bp.route('/')
@LIMITER.limit("10 per minute;50 per hour")
@@ -36,15 +53,77 @@ async def files_list(user):
@login_required
@feature_flag_required("nanoshare_files-info", fallback=False, status_code=404)
 async def file_info(file_id, user):
-  files_data = await current_app.convex.get_files(user_id=user['sub'])
-  return await render_template("views/webpage/files/info.htm", files=files_data)
+  files_data = await current_app.convex.get_files(user_id=user["sub"])
+  file_data = find_file(files_data, file_id)
+  if not file_data:
+    abort(404)

-@side_main_bp.route('/files/<path:file_id>/edit')
+  access_data = await current_app.convex.get_file_access(file_id=file_id) or []
+  share_url = request.url_root.rstrip("/") + f"/-{file_id}"
+  return await render_template(
+    "views/webpage/files/info.htm",
+    file=file_data,
+    accesses=access_data,
+    share_url=share_url,
+  )
+
+@side_main_bp.route("/files/<path:file_id>/edit")
@login_required
@feature_flag_required("nanoshare_files-edit", fallback=False, status_code=404)
 async def file_edit(file_id, user):
-  files_data = await current_app.convex.get_files(user_id=user['sub'])
-  return await render_template("views/webpage/files/edit.htm", files=files_data)
+  files_data = await current_app.convex.get_files(user_id=user["sub"])
+  file_data = find_file(files_data, file_id)
+  if not file_data:
+    abort(404)
+
+  share_url = request.url_root.rstrip("/") + f"/-{file_id}"
+  return await render_template(
+    "views/webpage/files/edit.htm", file=file_data, share_url=share_url
+  )
+
+@side_main_bp.post("/api/files/<path:file_id>/edit")
+@login_required
+@feature_flag_required("nanoshare_files-edit", fallback=False, status_code=404)
+async def file_edit_api(file_id, user):
+  files_data = await current_app.convex.get_files(user_id=user["sub"])
+  if not find_file(files_data, file_id):
+    return jsonify({"ok": False, "error": "File not found"}), 404
+
+  payload = await request.get_json(silent=True)
+  if payload is None:
+    payload = await request.form
+
+  file_name = str(payload.get("file_name", "")).strip()
+  note = str(payload.get("note", "")).strip()
+  expires_raw = str(payload.get("expires", "")).strip()
+
+  if not file_name:
+    return jsonify({"ok": False, "error": "Filename is required"}), 400
+
+  expires_at = parse_expires(expires_raw)
+  if expires_raw and expires_raw != "never" and expires_at is None:
+    return jsonify({"ok": False, "error": "Invalid expiration value"}), 400
+
+  await current_app.convex.update_file(
+    file_id=file_id,
+    file_name=file_name,
+    note=note,
+    expires_at=expires_at,
+    user_id=user["sub"],
+  )
+
+  return jsonify({"ok": True})
+
+@side_main_bp.post("/api/files/<path:file_id>/delete")
+@login_required
+@feature_flag_required("nanoshare_files-edit", fallback=False, status_code=404)
+async def file_delete_api(file_id, user):
+  files_data = await current_app.convex.get_files(user_id=user["sub"])
+  if not find_file(files_data, file_id):
+    return jsonify({"ok": False, "error": "File not found"}), 404
+
+  await current_app.convex.delete_file(file_id=file_id, user_id=user["sub"])
+  return jsonify({"ok": True})

@side_main_bp.route("/-<file_id>")
@LIMITER.limit("10 per minute;500 per hour;")
@@ -1,55 +1,14 @@
 from my_modules.decoratory.header import login_required
+from my_modules.expiry import parse_expires, ensure_utc
+from my_modules.file_meta import iso_stamp_filename, format_size

 from quart import Blueprint, request, jsonify, current_app
-from datetime import datetime, timedelta, timezone
-import aiofiles, asyncio, re
+import asyncio

 upload_bp = Blueprint("upload_bp", __name__)

 # --- Helpers -----------------------------------------------------

-PRESET_H = re.compile(r"^(\d+)h$")
-PRESET_D = re.compile(r"^(\d+)d$")
-
-def iso_stamp_filename(prefix: str, ext: str) -> str:
-  """Generate timestamped filename, e.g. pasted-2025-10-23T121212Z.png"""
-  ts = datetime.now(timezone.utc).isoformat()
-  ts = ts.replace(":", "").split(".")[0]
-  if ts.endswith("+00:00"):
-    ts = ts.replace("+00:00", "Z")
-  return f"{prefix}-{ts}.{ext}"
-
-def parse_expires(value: str | None) -> datetime | None:
-  """Parse expiration presets or ISO datetime."""
-  if not value:
-    return None
-  value = value.strip()
-  if m := PRESET_H.match(value):
-    return datetime.now(timezone.utc) + timedelta(hours=int(m.group(1)))
-  if m := PRESET_D.match(value):
-    return datetime.now(timezone.utc) + timedelta(days=int(m.group(1)))
-  try:
-    return datetime.fromisoformat(value.replace("Z", "+00:00")).astimezone(timezone.utc)
-  except Exception:
-    return None
-
-def format_size(num_bytes: int) -> str:
-  """Return a human-readable file size (e.g., '2.3 MB', '10 Bytes')."""
-  if num_bytes < 1024:
-    return f"{num_bytes} Byte{'s' if num_bytes != 1 else ''}"
-
-  units = ["KB", "MB", "GB", "TB", "PB", "EB"]
-  size = float(num_bytes)
-  for unit in units:
-    size /= 1024.0
-    if size < 1024.0 or unit == units[-1]:
-      # 1 decimal place; drop trailing .0 (optional)
-      val = f"{size:.1f}"
-      if val.endswith(".0"):
-        val = val[:-2]
-      return f"{val} {unit}"
-  return f"{num_bytes} Bytes"  # fallback
-
 async def read_all(uploaded) -> bytes:
  """Read all bytes from an uploaded file, handling sync or async .read()."""
  reader = getattr(uploaded, "read", None)
@@ -63,14 +22,6 @@ async def read_all(uploaded) -> bytes:
    return await data
  return data

-def ensure_utc(dt:datetime):
-    """Ensure a timezone-aware UTC datetime or None."""
-    if dt is None:
-      return None
-    if dt.tzinfo is None:
-      return dt.replace(tzinfo=timezone.utc)
-    return dt.astimezone(timezone.utc)
-
 # --- Routes ------------------------------------------------------

@upload_bp.post("/api/upload")