feat: Refactor storage adapter and mount handling; migrate mounts to storage adapters; enhance SideNav; implement database migration scripts

api/routes/adapters.py

@@ -2,7 +2,7 @@ from fastapi import APIRouter, HTTPException, Depends
 from tortoise.transactions import in_transaction
 from typing import Annotated
 
-from models import StorageAdapter, Mount
+from models import StorageAdapter
 from schemas import AdapterCreate, AdapterOut
 from services.auth import get_current_active_user, User
 from services.adapters.registry import runtime_registry, get_config_schemas
@@ -39,26 +39,21 @@ async def create_adapter(
     data: AdapterCreate,
     current_user: Annotated[User, Depends(get_current_active_user)]
 ):
+    norm_path = AdapterCreate.normalize_mount_path(data.mount_path)
+    exists = await StorageAdapter.get_or_none(path=norm_path)
+    if exists:
+        raise HTTPException(400, detail="Mount path already exists")
+
     adapter_fields = {
         "name": data.name,
         "type": data.type,
         "config": validate_and_normalize_config(data.type, data.config or {}),
         "enabled": data.enabled,
+        "path": norm_path,
+        "sub_path": data.sub_path,
     }
-    norm_path = AdapterCreate.normalize_mount_path(data.mount_path)
-    exists = await Mount.get_or_none(path=norm_path)
-    if exists:
-        raise HTTPException(400, detail="Mount path already exists")
-    async with in_transaction():
-        rec = await StorageAdapter.create(**adapter_fields)
-        await Mount.create(
-            path=norm_path,
-            sub_path=data.sub_path,
-            adapter=rec,
-            enabled=True,
-        )
-    rec.mount_path = norm_path
-    rec.sub_path = data.sub_path
+
+    rec = await StorageAdapter.create(**adapter_fields)
     await runtime_registry.refresh()
     await LogService.action(
         "route:adapters",
@@ -73,20 +68,8 @@ async def create_adapter(
 async def list_adapters(
     current_user: Annotated[User, Depends(get_current_active_user)]
 ):
-    adapters = await StorageAdapter.all().prefetch_related("mounts")
-    out = []
-    for a in adapters:
-        mount = a.mounts[0] if a.mounts else None
-        item = AdapterOut(
-            name=a.name,
-            type=a.type,
-            config=a.config,
-            enabled=a.enabled,
-            id=a.id,
-            mount_path=mount.path if mount else None,
-            sub_path=mount.sub_path if mount else None
-        )
-        out.append(item)
+    adapters = await StorageAdapter.all()
+    out = [AdapterOut.model_validate(a) for a in adapters]
     return success(out)
 
 
@@ -109,13 +92,10 @@ async def get_adapter(
     adapter_id: int,
     current_user: Annotated[User, Depends(get_current_active_user)]
 ):
-    rec = await StorageAdapter.get_or_none(id=adapter_id).prefetch_related("mounts")
+    rec = await StorageAdapter.get_or_none(id=adapter_id)
     if not rec:
         raise HTTPException(404, detail="Not found")
-    mount = rec.mounts[0] if rec.mounts else None
-    rec.mount_path = mount.path if mount else None
-    rec.sub_path = mount.sub_path if mount else None
-    return success(rec)
+    return success(AdapterOut.model_validate(rec))
 
 
 @router.put("/{adapter_id}")
@@ -124,33 +104,23 @@ async def update_adapter(
     data: AdapterCreate,
     current_user: Annotated[User, Depends(get_current_active_user)]
 ):
-
-    rec = await StorageAdapter.get_or_none(id=adapter_id).prefetch_related("mounts")
+    rec = await StorageAdapter.get_or_none(id=adapter_id)
     if not rec:
         raise HTTPException(404, detail="Not found")
+
     norm_path = AdapterCreate.normalize_mount_path(data.mount_path)
-    existing = await Mount.get_or_none(path=norm_path)
-    mount = rec.mounts[0] if rec.mounts else None
-    if existing and (not mount or existing.id != mount.id):
+    existing = await StorageAdapter.get_or_none(path=norm_path)
+    if existing and existing.id != adapter_id:
         raise HTTPException(400, detail="Mount path already exists")
+
     rec.name = data.name
     rec.type = data.type
     rec.config = validate_and_normalize_config(data.type, data.config or {})
     rec.enabled = data.enabled
+    rec.path = norm_path
+    rec.sub_path = data.sub_path
     await rec.save()
-    if mount:
-        mount.path = norm_path
-        mount.sub_path = data.sub_path
-        await mount.save()
-    else:
-        mount = await Mount.create(
-            path=norm_path,
-            sub_path=data.sub_path,
-            adapter=rec,
-            enabled=True,
-        )
-    rec.mount_path = mount.path
-    rec.sub_path = mount.sub_path
+
     await runtime_registry.refresh()
     await LogService.action(
         "route:adapters",

api/routes/mounts.py

@@ -1,84 +0,0 @@
-from fastapi import APIRouter, HTTPException, Depends
-from typing import Annotated
-
-from models import StorageAdapter, Mount
-from schemas import MountCreate, MountOut
-from api.response import success
-from services.auth import get_current_active_user, User
-from services.logging import LogService
-
-router = APIRouter(prefix="/api/mounts", tags=["mounts"])
-
-
-@router.post("")
-async def create_mount(
-    data: MountCreate,
-    current_user: Annotated[User, Depends(get_current_active_user)],
-):
-    adapter = await StorageAdapter.get_or_none(id=data.adapter_id)
-    if not adapter:
-        raise HTTPException(400, detail="Adapter not found")
-    rec = await Mount.create(
-        path=MountCreate.normalize(data.path),
-        adapter=adapter,
-        sub_path=data.sub_path,
-        enabled=data.enabled,
-    )
-    await LogService.action(
-        "route:mounts",
-        f"Created mount {rec.path}",
-        details=data.model_dump(),
-        user_id=current_user.id if hasattr(current_user, "id") else None,
-    )
-    return success(rec)
-
-
-@router.get("")
-async def list_mounts(
-    current_user: Annotated[User, Depends(get_current_active_user)],
-):
-    recs = await Mount.all()
-    return success(recs)
-
-
-@router.put("/{mount_id}")
-async def update_mount(
-    mount_id: int,
-    data: MountCreate,
-    current_user: Annotated[User, Depends(get_current_active_user)],
-):
-    rec = await Mount.get_or_none(id=mount_id)
-    if not rec:
-        raise HTTPException(404, detail="Not found")
-    adapter = await StorageAdapter.get_or_none(id=data.adapter_id)
-    if not adapter:
-        raise HTTPException(400, detail="Adapter not found")
-    rec.path = MountCreate.normalize(data.path)
-    rec.adapter = adapter
-    rec.sub_path = data.sub_path
-    rec.enabled = data.enabled
-    await rec.save()
-    await LogService.action(
-        "route:mounts",
-        f"Updated mount {rec.path}",
-        details=data.model_dump(),
-        user_id=current_user.id if hasattr(current_user, "id") else None,
-    )
-    return success(rec)
-
-
-@router.delete("/{mount_id}")
-async def delete_mount(
-    mount_id: int,
-    current_user: Annotated[User, Depends(get_current_active_user)],
-):
-    deleted = await Mount.filter(id=mount_id).delete()
-    if not deleted:
-        raise HTTPException(404, detail="Not found")
-    await LogService.action(
-        "route:mounts",
-        f"Deleted mount {mount_id}",
-        details={"mount_id": mount_id},
-        user_id=current_user.id if hasattr(current_user, "id") else None,
-    )
-    return success({"deleted": True})

api/routes/virtual_fs.py

@@ -116,7 +116,7 @@ async def get_thumb(
     if not is_image_filename(rel):
         raise HTTPException(404, detail="Not an image")
     # type: ignore
-    data, mime, key = await get_or_create_thumb(adapter, mount.adapter_id, root, rel, w, h, fit)
+    data, mime, key = await get_or_create_thumb(adapter, mount.id, root, rel, w, h, fit)
     headers = {
         'Cache-Control': 'public, max-age=3600',
         'ETag': key,