fix(sidebar): verify folder deletion against the backend

The sidebar derives "empty folder" from the models-only list, which omits models flagged `exclude: true`, while the delete guard walks the folder on disk and refuses on any weight file. A folder whose models are all excluded therefore looked empty, offered the confirmation, and then failed with "still contains models". The delete modal still opens on that prediction, but is now corrected by a dry run of the very delete the user is about to confirm, so the button state cannot contradict the backend. The confirm button stays disabled while the check runs, and a late answer is discarded once the modal is dismissed or retargeted. The dry run also covers weight files no scanner indexes (a lora folder holding only a `.gguf`, say) and files that appeared after the last scan. `_collect_folder_manifest()` now reports `excluded_model_count`, and the refusal names the excluded models, so the message explains the mismatch instead of reading like a bug. Locale files carry the sync placeholders in this commit; the translations follow.
2026-09-29 15:04:09 -03:00 · 2026-09-26 12:07:03 +08:00
parent 20d8c22390
commit 6e45ef566c
15 changed files with 578 additions and 52 deletions
@@ -1350,6 +1350,10 @@
            "emptyNote": "Dieser Ordner enthält keine Modelle. Alle anderen darin enthaltenen Dateien werden ebenfalls gelöscht.",
            "notEmptyTitle": "Ordner ist nicht leer",
            "notEmptyMessage": "Dieser Ordner enthält noch Modelle. Löschen oder verschieben Sie diese zuerst — beim Löschen eines Ordners werden Modelldateien niemals mitgelöscht.",
+            "notEmptyMessageCount": "[TODO: Translate] This folder still contains {count} model file(s). Delete or move them first — deleting a folder never cascades over model files.",
+            "notEmptyMessageExcluded": "[TODO: Translate] This folder still contains {count} model file(s), {excluded} of them excluded from the library. Un-exclude them in Manage Excluded Models and delete them first — deleting a folder never cascades over model files.",
+            "busyTitle": "[TODO: Translate] A deletion is still pending",
+            "checking": "[TODO: Translate] Checking the folder contents...",
            "confirm": "Ordner löschen"
        },
        "deleteFolderResult": {
@@ -1358,6 +1362,7 @@
            "restored": "Ordner wiederhergestellt",
            "failed": "Ordner konnte nicht gelöscht werden: {message}",
            "notEmpty": "Dieser Ordner enthält noch Modelle. Aktualisieren Sie die Seitenleiste und versuchen Sie es erneut.",
+            "notEmptyWithCount": "[TODO: Translate] This folder still contains {count} model file(s). Refresh the sidebar and try again.",
            "busy": "In diesem Ordner steht noch eine Löschung aus. Warten Sie, bis das Zeitfenster für das Rückgängigmachen abgelaufen ist.",
            "unsupported": "Das Löschen von Ordnern wird auf dieser Seite nicht unterstützt",
            "noRoot": "Es ist kein Modell-Stammverzeichnis konfiguriert"
@@ -1350,6 +1350,10 @@
      "emptyNote": "This folder contains no models. Any other files it holds will be deleted too.",
      "notEmptyTitle": "Folder is not empty",
      "notEmptyMessage": "This folder still contains models. Delete or move them first — deleting a folder never cascades over model files.",
+      "notEmptyMessageCount": "This folder still contains {count} model file(s). Delete or move them first — deleting a folder never cascades over model files.",
+      "notEmptyMessageExcluded": "This folder still contains {count} model file(s), {excluded} of them excluded from the library. Un-exclude them in Manage Excluded Models and delete them first — deleting a folder never cascades over model files.",
+      "busyTitle": "A deletion is still pending",
+      "checking": "Checking the folder contents...",
      "confirm": "Delete folder"
    },
    "deleteFolderResult": {
@@ -1358,6 +1362,7 @@
      "restored": "Folder restored",
      "failed": "Failed to delete folder: {message}",
      "notEmpty": "This folder still contains models. Refresh the sidebar and try again.",
+      "notEmptyWithCount": "This folder still contains {count} model file(s). Refresh the sidebar and try again.",
      "busy": "A deletion is still pending inside this folder. Wait for the undo window to expire.",
      "unsupported": "Folder deletion is not supported on this page",
      "noRoot": "No model root is configured"
@@ -1350,6 +1350,10 @@
            "emptyNote": "Esta carpeta no contiene modelos. Los demás archivos que contenga también se eliminarán.",
            "notEmptyTitle": "La carpeta no está vacía",
            "notEmptyMessage": "Esta carpeta aún contiene modelos. Elimínalos o muévelos primero — eliminar una carpeta nunca elimina los archivos de modelo en cascada.",
+            "notEmptyMessageCount": "[TODO: Translate] This folder still contains {count} model file(s). Delete or move them first — deleting a folder never cascades over model files.",
+            "notEmptyMessageExcluded": "[TODO: Translate] This folder still contains {count} model file(s), {excluded} of them excluded from the library. Un-exclude them in Manage Excluded Models and delete them first — deleting a folder never cascades over model files.",
+            "busyTitle": "[TODO: Translate] A deletion is still pending",
+            "checking": "[TODO: Translate] Checking the folder contents...",
            "confirm": "Eliminar carpeta"
        },
        "deleteFolderResult": {
@@ -1358,6 +1362,7 @@
            "restored": "Carpeta restaurada",
            "failed": "Error al eliminar la carpeta: {message}",
            "notEmpty": "Esta carpeta aún contiene modelos. Actualiza la barra lateral e inténtalo de nuevo.",
+            "notEmptyWithCount": "[TODO: Translate] This folder still contains {count} model file(s). Refresh the sidebar and try again.",
            "busy": "Todavía hay una eliminación pendiente dentro de esta carpeta. Espera a que caduque la ventana de deshacer.",
            "unsupported": "La eliminación de carpetas no es compatible con esta página",
            "noRoot": "No hay ninguna raíz de modelo configurada"
@@ -1350,6 +1350,10 @@
            "emptyNote": "Ce dossier ne contient aucun modèle. Les autres fichiers qu’il contient seront également supprimés.",
            "notEmptyTitle": "Le dossier n’est pas vide",
            "notEmptyMessage": "Ce dossier contient encore des modèles. Supprimez-les ou déplacez-les d’abord — la suppression d’un dossier n’entraîne jamais celle des fichiers de modèles.",
+            "notEmptyMessageCount": "[TODO: Translate] This folder still contains {count} model file(s). Delete or move them first — deleting a folder never cascades over model files.",
+            "notEmptyMessageExcluded": "[TODO: Translate] This folder still contains {count} model file(s), {excluded} of them excluded from the library. Un-exclude them in Manage Excluded Models and delete them first — deleting a folder never cascades over model files.",
+            "busyTitle": "[TODO: Translate] A deletion is still pending",
+            "checking": "[TODO: Translate] Checking the folder contents...",
            "confirm": "Supprimer le dossier"
        },
        "deleteFolderResult": {
@@ -1358,6 +1362,7 @@
            "restored": "Dossier restauré",
            "failed": "Échec de la suppression du dossier : {message}",
            "notEmpty": "Ce dossier contient encore des modèles. Actualisez la barre latérale et réessayez.",
+            "notEmptyWithCount": "[TODO: Translate] This folder still contains {count} model file(s). Refresh the sidebar and try again.",
            "busy": "Une suppression est encore en attente dans ce dossier. Attendez la fin de la fenêtre d’annulation.",
            "unsupported": "La suppression de dossiers n’est pas prise en charge sur cette page",
            "noRoot": "Aucune racine de modèle n’est configurée"
@@ -1350,6 +1350,10 @@
            "emptyNote": "אין מודלים בתיקייה זו. קבצים אחרים שבה יימחקו גם הם.",
            "notEmptyTitle": "התיקייה אינה ריקה",
            "notEmptyMessage": "בתיקייה זו עדיין יש מודלים. מחק או העבר אותם תחילה — מחיקת תיקייה לעולם אינה מוחקת קובצי מודלים.",
+            "notEmptyMessageCount": "[TODO: Translate] This folder still contains {count} model file(s). Delete or move them first — deleting a folder never cascades over model files.",
+            "notEmptyMessageExcluded": "[TODO: Translate] This folder still contains {count} model file(s), {excluded} of them excluded from the library. Un-exclude them in Manage Excluded Models and delete them first — deleting a folder never cascades over model files.",
+            "busyTitle": "[TODO: Translate] A deletion is still pending",
+            "checking": "[TODO: Translate] Checking the folder contents...",
            "confirm": "מחק תיקייה"
        },
        "deleteFolderResult": {
@@ -1358,6 +1362,7 @@
            "restored": "התיקייה שוחזרה",
            "failed": "מחיקת התיקייה נכשלה: {message}",
            "notEmpty": "בתיקייה זו עדיין יש מודלים. רענן את סרגל הצד ונסה שוב.",
+            "notEmptyWithCount": "[TODO: Translate] This folder still contains {count} model file(s). Refresh the sidebar and try again.",
            "busy": "מחיקה עדיין ממתינה בתיקייה זו. המתן לסיום חלון הביטול.",
            "unsupported": "מחיקת תיקיות אינה נתמכת בדף זה",
            "noRoot": "לא הוגדר שורש מודלים"
@@ -1350,6 +1350,10 @@
            "emptyNote": "このフォルダにはモデルがありません。他のファイルもすべて削除されます。",
            "notEmptyTitle": "フォルダが空ではありません",
            "notEmptyMessage": "このフォルダにはまだモデルがあります。先に削除するか移動してください —— フォルダを削除してもモデルファイルがまとめて削除されることはありません。",
+            "notEmptyMessageCount": "[TODO: Translate] This folder still contains {count} model file(s). Delete or move them first — deleting a folder never cascades over model files.",
+            "notEmptyMessageExcluded": "[TODO: Translate] This folder still contains {count} model file(s), {excluded} of them excluded from the library. Un-exclude them in Manage Excluded Models and delete them first — deleting a folder never cascades over model files.",
+            "busyTitle": "[TODO: Translate] A deletion is still pending",
+            "checking": "[TODO: Translate] Checking the folder contents...",
            "confirm": "フォルダを削除"
        },
        "deleteFolderResult": {
@@ -1358,6 +1362,7 @@
            "restored": "フォルダを復元しました",
            "failed": "フォルダの削除に失敗しました: {message}",
            "notEmpty": "このフォルダにはまだモデルがあります。サイドバーを再読み込みしてからもう一度お試しください。",
+            "notEmptyWithCount": "[TODO: Translate] This folder still contains {count} model file(s). Refresh the sidebar and try again.",
            "busy": "このフォルダ内に保留中の削除があります。取り消し可能な時間が過ぎるまでお待ちください。",
            "unsupported": "このページではフォルダを削除できません",
            "noRoot": "モデルルートが設定されていません"
@@ -1350,6 +1350,10 @@
            "emptyNote": "이 폴더에는 모델이 없습니다. 폴더 안의 다른 파일도 함께 삭제됩니다.",
            "notEmptyTitle": "폴더가 비어 있지 않습니다",
            "notEmptyMessage": "이 폴더에는 아직 모델이 있습니다. 먼저 해당 모델을 삭제하거나 이동하세요 —— 폴더를 삭제해도 모델 파일이 함께 삭제되지는 않습니다.",
+            "notEmptyMessageCount": "[TODO: Translate] This folder still contains {count} model file(s). Delete or move them first — deleting a folder never cascades over model files.",
+            "notEmptyMessageExcluded": "[TODO: Translate] This folder still contains {count} model file(s), {excluded} of them excluded from the library. Un-exclude them in Manage Excluded Models and delete them first — deleting a folder never cascades over model files.",
+            "busyTitle": "[TODO: Translate] A deletion is still pending",
+            "checking": "[TODO: Translate] Checking the folder contents...",
            "confirm": "폴더 삭제"
        },
        "deleteFolderResult": {
@@ -1358,6 +1362,7 @@
            "restored": "폴더를 복원했습니다",
            "failed": "폴더 삭제 실패: {message}",
            "notEmpty": "이 폴더에는 아직 모델이 있습니다. 사이드바를 새로 고친 후 다시 시도하세요.",
+            "notEmptyWithCount": "[TODO: Translate] This folder still contains {count} model file(s). Refresh the sidebar and try again.",
            "busy": "이 폴더에 아직 대기 중인 삭제 작업이 있습니다. 되돌리기 시간이 끝날 때까지 기다리세요.",
            "unsupported": "이 페이지에서는 폴더를 삭제할 수 없습니다",
            "noRoot": "모델 루트가 설정되지 않았습니다"
@@ -1350,6 +1350,10 @@
            "emptyNote": "В этой папке нет моделей. Остальные файлы в ней тоже будут удалены.",
            "notEmptyTitle": "Папка не пуста",
            "notEmptyMessage": "В этой папке ещё есть модели. Сначала удалите или переместите их — удаление папки никогда не затрагивает файлы моделей.",
+            "notEmptyMessageCount": "[TODO: Translate] This folder still contains {count} model file(s). Delete or move them first — deleting a folder never cascades over model files.",
+            "notEmptyMessageExcluded": "[TODO: Translate] This folder still contains {count} model file(s), {excluded} of them excluded from the library. Un-exclude them in Manage Excluded Models and delete them first — deleting a folder never cascades over model files.",
+            "busyTitle": "[TODO: Translate] A deletion is still pending",
+            "checking": "[TODO: Translate] Checking the folder contents...",
            "confirm": "Удалить папку"
        },
        "deleteFolderResult": {
@@ -1358,6 +1362,7 @@
            "restored": "Папка восстановлена",
            "failed": "Не удалось удалить папку: {message}",
            "notEmpty": "В этой папке ещё есть модели. Обновите боковую панель и повторите попытку.",
+            "notEmptyWithCount": "[TODO: Translate] This folder still contains {count} model file(s). Refresh the sidebar and try again.",
            "busy": "В этой папке всё ещё есть отложенное удаление. Дождитесь окончания окна отмены.",
            "unsupported": "Удаление папок не поддерживается на этой странице",
            "noRoot": "Корневая папка моделей не настроена"
@@ -1350,6 +1350,10 @@
            "emptyNote": "该文件夹中没有模型，其中的其他文件也会一并删除。",
            "notEmptyTitle": "文件夹不为空",
            "notEmptyMessage": "该文件夹中仍有模型，请先删除或移出这些模型 —— 删除文件夹不会级联删除模型文件。",
+            "notEmptyMessageCount": "[TODO: Translate] This folder still contains {count} model file(s). Delete or move them first — deleting a folder never cascades over model files.",
+            "notEmptyMessageExcluded": "[TODO: Translate] This folder still contains {count} model file(s), {excluded} of them excluded from the library. Un-exclude them in Manage Excluded Models and delete them first — deleting a folder never cascades over model files.",
+            "busyTitle": "[TODO: Translate] A deletion is still pending",
+            "checking": "[TODO: Translate] Checking the folder contents...",
            "confirm": "删除文件夹"
        },
        "deleteFolderResult": {
@@ -1358,6 +1362,7 @@
            "restored": "文件夹已恢复",
            "failed": "删除文件夹失败: {message}",
            "notEmpty": "该文件夹中仍有模型。请刷新侧边栏后重试。",
+            "notEmptyWithCount": "[TODO: Translate] This folder still contains {count} model file(s). Refresh the sidebar and try again.",
            "busy": "该文件夹内仍有待处理的删除操作，请等待撤销窗口结束。",
            "unsupported": "此页面不支持删除文件夹",
            "noRoot": "未配置模型根目录"
@@ -1350,6 +1350,10 @@
            "emptyNote": "該資料夾中沒有模型，其中的其他檔案也會一併刪除。",
            "notEmptyTitle": "資料夾不是空的",
            "notEmptyMessage": "該資料夾中仍有模型，請先刪除或移出這些模型 —— 刪除資料夾不會串聯刪除模型檔案。",
+            "notEmptyMessageCount": "[TODO: Translate] This folder still contains {count} model file(s). Delete or move them first — deleting a folder never cascades over model files.",
+            "notEmptyMessageExcluded": "[TODO: Translate] This folder still contains {count} model file(s), {excluded} of them excluded from the library. Un-exclude them in Manage Excluded Models and delete them first — deleting a folder never cascades over model files.",
+            "busyTitle": "[TODO: Translate] A deletion is still pending",
+            "checking": "[TODO: Translate] Checking the folder contents...",
            "confirm": "刪除資料夾"
        },
        "deleteFolderResult": {
@@ -1358,6 +1362,7 @@
            "restored": "資料夾已還原",
            "failed": "刪除資料夾失敗: {message}",
            "notEmpty": "該資料夾中仍有模型。請重新整理側邊欄後再試。",
+            "notEmptyWithCount": "[TODO: Translate] This folder still contains {count} model file(s). Refresh the sidebar and try again.",
            "busy": "該資料夾內仍有待處理的刪除操作，請等待復原時間結束。",
            "unsupported": "此頁面不支援刪除資料夾",
            "noRoot": "未設定模型根目錄"