Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:bug: Correct asset content search and index rebuild feedback https://github.com/siyuan-note/siyuan/issues/20918

Danieleb9da997a8d8
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.json
index ca5179a0b9..921e109fe0 100644
--- a/app/appearance/langs/ar.json
+++ b/app/appearance/langs/ar.json
@@ -3466,6 +3466,9 @@
"437": "تنزيل هذا الإصدار",
"438": "اختر صورة صالحة بتنسيق JPEG أو PNG أو WebP بحجم أقصى 10 MiB و16 ميغابكسل",
"439": "تعذر حفظ خلفية شاشة القفل؛ تحقق من أذونات الكتابة في مساحة العمل",
- "440": "تم بلوغ الحد الأقصى لجولات استدعاء الأدوات. لم تُنفذ استدعاءات الأدوات المتبقية؛ أرسل رسالة أخرى للمتابعة"
+ "440": "تم بلوغ الحد الأقصى لجولات استدعاء الأدوات. لم تُنفذ استدعاءات الأدوات المتبقية؛ أرسل رسالة أخرى للمتابعة",
+ "441": "تم إرسال مهمة إعادة بناء فهرس محتوى الموارد؛ تابع التقدم في مهام الخلفية",
+ "442": "اكتملت إعادة بناء فهرس محتوى الموارد",
+ "443": "فشلت إعادة بناء فهرس محتوى الموارد؛ راجع سجل النواة"
}
}
diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.json
index 30602e74fd..d087d20122 100644
--- a/app/appearance/langs/de.json
+++ b/app/appearance/langs/de.json
@@ -3466,6 +3466,9 @@
"437": "Diese Version herunterladen",
"438": "Wähle ein gültiges JPEG-, PNG- oder WebP-Bild mit maximal 10 MiB und 16 Megapixeln",
"439": "Der Sperrbildschirm-Hintergrund konnte nicht gespeichert werden; prüfe die Schreibrechte des Arbeitsbereichs",
- "440": "Das Rundenlimit für Werkzeugaufrufe wurde erreicht. Verbleibende Werkzeugaufrufe wurden nicht ausgeführt; sende eine weitere Nachricht, um fortzufahren"
+ "440": "Das Rundenlimit für Werkzeugaufrufe wurde erreicht. Verbleibende Werkzeugaufrufe wurden nicht ausgeführt; sende eine weitere Nachricht, um fortzufahren",
+ "441": "Neuaufbau des Ressourceninhaltsindex beauftragt; Fortschritt in den Hintergrundaufgaben verfolgen",
+ "442": "Neuaufbau des Ressourceninhaltsindex abgeschlossen",
+ "443": "Neuaufbau des Ressourceninhaltsindex fehlgeschlagen; Kernel-Protokoll prüfen"
}
}
diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.json
index 37265abaaa..ef7b798238 100644
--- a/app/appearance/langs/en.json
+++ b/app/appearance/langs/en.json
@@ -3466,6 +3466,9 @@
"437": "Download this version",
"438": "Choose a valid JPEG, PNG or WebP image up to 10 MiB and 16 megapixels",
"439": "Could not save the lock screen wallpaper; check workspace write permissions",
- "440": "Tool call round limit reached. Remaining tool calls were not executed; send another message to continue"
+ "440": "Tool call round limit reached. Remaining tool calls were not executed; send another message to continue",
+ "441": "Asset content index rebuild task submitted; follow progress in background tasks",
+ "442": "Asset content index rebuild completed",
+ "443": "Asset content index rebuild failed; check the kernel log"
}
}
diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.json
index 27268192c0..5bb1701ab2 100644
--- a/app/appearance/langs/es.json
+++ b/app/appearance/langs/es.json
@@ -3466,6 +3466,9 @@
"437": "Descargar esta versión",
"438": "Selecciona una imagen JPEG, PNG o WebP válida de hasta 10 MiB y 16 megapíxeles",
"439": "No se pudo guardar el fondo de bloqueo; comprueba los permisos de escritura del espacio de trabajo",
- "440": "Se alcanzó el límite de rondas de llamadas a herramientas. Las llamadas restantes no se ejecutaron; envía otro mensaje para continuar"
+ "440": "Se alcanzó el límite de rondas de llamadas a herramientas. Las llamadas restantes no se ejecutaron; envía otro mensaje para continuar",
+ "441": "Tarea de reconstrucción del índice de contenido de recursos enviada; consulta el progreso en las tareas en segundo plano",
+ "442": "Reconstrucción del índice de contenido de recursos completada",
+ "443": "Error al reconstruir el índice de contenido de recursos; consulta el registro del núcleo"
}
}
diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.json
index e381a1be6d..431e855d2a 100644
--- a/app/appearance/langs/fr.json
+++ b/app/appearance/langs/fr.json
@@ -3466,6 +3466,9 @@
"437": "Télécharger cette version",
"438": "Choisissez une image JPEG, PNG ou WebP valide, de 10 MiB et 16 mégapixels maximum",
"439": "Impossible d’enregistrer le fond d’écran de verrouillage ; vérifiez les droits d’écriture de l’espace de travail",
- "440": "La limite de tours d’appels d’outils est atteinte. Les appels restants n’ont pas été exécutés ; envoyez un autre message pour continuer"
+ "440": "La limite de tours d’appels d’outils est atteinte. Les appels restants n’ont pas été exécutés ; envoyez un autre message pour continuer",
+ "441": "Tâche de reconstruction de l’index du contenu des ressources soumise ; suivez la progression dans les tâches en arrière-plan",
+ "442": "Reconstruction de l’index du contenu des ressources terminée",
+ "443": "Échec de la reconstruction de l’index du contenu des ressources ; consultez le journal du noyau"
}
}
diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.json
index 36f95131b7..be440ac687 100644
--- a/app/appearance/langs/he.json
+++ b/app/appearance/langs/he.json
@@ -3466,6 +3466,9 @@
"437": "הורדת גרסה זו",
"438": "יש לבחור תמונת JPEG, PNG או WebP תקינה, עד 10 MiB ו־16 מגה־פיקסל",
"439": "לא ניתן לשמור את טפט מסך הנעילה; יש לבדוק את הרשאות הכתיבה בסביבת העבודה",
- "440": "הגעת למגבלת סבבי הקריאה לכלים. הקריאות הנותרות לא בוצעו; יש לשלוח הודעה נוספת כדי להמשיך"
+ "440": "הגעת למגבלת סבבי הקריאה לכלים. הקריאות הנותרות לא בוצעו; יש לשלוח הודעה נוספת כדי להמשיך",
+ "441": "משימת הבנייה מחדש של אינדקס תוכן המשאבים נשלחה; ניתן לעקוב אחר ההתקדמות במשימות הרקע",
+ "442": "הבנייה מחדש של אינדקס תוכן המשאבים הושלמה",
+ "443": "הבנייה מחדש של אינדקס תוכן המשאבים נכשלה; יש לבדוק את יומן הליבה"
}
}
diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.json
index b72960162e..eb9d4e43d6 100644
--- a/app/appearance/langs/hi.json
+++ b/app/appearance/langs/hi.json
@@ -3466,6 +3466,9 @@
"437": "यह संस्करण डाउनलोड करें",
"438": "अधिकतम 10 MiB और 16 मेगापिक्सेल की मान्य JPEG, PNG या WebP छवि चुनें",
"439": "लॉक स्क्रीन वॉलपेपर सहेजा नहीं जा सका; कार्यक्षेत्र की लेखन अनुमतियाँ जाँचें",
- "440": "टूल कॉल राउंड की सीमा पहुँच गई है। शेष टूल कॉल निष्पादित नहीं किए गए; जारी रखने के लिए एक और संदेश भेजें"
+ "440": "टूल कॉल राउंड की सीमा पहुँच गई है। शेष टूल कॉल निष्पादित नहीं किए गए; जारी रखने के लिए एक और संदेश भेजें",
+ "441": "संसाधन सामग्री अनुक्रमणिका फिर से बनाने का कार्य भेज दिया गया है; पृष्ठभूमि कार्यों में प्रगति देखें",
+ "442": "संसाधन सामग्री अनुक्रमणिका फिर से बन गई है",
+ "443": "संसाधन सामग्री अनुक्रमणिका फिर से बनाना विफल रहा; कर्नेल लॉग देखें"
}
}
diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.json
index 777080e71d..6e55d2efe4 100644
--- a/app/appearance/langs/id.json
+++ b/app/appearance/langs/id.json
@@ -3466,6 +3466,9 @@
"437": "Unduh versi ini",
"438": "Pilih gambar JPEG, PNG, atau WebP yang valid, maksimal 10 MiB dan 16 megapiksel",
"439": "Tidak dapat menyimpan wallpaper layar kunci; periksa izin tulis ruang kerja",
- "440": "Batas putaran pemanggilan alat tercapai. Pemanggilan alat yang tersisa tidak dijalankan; kirim pesan lain untuk melanjutkan"
+ "440": "Batas putaran pemanggilan alat tercapai. Pemanggilan alat yang tersisa tidak dijalankan; kirim pesan lain untuk melanjutkan",
+ "441": "Tugas pembangunan ulang indeks konten aset telah dikirim; pantau kemajuan di tugas latar belakang",
+ "442": "Pembangunan ulang indeks konten aset selesai",
+ "443": "Pembangunan ulang indeks konten aset gagal; periksa log kernel"
}
}
diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.json
index b000c98c8b..c5ecc07220 100644
--- a/app/appearance/langs/it.json
+++ b/app/appearance/langs/it.json
@@ -3466,6 +3466,9 @@
"437": "Scarica questa versione",
"438": "Scegli un’immagine JPEG, PNG o WebP valida fino a 10 MiB e 16 megapixel",
"439": "Impossibile salvare lo sfondo della schermata di blocco; controlla i permessi di scrittura dello spazio di lavoro",
- "440": "È stato raggiunto il limite dei turni di chiamata agli strumenti. Le chiamate rimanenti non sono state eseguite; invia un altro messaggio per continuare"
+ "440": "È stato raggiunto il limite dei turni di chiamata agli strumenti. Le chiamate rimanenti non sono state eseguite; invia un altro messaggio per continuare",
+ "441": "Attività di ricostruzione dell’indice del contenuto delle risorse inviata; segui l’avanzamento nelle attività in background",
+ "442": "Ricostruzione dell’indice del contenuto delle risorse completata",
+ "443": "Ricostruzione dell’indice del contenuto delle risorse non riuscita; controlla il registro del kernel"
}
}
diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.json
index ee280e2500..1075f1fd7e 100644
--- a/app/appearance/langs/ja.json
+++ b/app/appearance/langs/ja.json
@@ -3466,6 +3466,9 @@
"437": "このバージョンをダウンロード",
"438": "最大 10 MiB、1600万画素の有効な JPEG、PNG、WebP 画像を選択してください",
"439": "ロック画面の壁紙を保存できません。ワークスペースの書き込み権限を確認してください",
- "440": "ツール呼び出しのラウンド数が上限に達しました。残りのツール呼び出しは実行されていません。続行するには、もう一度メッセージを送信してください"
+ "440": "ツール呼び出しのラウンド数が上限に達しました。残りのツール呼び出しは実行されていません。続行するには、もう一度メッセージを送信してください",
+ "441": "リソース内容インデックスの再構築タスクを送信しました。バックグラウンドタスクで進捗を確認できます",
+ "442": "リソース内容インデックスの再構築が完了しました",
+ "443": "リソース内容インデックスの再構築に失敗しました。カーネルログを確認してください"
}
}
diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.json
index 4247e8caf8..8b3d23f9f6 100644
--- a/app/appearance/langs/ko.json
+++ b/app/appearance/langs/ko.json
@@ -3466,6 +3466,9 @@
"437": "이 버전 다운로드",
"438": "최대 10 MiB 및 1,600만 화소의 유효한 JPEG, PNG 또는 WebP 이미지를 선택하세요",
"439": "잠금 화면 배경화면을 저장할 수 없습니다. 작업 공간 쓰기 권한을 확인하세요",
- "440": "도구 호출 라운드 제한에 도달했습니다. 나머지 도구 호출은 실행되지 않았습니다. 계속하려면 메시지를 다시 보내세요"
+ "440": "도구 호출 라운드 제한에 도달했습니다. 나머지 도구 호출은 실행되지 않았습니다. 계속하려면 메시지를 다시 보내세요",
+ "441": "리소스 내용 색인 재구축 작업이 제출되었습니다. 백그라운드 작업에서 진행 상황을 확인하세요",
+ "442": "리소스 내용 색인 재구축이 완료되었습니다",
+ "443": "리소스 내용 색인 재구축에 실패했습니다. 커널 로그를 확인하세요"
}
}
diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.json
index 8544ced267..11b0d08964 100644
--- a/app/appearance/langs/nl.json
+++ b/app/appearance/langs/nl.json
@@ -3466,6 +3466,9 @@
"437": "Deze versie downloaden",
"438": "Kies een geldige JPEG-, PNG- of WebP-afbeelding van maximaal 10 MiB en 16 megapixel",
"439": "De vergrendelachtergrond kon niet worden opgeslagen; controleer de schrijfrechten van de werkruimte",
- "440": "De limiet voor rondes met toolaanroepen is bereikt. De resterende toolaanroepen zijn niet uitgevoerd; stuur nog een bericht om door te gaan"
+ "440": "De limiet voor rondes met toolaanroepen is bereikt. De resterende toolaanroepen zijn niet uitgevoerd; stuur nog een bericht om door te gaan",
+ "441": "Taak voor het opnieuw opbouwen van de index van resource-inhoud ingediend; volg de voortgang bij de achtergrondtaken",
+ "442": "Index van resource-inhoud opnieuw opgebouwd",
+ "443": "Opnieuw opbouwen van de index van resource-inhoud mislukt; controleer het kernellogboek"
}
}
diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.json
index 341579643c..8126e14371 100644
--- a/app/appearance/langs/pl.json
+++ b/app/appearance/langs/pl.json
@@ -3466,6 +3466,9 @@
"437": "Pobierz tę wersję",
"438": "Wybierz prawidłowy obraz JPEG, PNG lub WebP o rozmiarze do 10 MiB i 16 megapikseli",
"439": "Nie można zapisać tapety ekranu blokady; sprawdź uprawnienia do zapisu w przestrzeni roboczej",
- "440": "Osiągnięto limit rund wywołań narzędzi. Pozostałe wywołania nie zostały wykonane; wyślij kolejną wiadomość, aby kontynuować"
+ "440": "Osiągnięto limit rund wywołań narzędzi. Pozostałe wywołania nie zostały wykonane; wyślij kolejną wiadomość, aby kontynuować",
+ "441": "Zlecono odbudowę indeksu treści zasobów; śledź postęp w zadaniach w tle",
+ "442": "Odbudowa indeksu treści zasobów zakończona",
+ "443": "Odbudowa indeksu treści zasobów nie powiodła się; sprawdź dziennik jądra"
}
}
diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.json
index dbcbfb3e57..5bea376f0d 100644
--- a/app/appearance/langs/pt-BR.json
+++ b/app/appearance/langs/pt-BR.json
@@ -3466,6 +3466,9 @@
"437": "Baixar esta versão",
"438": "Selecione uma imagem JPEG, PNG ou WebP válida de até 10 MiB e 16 megapixels",
"439": "Não foi possível salvar o papel de parede da tela de bloqueio; verifique as permissões de gravação do espaço de trabalho",
- "440": "O limite de rodadas de chamadas de ferramentas foi atingido. As chamadas restantes não foram executadas; envie outra mensagem para continuar"
+ "440": "O limite de rodadas de chamadas de ferramentas foi atingido. As chamadas restantes não foram executadas; envie outra mensagem para continuar",
+ "441": "Tarefa de reconstrução do índice de conteúdo dos recursos enviada; acompanhe o progresso nas tarefas em segundo plano",
+ "442": "Reconstrução do índice de conteúdo dos recursos concluída",
+ "443": "Falha ao reconstruir o índice de conteúdo dos recursos; verifique o log do kernel"
}
}
diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.json
index cda97eaba6..b69e80ba2a 100644
--- a/app/appearance/langs/ru.json
+++ b/app/appearance/langs/ru.json
@@ -3466,6 +3466,9 @@
"437": "Скачать эту версию",
"438": "Выберите корректное изображение JPEG, PNG или WebP размером до 10 MiB и 16 мегапикселей",
"439": "Не удалось сохранить обои экрана блокировки; проверьте права записи в рабочее пространство",
- "440": "Достигнут лимит раундов вызова инструментов. Оставшиеся вызовы не выполнены; отправьте ещё одно сообщение, чтобы продолжить"
+ "440": "Достигнут лимит раундов вызова инструментов. Оставшиеся вызовы не выполнены; отправьте ещё одно сообщение, чтобы продолжить",
+ "441": "Задача перестроения индекса содержимого ресурсов отправлена; следите за ходом выполнения в фоновых задачах",
+ "442": "Перестроение индекса содержимого ресурсов завершено",
+ "443": "Не удалось перестроить индекс содержимого ресурсов; проверьте журнал ядра"
}
}
diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.json
index c8c0fd8e49..fe18205f10 100644
--- a/app/appearance/langs/sk.json
+++ b/app/appearance/langs/sk.json
@@ -3466,6 +3466,9 @@
"437": "Stiahnuť túto verziu",
"438": "Vyberte platný obrázok JPEG, PNG alebo WebP s veľkosťou najviac 10 MiB a 16 megapixelov",
"439": "Tapetu zamknutej obrazovky sa nepodarilo uložiť; skontrolujte oprávnenia na zápis do pracovného priestoru",
- "440": "Bol dosiahnutý limit kôl volaní nástrojov. Zostávajúce volania sa nevykonali; na pokračovanie odošlite ďalšiu správu"
+ "440": "Bol dosiahnutý limit kôl volaní nástrojov. Zostávajúce volania sa nevykonali; na pokračovanie odošlite ďalšiu správu",
+ "441": "Úloha obnovy indexu obsahu zdrojov bola odoslaná; priebeh sledujte v úlohách na pozadí",
+ "442": "Obnova indexu obsahu zdrojov bola dokončená",
+ "443": "Obnova indexu obsahu zdrojov zlyhala; skontrolujte denník jadra"
}
}
diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.json
index 45cdbf5851..3f8e34d0ee 100644
--- a/app/appearance/langs/sr.json
+++ b/app/appearance/langs/sr.json
@@ -3466,6 +3466,9 @@
"437": "Преузми ову верзију",
"438": "Изаберите исправну JPEG, PNG или WebP слику до 10 MiB и 16 мегапиксела",
"439": "Није могуће сачувати позадину закључаног екрана; проверите дозволе за упис у радни простор",
- "440": "Достигнуто је ограничење броја рунди позива алата. Преостали позиви нису извршени; пошаљите још једну поруку да наставите"
+ "440": "Достигнуто је ограничење броја рунди позива алата. Преостали позиви нису извршени; пошаљите још једну поруку да наставите",
+ "441": "Задатак поновне изградње индекса садржаја ресурса је послат; пратите напредак у задацима у позадини",
+ "442": "Поновна изградња индекса садржаја ресурса је завршена",
+ "443": "Поновна изградња индекса садржаја ресурса није успела; проверите дневник језгра"
}
}
diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.json
index 27bb5e3206..017ab521fb 100644
--- a/app/appearance/langs/th.json
+++ b/app/appearance/langs/th.json
@@ -3466,6 +3466,9 @@
"437": "ดาวน์โหลดเวอร์ชันนี้",
"438": "เลือกภาพ JPEG, PNG หรือ WebP ที่ถูกต้อง ขนาดไม่เกิน 10 MiB และ 16 ล้านพิกเซล",
"439": "ไม่สามารถบันทึกภาพพื้นหลังหน้าจอล็อกได้ โปรดตรวจสอบสิทธิ์การเขียนในพื้นที่ทำงาน",
- "440": "ถึงขีดจำกัดจำนวนรอบการเรียกใช้เครื่องมือแล้ว การเรียกใช้เครื่องมือที่เหลือยังไม่ได้ดำเนินการ ส่งข้อความอีกครั้งเพื่อดำเนินการต่อ"
+ "440": "ถึงขีดจำกัดจำนวนรอบการเรียกใช้เครื่องมือแล้ว การเรียกใช้เครื่องมือที่เหลือยังไม่ได้ดำเนินการ ส่งข้อความอีกครั้งเพื่อดำเนินการต่อ",
+ "441": "ส่งงานสร้างดัชนีเนื้อหาทรัพยากรใหม่แล้ว ติดตามความคืบหน้าได้ในงานเบื้องหลัง",
+ "442": "สร้างดัชนีเนื้อหาทรัพยากรใหม่เสร็จแล้ว",
+ "443": "สร้างดัชนีเนื้อหาทรัพยากรใหม่ไม่สำเร็จ โปรดตรวจสอบบันทึกเคอร์เนล"
}
}
diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.json
index 4ba9c22073..86bf800bcf 100644
--- a/app/appearance/langs/tr.json
+++ b/app/appearance/langs/tr.json
@@ -3466,6 +3466,9 @@
"437": "Bu sürümü indir",
"438": "En fazla 10 MiB ve 16 megapiksel boyutunda geçerli bir JPEG, PNG veya WebP görüntüsü seçin",
"439": "Kilit ekranı duvar kâğıdı kaydedilemedi; çalışma alanının yazma izinlerini kontrol edin",
- "440": "Araç çağrısı tur sınırına ulaşıldı. Kalan araç çağrıları yürütülmedi; devam etmek için başka bir mesaj gönderin"
+ "440": "Araç çağrısı tur sınırına ulaşıldı. Kalan araç çağrıları yürütülmedi; devam etmek için başka bir mesaj gönderin",
+ "441": "Kaynak içeriği dizinini yeniden oluşturma görevi gönderildi; ilerlemeyi arka plan görevlerinden izleyin",
+ "442": "Kaynak içeriği dizininin yeniden oluşturulması tamamlandı",
+ "443": "Kaynak içeriği dizini yeniden oluşturulamadı; çekirdek günlüğünü kontrol edin"
}
}
diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.json
index 1a631b3dd2..4a8433b733 100644
--- a/app/appearance/langs/uk.json
+++ b/app/appearance/langs/uk.json
@@ -3466,6 +3466,9 @@
"437": "Завантажити цю версію",
"438": "Виберіть коректне зображення JPEG, PNG або WebP розміром до 10 MiB і 16 мегапікселів",
"439": "Не вдалося зберегти шпалери екрана блокування; перевірте права запису в робочий простір",
- "440": "Досягнуто ліміту раундів виклику інструментів. Решту викликів не виконано; надішліть ще одне повідомлення, щоб продовжити"
+ "440": "Досягнуто ліміту раундів виклику інструментів. Решту викликів не виконано; надішліть ще одне повідомлення, щоб продовжити",
+ "441": "Завдання перебудови індексу вмісту ресурсів надіслано; стежте за перебігом у фонових завданнях",
+ "442": "Перебудову індексу вмісту ресурсів завершено",
+ "443": "Не вдалося перебудувати індекс вмісту ресурсів; перевірте журнал ядра"
}
}
diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.json
index 9f7d60ba1d..e95aca08e8 100644
--- a/app/appearance/langs/zh-CN.json
+++ b/app/appearance/langs/zh-CN.json
@@ -3466,6 +3466,9 @@
"437": "下载此版本",
"438": "请选择有效的 JPEG、PNG 或 WebP 图片,最大 10 MiB、1600 万像素",
"439": "无法保存锁屏壁纸,请检查工作空间写入权限",
- "440": "已达到工具调用轮数上限,剩余工具调用未执行;请发送新消息继续"
+ "440": "已达到工具调用轮数上限,剩余工具调用未执行;请发送新消息继续",
+ "441": "资源文件内容索引重建任务已提交,可在后台任务中查看进度",
+ "442": "资源文件内容索引重建已完成",
+ "443": "资源文件内容索引重建失败,请检查内核日志"
}
}
diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.json
index 1e3c91711d..10a0088216 100644
--- a/app/appearance/langs/zh-TW.json
+++ b/app/appearance/langs/zh-TW.json
@@ -3466,6 +3466,9 @@
"437": "下載此版本",
"438": "請選擇有效的 JPEG、PNG 或 WebP 圖片,最大 10 MiB、1600 萬像素",
"439": "無法儲存鎖定畫面桌布,請檢查工作空間寫入權限",
- "440": "已達到工具呼叫回合數上限,剩餘工具呼叫未執行;請傳送新訊息繼續"
+ "440": "已達到工具呼叫回合數上限,剩餘工具呼叫未執行;請傳送新訊息繼續",
+ "441": "資源檔案內容索引重建任務已提交,可在背景任務中查看進度",
+ "442": "資源檔案內容索引重建已完成",
+ "443": "資源檔案內容索引重建失敗,請檢查核心日誌"
}
}
diff --git a/app/src/search/assets.test.ts b/app/src/search/assets.test.ts
new file mode 100644
index 0000000000..737e8c1be2
--- /dev/null
+++ b/app/src/search/assets.test.ts
@@ -0,0 +1,137 @@
+import * as assert from "node:assert/strict";
+import {readFileSync} from "node:fs";
+import {test} from "node:test";
+import {runInNewContext} from "node:vm";
+import {ModuleKind, ScriptTarget, transpileModule} from "typescript";
+
+const createRuntime = (mobile: boolean) => {
+ const {parse} = require("ifdef-loader/preprocessor");
+ const compile = (file: string) => transpileModule(parse(readFileSync(file, "utf8"), {MOBILE: mobile, BROWSER: false}, false, true), {
+ compilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2021},
+ }).outputText;
+ const timers = new Map<number, () => void>();
+ let timerID = 0;
+ const requests: {url: string, data: {query?: string}, callback?: (response: unknown) => void}[] = [];
+ const items: {label: string, click?: () => void}[] = [];
+ const panels: {isConnected: boolean, attributes: Map<string, string>}[] = [];
+ const localSearch = {method: 3, sort: 0, types: {}, layout: 0};
+ const document = {querySelectorAll: () => panels.filter(panel => panel.isConnected && panel.attributes.has("data-asset-search"))};
+ const window = {
+ setTimeout: (callback: () => void) => {timers.set(++timerID, callback); return timerID;},
+ siyuan: {
+ languages: new Proxy({}, {get: (_target, name) => name}),
+ storage: {assets: localSearch},
+ menus: {menu: {element: {setAttribute() {}}, append: (item: {label: string}) => items.push(item)}},
+ },
+ };
+ const createPanel = (query: string) => {
+ const values = new Set<string>();
+ const classList = {add: (value: string) => values.add(value), remove: (value: string) => values.delete(value)};
+ const loading = {classList, style: {} as Record<string, string>};
+ const input = {value: query};
+ const result = {innerHTML: ""};
+ const list = {innerHTML: ""};
+ const control = {setAttribute() {}, removeAttribute() {}};
+ const panel = {
+ isConnected: true,
+ attributes: new Map<string, string>(),
+ setAttribute: (name: string, value: string) => panel.attributes.set(name, value),
+ parentElement: {querySelector: () => loading},
+ querySelector: (selector: string) => {
+ if (selector === "#searchAssetInput") return input;
+ if (selector === "#searchAssetResult") return result;
+ if (selector === "#searchAssetList") return list;
+ if (selector === "#searchAssetPreview" || selector === ".search__drag") return {classList};
+ return control;
+ },
+ input, result, list, loadingValues: values,
+ };
+ panels.push(panel);
+ return panel;
+ };
+ const api = {} as typeof import("./assets");
+ const clearTimeout = (id: number) => timers.delete(id);
+ runInNewContext(compile("src/search/assets.ts"), {exports: api, window, document, clearTimeout,
+ require: (name: string) => {
+ if (name === "../constants") return {Constants: {LOCAL_SEARCHASSET: "assets", TIMEOUT_INPUT: 1}};
+ if (name === "../util/fetch") return {fetchPost: (url: string, data: object, callback: () => void) => {
+ requests.push({url, data, callback});
+ return Promise.resolve();
+ }};
+ if (name === "../menus/menuToggle") return {toggleMenu: ({build}: {build: (menu: object, session: object) => void}) => build({}, {show() {}})};
+ if (name === "../menus/Menu") return {MenuItem: class {
+ public element: object;
+ constructor(options: object) {this.element = options;}
+ }};
+ return {};
+ }});
+ const messages = {} as typeof import("../util/processMessage");
+ runInNewContext(compile("src/util/processMessage.ts"), {exports: messages, window, document,
+ require: (name: string) => name === "../search/assets" ? api : {showMessage() {}}});
+ const runTimers = () => {
+ const pending = Array.from(timers.values());
+ timers.clear();
+ pending.forEach(callback => callback());
+ };
+ return {api, messages, requests, timers, items, createPanel, runTimers};
+};
+
+for (const mobile of [false, true]) {
+ test(`asset rebuild submission waits for completion before refreshing current queries (mobile=${mobile})`, () => {
+ const runtime = createRuntime(mobile);
+ const first = runtime.createPanel("old query");
+ const second = runtime.createPanel("another query");
+ runtime.api.assetInputEvent(first as unknown as Element);
+ runtime.api.assetInputEvent(second as unknown as Element);
+ runtime.runTimers();
+ runtime.requests.length = 0;
+ runtime.api.assetMoreMenu({getBoundingClientRect: () => ({right: 0, bottom: 0, height: 0})} as Element,
+ first as unknown as Element, () => {});
+ runtime.items.find(item => item.label === "rebuildAssetContentIndex").click();
+ assert.deepEqual(runtime.requests.map(item => item.url), ["/api/asset/fullReindexAssetContent"]);
+ assert.equal(runtime.timers.size, 0);
+ first.input.value = "latest query";
+ assert.equal(runtime.messages.processMessage({cmd: "assetContentIndexCompleted", code: 0} as IWebSocketData), false);
+ assert.equal(runtime.timers.size, 2);
+ runtime.runTimers();
+ const searches = runtime.requests.filter(item => item.url === "/api/search/fullTextSearchAssetContent");
+ assert.deepEqual(searches.map(item => item.data.query), ["latest query", "another query"]);
+ searches.forEach(request => request.callback({data: {assetContents: [], pageCount: 0, matchedAssetCount: 0}}));
+ assert.ok(first.loadingValues.has("fn__none"));
+ assert.ok(second.loadingValues.has("fn__none"));
+ assert.ok(first.result.innerHTML.includes("total 0"));
+ });
+
+ test(`asset search debounce is per panel and ignores closed panels (mobile=${mobile})`, () => {
+ const runtime = createRuntime(mobile);
+ const first = runtime.createPanel("first");
+ const closed = runtime.createPanel("closed");
+ runtime.api.assetInputEvent(first as unknown as Element);
+ runtime.api.assetInputEvent(closed as unknown as Element);
+ first.input.value = "changed";
+ runtime.api.assetInputEvent(first as unknown as Element);
+ closed.isConnected = false;
+ runtime.runTimers();
+ assert.deepEqual(runtime.requests.map(item => item.data.query), ["changed"]);
+ runtime.requests.length = 0;
+ runtime.messages.processMessage({cmd: "assetContentIndexCompleted", code: -1, msg: "failed"} as IWebSocketData);
+ assert.equal(runtime.timers.size, 0);
+ const unrelated = {cmd: "backgroundtask", code: 0, data: {tasks: []}} as IWebSocketData;
+ assert.equal(runtime.messages.processMessage(unrelated), unrelated);
+ });
+
+ test(`a search started before rebuild completion cannot overwrite refreshed results (mobile=${mobile})`, () => {
+ const runtime = createRuntime(mobile);
+ const panel = runtime.createPanel("query");
+ runtime.api.assetInputEvent(panel as unknown as Element);
+ runtime.runTimers();
+ const oldRequest = runtime.requests[0];
+ runtime.messages.processMessage({cmd: "assetContentIndexCompleted", code: 0} as IWebSocketData);
+ runtime.runTimers();
+ runtime.requests[1].callback({data: {assetContents: [], pageCount: 1, matchedAssetCount: 2}});
+ const refreshed = panel.result.innerHTML;
+ oldRequest.callback({data: {assetContents: [], pageCount: 0, matchedAssetCount: 0}});
+ assert.equal(panel.result.innerHTML, refreshed);
+ assert.ok(refreshed.includes("total 2"));
+ });
+}
diff --git a/app/src/search/assets.ts b/app/src/search/assets.ts
index f3a1dacfb2..d9dd0868a3 100644
--- a/app/src/search/assets.ts
+++ b/app/src/search/assets.ts
@@ -165,13 +165,24 @@ export const openSearchAsset = (element: HTMLElement, isStick: boolean) => {
/// #endif
};
-let inputTimeout: number;
+const inputTimeouts = new WeakMap<Element, number>();
+const inputRevisions = new WeakMap<Element, number>();
+export const refreshAssetContentSearch = () => {
+ document.querySelectorAll("[data-asset-search]").forEach(element => assetInputEvent(element));
+};
+
export const assetInputEvent = (element: Element, localSearch?: ISearchAssetOption, page = 1) => {
+ const revision = (inputRevisions.get(element) || 0) + 1;
+ inputRevisions.set(element, revision);
+ element.setAttribute("data-asset-search", "true");
const loadingElement = element.parentElement.querySelector(".fn__loading") as HTMLElement;
loadingElement.classList.remove("fn__none");
loadingElement.style.top = "84px";
- clearTimeout(inputTimeout);
- inputTimeout = window.setTimeout(() => {
+ clearTimeout(inputTimeouts.get(element));
+ inputTimeouts.set(element, window.setTimeout(() => {
+ if (!element.isConnected) {
+ return;
+ }
if (!localSearch) {
localSearch = window.siyuan.storage[Constants.LOCAL_SEARCHASSET] as ISearchAssetOption;
}
@@ -189,6 +200,9 @@ export const assetInputEvent = (element: Element, localSearch?: ISearchAssetOpti
method: localSearch.method,
orderBy: localSearch.sort
}, (response) => {
+ if (!element.isConnected || inputRevisions.get(element) !== revision) {
+ return;
+ }
loadingElement.classList.add("fn__none");
const nextElement = element.querySelector('[data-type="assetNext"]');
if (page < response.data.pageCount) {
@@ -215,7 +229,7 @@ export const assetInputEvent = (element: Element, localSearch?: ISearchAssetOpti
${window.siyuan.languages.emptyContent}
</div>`;
});
- }, Constants.TIMEOUT_INPUT);
+ }, Constants.TIMEOUT_INPUT));
};
export const renderPreview = (element: Element, id: string, query: string, queryMethod: number) => {
@@ -446,12 +460,7 @@ export const assetMoreMenu = (target: Element, element: Element, cb: () => void)
iconHTML: "",
label: window.siyuan.languages.rebuildAssetContentIndex,
click() {
- const loadingElement = element.parentElement.querySelector(".fn__loading") as HTMLElement;
- loadingElement.classList.remove("fn__none");
- loadingElement.style.top = "84px";
- fetchPost("/api/asset/fullReindexAssetContent", {}, () => {
- assetInputEvent(element, localData);
- });
+ fetchPost("/api/asset/fullReindexAssetContent", {});
},
}).element);
/// #if MOBILE
diff --git a/app/src/types/api/index.d.ts b/app/src/types/api/index.d.ts
index eff965f975..f094fcc810 100644
--- a/app/src/types/api/index.d.ts
+++ b/app/src/types/api/index.d.ts
@@ -3445,6 +3445,11 @@ export interface APIPOSTRoutes {
/** 服务器路由要求;资源权限与笔记本租约仍由内核校验 */
authorization?: readonly ["authenticated","admin"];
};
+ /**
+ * 提交异步重建任务,成功响应只代表任务已提交,不代表索引已经完成。
+ * 重建遍历及最后一批索引写入成功后,通过主 WebSocket 发送 assetContentIndexCompleted 并提示完成;
+ * 遍历或写入失败时提示失败,不发送完成事件。不支持或解析失败的文件会跳过,加密资源不进入全局索引。
+ */
"/api/asset/fullReindexAssetContent": {
request: EmptyRequestInput;
response: { "code": 0; "data": null; "msg": string; } | { "code": -1; "data": { "closeTimeout": number; } | null; "msg": string; };
@@ -7051,6 +7056,11 @@ export interface APIPOSTRoutes {
/** 服务器路由要求;资源权限与笔记本租约仍由内核校验 */
authorization?: readonly ["authenticated","admin","writable"];
};
+ /**
+ * 使用 method 选择 0(关键词)、1(查询语法)、2(管理员 SQL)或 3(正则表达式)。
+ * orderBy 为 0 时优先返回相关度高的结果,为 1 时优先返回相关度低的结果;2/3 分别为更新时间升序/降序。
+ * 相关度按 FTS5 的 BM25 分数解释(越小越相关);正则无 FTS 相关度,相关度排序选项按路径排序;SQL 使用自身的排序。
+ */
"/api/search/fullTextSearchAssetContent": {
request: SearchAssetContentRequestInput;
response: { "code": 0; "data": SearchAssetContentData; "msg": string; } | { "code": -1; "data": { "closeTimeout": number; } | null; "msg": string; };
@@ -7068,6 +7078,11 @@ export interface APIPOSTRoutes {
/** 服务器路由要求;资源权限与笔记本租约仍由内核校验 */
authorization?: readonly ["authenticated"];
};
+ /**
+ * 按索引记录 ID 获取完整预览;queryMethod 为 0(关键词)或 1(查询语法)时使用 FTS 高亮,
+ * 为 3 时按搜索使用的 Go 正则语义高亮;为 2(SQL)时不将 SQL 用作 MATCH,返回不高亮的完整内容。
+ * 正则无效或仅命中文件名时仍返回完整内容;内容中的 HTML 会转义,仅输出 mark/br 标记。
+ */
"/api/search/getAssetContent": {
request: AssetContentRequestInput;
response: { "code": 0; "data": AssetContentData; "msg": string; } | { "code": -1; "data": { "closeTimeout": number; } | null; "msg": string; };
diff --git a/app/src/util/processMessage.ts b/app/src/util/processMessage.ts
index d342ed5d5e..7b12170c76 100644
--- a/app/src/util/processMessage.ts
+++ b/app/src/util/processMessage.ts
@@ -11,6 +11,11 @@ import {applySettingTask} from "../config/setting/taskBlocker";
import {notifyOCRChanged} from "../config/ocrRuntime";
export const processMessage = (response: IWebSocketData) => {
+ if (response.cmd === "assetContentIndexCompleted" && response.code === 0) {
+ const {refreshAssetContentSearch}: typeof import("../search/assets") = require("../search/assets");
+ refreshAssetContentSearch();
+ return false;
+ }
if (response.cmd === "ocrChanged") {
notifyOCRChanged();
return false;
diff --git a/kernel/api/asset.go b/kernel/api/asset.go
index 61bbc2d642..6b2a0fa4c6 100644
--- a/kernel/api/asset.go
+++ b/kernel/api/asset.go
@@ -95,6 +95,7 @@ var statAsset = contractHandler(apicontract.StatAsset, func(c *gin.Context, requ
var fullReindexAssetContent = contractHandler(apicontract.FullReindexAssetContent, func(c *gin.Context, request apicontract.EmptyRequest) apicontract.Response[apicontract.Null] {
+ util.PushMsgWithApp(resolveRequestAppID(c, ""), model.Conf.Language(441), 5000)
model.ReindexAssetContent()
return apicontract.Success(apicontract.Null{})
diff --git a/kernel/api/contract_search_test.go b/kernel/api/contract_search_test.go
index 7b49a154f9..72c92097cf 100644
--- a/kernel/api/contract_search_test.go
+++ b/kernel/api/contract_search_test.go
@@ -195,6 +195,7 @@ func TestAPIContractSearchPathAndSubtypeCompatibility(t *testing.T) {
// 搜索查询在契约测试的独立进程内访问临时数据库。
func testSearchQueryContracts(t *testing.T, docID string) {
t.Helper()
+ testAssetContentPreviewContract(t)
testSearchAssetMetadataContract(t)
testExactRefDocTitleContract(t, docID)
for _, entry := range []struct {
@@ -230,6 +231,45 @@ func testSearchQueryContracts(t *testing.T, docID string) {
}
}
+func testAssetContentPreviewContract(t *testing.T) {
+ t.Helper()
+ const id = "20261026000001-preview"
+ sql.IndexAssetContentsQueue([]*sql.AssetContent{{ID: id, Name: "preview.txt", Path: "assets/preview.txt", Ext: ".txt", Content: "PTFE <oxide>\nnext"}})
+ if err := sql.FlushAssetContentQueue(); err != nil {
+ t.Fatal(err)
+ }
+ engine := gin.New()
+ engine.Use(boxLeaseMiddleware, func(c *gin.Context) { c.Set(model.RoleContextKey, model.RoleAdministrator) })
+ engine.POST("/api/search/getAssetContent", getAssetContent)
+ for _, test := range []struct {
+ query, want string
+ method int
+ }{
+ {"PTFE.*oxide", "<mark>PTFE &lt;oxide</mark>&gt;<br>next", 3},
+ {"SELECT * FROM asset_contents_fts_case_insensitive", "PTFE &lt;oxide&gt;<br>next", 2},
+ {"PTFE", "<mark>PTFE</mark> &lt;oxide&gt;<br>next", 0},
+ } {
+ body, err := json.Marshal(map[string]any{"id": id, "query": test.query, "queryMethod": test.method})
+ if err != nil {
+ t.Fatal(err)
+ }
+ recorder := httptest.NewRecorder()
+ engine.ServeHTTP(recorder, httptest.NewRequest("POST", "/api/search/getAssetContent", strings.NewReader(string(body))))
+ requireAPIContract(t, "POST", "/api/search/getAssetContent", recorder)
+ var response struct {
+ Code int `json:"code"`
+ Data apicontract.AssetContentData `json:"data"`
+ }
+ if err := json.Unmarshal(recorder.Body.Bytes(), &response); err != nil || response.Code != 0 || response.Data.AssetContent == nil || response.Data.AssetContent.Content != test.want {
+ t.Fatalf("method=%d: unexpected preview contract: %s, err=%v", test.method, recorder.Body.String(), err)
+ }
+ }
+ sql.DeleteAssetContentsByPathQueue("assets/preview.txt")
+ if err := sql.FlushAssetContentQueue(); err != nil {
+ t.Fatal(err)
+ }
+}
+
// 精确标题解析在独立契约测试进程中读取真实文档,覆盖搜索过滤和块命名干扰。
func testExactRefDocTitleContract(t *testing.T, sourceID string) {
t.Helper()
diff --git a/kernel/apicontract/contracts.go b/kernel/apicontract/contracts.go
index faefc28473..d9e1c6910f 100644
--- a/kernel/apicontract/contracts.go
+++ b/kernel/apicontract/contracts.go
@@ -814,6 +814,9 @@ var SearchTemplate = define[SearchKeywordRequest, SearchTemplateData]("searchTem
var RemoveSearchTemplate = define[SearchPathRequest, Null]("removeTemplate", "/api/search/removeTemplate", AuthenticatedAccess|AdminAccess|WritableAccess, JSONBody, ResponseOptions{}, "POST")
+// GetAssetContent 按索引记录 ID 获取完整预览;queryMethod 为 0(关键词)或 1(查询语法)时使用 FTS 高亮,
+// 为 3 时按搜索使用的 Go 正则语义高亮;为 2(SQL)时不将 SQL 用作 MATCH,返回不高亮的完整内容。
+// 正则无效或仅命中文件名时仍返回完整内容;内容中的 HTML 会转义,仅输出 mark/br 标记。
var GetAssetContent = define[AssetContentRequest, AssetContentData]("getAssetContent", "/api/search/getAssetContent", AuthenticatedAccess, JSONBody, ResponseOptions{}, "POST")
var GetAssetContentByPath = define[SearchPathRequest, AssetContentData]("getAssetContentByPath", "/api/search/getAssetContentByPath", AuthenticatedAccess, JSONBody, ResponseOptions{}, "POST")
@@ -822,6 +825,9 @@ var ListInvalidBlockRefs = define[SearchPageRequest, SearchBlocksData]("listInva
var UpdateEmbedBlock = define[UpdateEmbedBlockRequest, Null]("updateEmbedBlock", "/api/search/updateEmbedBlock", AuthenticatedAccess, JSONBody, ResponseOptions{}, "POST")
+// FullTextSearchAssetContent 使用 method 选择 0(关键词)、1(查询语法)、2(管理员 SQL)或 3(正则表达式)。
+// orderBy 为 0 时优先返回相关度高的结果,为 1 时优先返回相关度低的结果;2/3 分别为更新时间升序/降序。
+// 相关度按 FTS5 的 BM25 分数解释(越小越相关);正则无 FTS 相关度,相关度排序选项按路径排序;SQL 使用自身的排序。
var FullTextSearchAssetContent = define[SearchAssetContentRequest, SearchAssetContentData]("fullTextSearchAssetContent", "/api/search/fullTextSearchAssetContent", AuthenticatedAccess, JSONBody, ResponseOptions{}, "POST")
// GetEmbedBlock 返回的文档面包屑项可附带 documentTitle,name 保留完整路径;标题不受路径分隔符影响。
@@ -1222,6 +1228,10 @@ var ExportAsciiDoc = define[ExportIDRequest, ExportNamedZipData]("exportAsciiDoc
var ExportReStructuredText = define[ExportIDRequest, ExportNamedZipData]("exportReStructuredText", "/api/export/exportReStructuredText", AuthenticatedAccess|AdminAccess, JSONBody, ResponseOptions{}, "POST")
var StatAsset = define[AssetPathRequest, AssetStatData]("statAsset", "/api/asset/statAsset", AuthenticatedAccess|AdminAccess, JSONBody, ResponseOptions{AdditionalCodes: []int{1}}, "POST")
+
+// FullReindexAssetContent 提交异步重建任务,成功响应只代表任务已提交,不代表索引已经完成。
+// 重建遍历及最后一批索引写入成功后,通过主 WebSocket 发送 assetContentIndexCompleted 并提示完成;
+// 遍历或写入失败时提示失败,不发送完成事件。不支持或解析失败的文件会跳过,加密资源不进入全局索引。
var FullReindexAssetContent = define[EmptyRequest, Null]("fullReindexAssetContent", "/api/asset/fullReindexAssetContent", AuthenticatedAccess|AdminAccess|WritableAccess, NoBody, ResponseOptions{}, "POST")
// GetImageOCRText 保留已有 text 字段;无文本、缺失 path 和加密资源返回空字符串。
diff --git a/kernel/model/asset_content.go b/kernel/model/asset_content.go
index 3bcb32c9b3..5ef6c0acc2 100644
--- a/kernel/model/asset_content.go
+++ b/kernel/model/asset_content.go
@@ -18,11 +18,13 @@ package model
import (
"bytes"
+ "fmt"
"io"
"io/fs"
"math"
"os"
"path/filepath"
+ "regexp"
"runtime"
"sort"
"strconv"
@@ -61,11 +63,7 @@ type AssetContent struct {
}
func GetAssetContent(id, query string, queryMethod int) (ret *AssetContent) {
- if "" != query && (0 == queryMethod || 1 == queryMethod) {
- if 0 == queryMethod {
- query = stringQuery(query)
- }
- }
+ query = strings.TrimSpace(query)
if !ast.IsNodeIDPattern(id) {
return
}
@@ -73,15 +71,32 @@ func GetAssetContent(id, query string, queryMethod int) (ret *AssetContent) {
table := "asset_contents_fts_case_insensitive"
filter := "id = ?"
args := []any{id}
- if "" != query {
+ contentProjection := "content"
+ if "" != query && (0 == queryMethod || 1 == queryMethod) {
+ query = filterQueryInvisibleChars(query)
+ if 0 == queryMethod {
+ query = stringQuery(query)
+ }
filter += " AND `" + table + "` MATCH ?"
args = append(args, buildAssetContentColumnFilter()+":("+query+")")
+ contentProjection = "highlight(" + table + ", 6, '" + search.SearchMarkLeft + "', '" + search.SearchMarkRight + "') AS content"
}
- projections := "id, name, ext, path, size, updated, " +
- "highlight(" + table + ", 6, '" + search.SearchMarkLeft + "', '" + search.SearchMarkRight + "') AS content"
+ projections := "id, name, ext, path, size, updated, " + contentProjection
stmt := "SELECT " + projections + " FROM " + table + " WHERE " + filter
assetContents := sql.SelectAssetContentsRawStmtNoParseArgs(stmt, args, 1)
+ if 3 == queryMethod && "" != query && 0 < len(assetContents) {
+ // 与 SQL REGEXP 使用相同的转义和匹配语义,在转义 HTML 前标记原文。
+ exp := strings.ReplaceAll(filterQueryInvisibleChars(query), "\\\\", "\\")
+ if re, err := regexp.Compile(exp); err == nil {
+ assetContents[0].Content = re.ReplaceAllStringFunc(assetContents[0].Content, func(match string) string {
+ if "" == match {
+ return match
+ }
+ return search.SearchMarkLeft + match + search.SearchMarkRight
+ })
+ }
+ }
results := fromSQLAssetContents(&assetContents)
if 1 > len(results) {
return
@@ -129,6 +144,9 @@ func FullTextSearchAssetContent(query string, types map[string]bool, method, ord
return
}
case 3: // 正则表达式
+ if 2 != orderBy && 3 != orderBy {
+ orderByClause = "ORDER BY path ASC"
+ }
typeFilter, typeArgs := buildAssetContentTypeFilter(types)
ret, matchedAssetCount = fullTextSearchAssetContentByRegexp(query, typeFilter, typeArgs, orderByClause, page, pageSize)
default: // 关键字
@@ -313,15 +331,15 @@ func buildAssetContentTypeFilter(types map[string]bool) (clause string, args []a
func buildAssetContentOrderBy(orderBy int) string {
switch orderBy {
case 0:
- return "ORDER BY rank DESC"
- case 1:
return "ORDER BY rank ASC"
+ case 1:
+ return "ORDER BY rank DESC"
case 2:
return "ORDER BY updated ASC"
case 3:
return "ORDER BY updated DESC"
default:
- return "ORDER BY rank DESC"
+ return "ORDER BY rank ASC"
}
}
@@ -343,6 +361,12 @@ func indexAssetContent(absPath string) {
if nil == parser {
return
}
+ indexed := false
+ defer func() {
+ if !indexed {
+ removeIndexAssetContent(absPath)
+ }
+ }()
result := parser.Parse(absPath)
if nil == result {
@@ -372,6 +396,7 @@ func indexAssetContent(absPath string) {
sql.DeleteAssetContentsByPathQueue(p)
sql.IndexAssetContentsQueue(assetContents)
+ indexed = true
}
func ReindexAssetContent() {
@@ -379,10 +404,24 @@ func ReindexAssetContent() {
}
func fullReindexAssetContent() {
+ defer func() {
+ if recovered := recover(); recovered != nil {
+ logging.LogErrorf("asset content reindex failed: %v", recovered)
+ util.PushErrMsg(Conf.Language(443), 7000)
+ }
+ }()
util.PushMsg(Conf.Language(216), 7*1000)
- sql.InitAssetContentDatabase(true)
-
- assetContentSearcher.FullIndex()
+ err := sql.InitAssetContentDatabase(true)
+ if err == nil {
+ err = assetContentSearcher.FullIndex()
+ }
+ if err != nil {
+ logging.LogErrorf("asset content reindex failed: %s", err)
+ util.PushErrMsg(Conf.Language(443), 7000)
+ return
+ }
+ util.PushMsg(Conf.Language(442), 5000)
+ util.BroadcastByType("main", "assetContentIndexCompleted", 0, "", nil)
}
func init() {
@@ -407,20 +446,28 @@ func (searcher *AssetsSearcher) GetParser(ext string) AssetParser {
return searcher.parsers[strings.ToLower(ext)]
}
-func (searcher *AssetsSearcher) FullIndex() {
- searcher.fullIndex(func(batch []*sql.AssetContent) {
+func (searcher *AssetsSearcher) FullIndex() error {
+ return searcher.fullIndex(func(batch []*sql.AssetContent) error {
sql.IndexAssetContentsQueue(batch)
// 等待本批写入完成,避免解析结果继续在索引队列中累积。
- sql.FlushAssetContentQueue()
+ return sql.FlushAssetContentQueue()
})
}
-func (searcher *AssetsSearcher) fullIndex(writeBatch func([]*sql.AssetContent)) {
- defer logging.Recover()
+func (searcher *AssetsSearcher) fullIndex(writeBatch func([]*sql.AssetContent) error) (err error) {
+ defer func() {
+ if recovered := recover(); recovered != nil {
+ err = fmt.Errorf("asset content indexing failed: %v", recovered)
+ }
+ }()
assetsDir := util.GetDataAssetsAbsPath()
- if !gulu.File.IsDir(assetsDir) {
- return
+ if info, statErr := os.Stat(assetsDir); os.IsNotExist(statErr) {
+ return nil
+ } else if statErr != nil {
+ return statErr
+ } else if !info.IsDir() {
+ return fmt.Errorf("asset directory is not a directory")
}
started := time.Now()
scanned, parsed := 0, 0
@@ -429,12 +476,15 @@ func (searcher *AssetsSearcher) fullIndex(writeBatch func([]*sql.AssetContent))
const maxBatchCount, maxBatchBytes = 128, 4 * 1024 * 1024
var batch []*sql.AssetContent
batchBytes := 0
- flush := func() {
+ flush := func() error {
if len(batch) == 0 {
- return
+ return nil
+ }
+ if err := writeBatch(batch); err != nil {
+ return err
}
- writeBatch(batch)
batch, batchBytes = nil, 0
+ return nil
}
walkErr := filelock.Walk(assetsDir, func(absPath string, d fs.DirEntry, err error) error {
if err != nil {
@@ -468,7 +518,7 @@ func (searcher *AssetsSearcher) fullIndex(writeBatch func([]*sql.AssetContent))
info, err := d.Info()
if err != nil {
logging.LogErrorf("stat file [%s] failed: %s", absPath, err)
- return nil
+ return err
}
result.Path = "assets" + filepath.ToSlash(strings.TrimPrefix(absPath, assetsDir))
@@ -476,7 +526,9 @@ func (searcher *AssetsSearcher) fullIndex(writeBatch func([]*sql.AssetContent))
result.Updated = info.ModTime().Unix()
parsed++
if batchBytes+len(result.Content) > maxBatchBytes {
- flush()
+ if err := flush(); err != nil {
+ return err
+ }
}
batch = append(batch, &sql.AssetContent{
ID: ast.NewNodeID(),
@@ -489,13 +541,16 @@ func (searcher *AssetsSearcher) fullIndex(writeBatch func([]*sql.AssetContent))
})
batchBytes += len(result.Content)
if len(batch) >= maxBatchCount || batchBytes >= maxBatchBytes {
- flush()
+ return flush()
}
return nil
})
- flush()
+ if walkErr == nil {
+ walkErr = flush()
+ }
logging.LogInfof("asset content full indexing finished: files=%d, parsed=%d, skipped=%d, elapsed=%s, error=%v",
scanned, parsed, scanned-parsed, time.Since(started), walkErr)
+ return walkErr
}
func NewAssetsSearcher() *AssetsSearcher {
diff --git a/kernel/model/asset_content_batch_test.go b/kernel/model/asset_content_batch_test.go
index ed29c99f77..cccefd47b6 100644
--- a/kernel/model/asset_content_batch_test.go
+++ b/kernel/model/asset_content_batch_test.go
@@ -1,6 +1,7 @@
package model
import (
+ "errors"
"fmt"
"os"
"path/filepath"
@@ -40,7 +41,7 @@ func TestAssetContentFullIndexWritesBoundedBatches(t *testing.T) {
searcher := NewAssetsSearcher()
searcher.parsers = map[string]AssetParser{".txt": parser}
total, batches, firstParsed := 0, 0, 0
- searcher.fullIndex(func(batch []*sql.AssetContent) {
+ err := searcher.fullIndex(func(batch []*sql.AssetContent) error {
if batches == 0 {
firstParsed = parser.parsed
}
@@ -54,10 +55,38 @@ func TestAssetContentFullIndexWritesBoundedBatches(t *testing.T) {
t.Fatalf("lost asset metadata: %+v", asset)
}
}
+ return nil
})
+ if err != nil {
+ t.Fatal(err)
+ }
if total != test.count || test.count > 2 && firstParsed >= test.count || test.count == 0 && batches != 0 {
t.Fatalf("total=%d, first parsed=%d, batches=%d", total, firstParsed, batches)
}
})
}
}
+
+func TestAssetContentFullIndexStopsOnWriteFailure(t *testing.T) {
+ oldData := util.DataDir
+ util.DataDir = t.TempDir()
+ t.Cleanup(func() { util.DataDir = oldData })
+ dir := util.GetDataAssetsAbsPath()
+ if err := os.MkdirAll(dir, 0755); err != nil {
+ t.Fatal(err)
+ }
+ for i := 0; i < 260; i++ {
+ if err := os.WriteFile(filepath.Join(dir, fmt.Sprintf("%04d.txt", i)), []byte("file"), 0644); err != nil {
+ t.Fatal(err)
+ }
+ }
+ parser := &batchTestAssetParser{content: "text"}
+ searcher := NewAssetsSearcher()
+ searcher.parsers = map[string]AssetParser{".txt": parser}
+ want := errors.New("batch write failed")
+ writes := 0
+ err := searcher.fullIndex(func([]*sql.AssetContent) error { writes++; return want })
+ if !errors.Is(err, want) || writes != 1 || parser.parsed != 128 {
+ t.Fatalf("failed batch was ignored or retried: error=%v writes=%d parsed=%d", err, writes, parser.parsed)
+ }
+}
diff --git a/kernel/model/asset_content_fts5_test.go b/kernel/model/asset_content_fts5_test.go
new file mode 100644
index 0000000000..aea3f31050
--- /dev/null
+++ b/kernel/model/asset_content_fts5_test.go
@@ -0,0 +1,321 @@
+//go:build fts5
+
+package model
+
+import (
+ "fmt"
+ "net/http"
+ "net/http/httptest"
+ "os"
+ "os/exec"
+ "path/filepath"
+ "strings"
+ "sync"
+ "testing"
+ "time"
+
+ "github.com/88250/lute/ast"
+ "github.com/gorilla/websocket"
+ "github.com/olahol/melody"
+ "github.com/siyuan-note/siyuan/kernel/conf"
+ "github.com/siyuan-note/siyuan/kernel/sql"
+ "github.com/siyuan-note/siyuan/kernel/task"
+ "github.com/siyuan-note/siyuan/kernel/util"
+)
+
+func assetContentTestChild(t *testing.T) bool {
+ t.Helper()
+ const childEnv = "SIYUAN_TEST_ASSET_CONTENT"
+ if os.Getenv(childEnv) == t.Name() {
+ return true
+ }
+ cmd := exec.Command(os.Args[0], "-test.run=^"+t.Name()+"$", "-test.v", "-test.timeout=60s")
+ cmd.Env = append(os.Environ(), childEnv+"="+t.Name())
+ if output, err := cmd.CombinedOutput(); err != nil {
+ t.Fatalf("%v\n%s", err, output)
+ }
+ return false
+}
+
+func setupAssetContentRegression(t *testing.T) string {
+ t.Helper()
+ setupFileOperationTest(t)
+ Conf.Search.Store(conf.NewSearch())
+ util.TempDir = t.TempDir()
+ util.QueueDir = filepath.Join(util.TempDir, "queue")
+ util.DBPath = filepath.Join(util.TempDir, "siyuan.db")
+ util.HistoryDBPath = filepath.Join(util.TempDir, "history.db")
+ util.AssetContentDBPath = filepath.Join(util.TempDir, "asset_content.db")
+ sql.InitDatabase(true)
+ sql.InitHistoryDatabase(true)
+ if err := sql.InitAssetContentDatabase(true); err != nil {
+ t.Fatal(err)
+ }
+ t.Cleanup(sql.CloseDatabase)
+ dir := util.GetDataAssetsAbsPath()
+ if err := os.MkdirAll(dir, 0755); err != nil {
+ t.Fatal(err)
+ }
+ return dir
+}
+
+func TestAssetContentRelevanceAndPreview(t *testing.T) {
+ if !assetContentTestChild(t) {
+ return
+ }
+ setupAssetContentRegression(t)
+ strongID, weakID := ast.NewNodeID(), ast.NewNodeID()
+ content := "needle needle needle PTFE <oxide>&\nprice $5 and value 123"
+ sql.IndexAssetContentsQueue([]*sql.AssetContent{
+ {ID: strongID, Name: "strong.txt", Ext: ".txt", Path: "assets/strong.txt", Content: content},
+ {ID: weakID, Name: "weak.txt", Ext: ".txt", Path: "assets/weak.txt", Content: "needle " + strings.Repeat("filler ", 60)},
+ })
+ if err := sql.FlushAssetContentQueue(); err != nil {
+ t.Fatal(err)
+ }
+ for _, method := range []int{0, 1} {
+ for _, order := range []int{0, 1, 99} {
+ results, count, pages, err := FullTextSearchAssetContent("needle", nil, method, order, 1, 32)
+ want := strongID
+ if order == 1 {
+ want = weakID
+ }
+ if err != nil || count != 2 || pages != 1 || len(results) != 2 || results[0].ID != want {
+ t.Fatalf("method=%d order=%d: results=%+v count=%d pages=%d err=%v", method, order, results, count, pages, err)
+ }
+ }
+ }
+ for _, test := range []struct {
+ name, query, mark string
+ method int
+ }{
+ {"keyword", "needle", "<mark>needle</mark>", 0},
+ {"syntax", `"needle"`, "<mark>needle</mark>", 1},
+ {"regexp", "PTFE.*oxide", "<mark>PTFE &lt;oxide</mark>&gt;", 3},
+ {"regexp surrounding whitespace", " PTFE.*oxide ", "<mark>PTFE &lt;oxide</mark>&gt;", 3},
+ {"regexp insensitive", "(?i)ptfe", "<mark>PTFE</mark>", 3},
+ {"regexp escaped", `\\d+`, "<mark>123</mark>", 3},
+ {"regexp dollar", `\$5`, "<mark>$5</mark>", 3},
+ {"regexp name only", `strong[.]txt`, "", 3},
+ {"regexp invalid", "[", "", 3},
+ {"regexp empty match", "^", "", 3},
+ {"sql", "SELECT * FROM asset_contents_fts_case_insensitive", "", 2},
+ {"empty query", "", "", 0},
+ } {
+ t.Run(test.name, func(t *testing.T) {
+ preview := GetAssetContent(strongID, test.query, test.method)
+ if preview == nil || !strings.Contains(preview.Content, "<br>") || strings.Contains(preview.Content, "<oxide>") {
+ t.Fatalf("missing or unsafe preview: %+v", preview)
+ }
+ if test.mark == "" && strings.Contains(preview.Content, "<mark>") || test.mark != "" && !strings.Contains(preview.Content, test.mark) {
+ t.Fatalf("unexpected highlight: %s", preview.Content)
+ }
+ })
+ }
+ for _, method := range []int{2, 3} {
+ query := "PTFE.*oxide"
+ if method == 2 {
+ query = "SELECT * FROM asset_contents_fts_case_insensitive WHERE name = 'strong.txt'"
+ }
+ results, count, _, err := FullTextSearchAssetContent(query, nil, method, 0, 1, 32)
+ if err != nil || count != 1 || len(results) != 1 || GetAssetContent(results[0].ID, query, method) == nil {
+ t.Fatalf("search and preview disagree: method=%d results=%v count=%d err=%v", method, results, count, err)
+ }
+ }
+ if GetAssetContent("missing", "", 2) != nil {
+ t.Fatal("invalid ID returned a preview")
+ }
+}
+
+func TestAssetContentInvalidationAfterParseFailure(t *testing.T) {
+ if !assetContentTestChild(t) {
+ return
+ }
+ dir := setupAssetContentRegression(t)
+ for _, test := range []struct {
+ name string
+ data []byte
+ panicParser bool
+ }{
+ {"invalid UTF-8", []byte{0xff, 0xfe, 0x61}, false},
+ {"oversize text", []byte(strings.Repeat("x", TxtAssetContentMaxSize+1)), false},
+ {"parser panic", []byte("broken"), true},
+ } {
+ t.Run(test.name, func(t *testing.T) {
+ p := filepath.Join(dir, "changed.txt")
+ for _, data := range [][]byte{[]byte("oldneedle"), test.data, []byte("newneedle")} {
+ if err := os.WriteFile(p, data, 0644); err != nil {
+ t.Fatal(err)
+ }
+ parser := assetContentSearcher.parsers[".txt"]
+ if test.panicParser && string(data) == "broken" {
+ assetContentSearcher.parsers[".txt"] = assetContentTestParser(func(string) *AssetParseResult { panic("parse failure") })
+ }
+ HandleAssetsChangeEvent(p)
+ assetContentSearcher.parsers[".txt"] = parser
+ if err := sql.FlushAssetContentQueue(); err != nil {
+ t.Fatal(err)
+ }
+ current := GetAssetContentByPath("assets/changed.txt")
+ if string(data) == "oldneedle" || string(data) == "newneedle" {
+ if current == nil || current.Content != string(data) {
+ t.Fatalf("valid content was not indexed: %+v", current)
+ }
+ } else if current != nil {
+ t.Fatalf("stale content remains: %+v", current)
+ }
+ actual, err := os.ReadFile(p)
+ if err != nil || string(actual) != string(data) {
+ t.Fatal("indexing changed the source asset", err)
+ }
+ }
+ })
+ }
+}
+
+type assetContentTestParser func(string) *AssetParseResult
+
+func (parser assetContentTestParser) Parse(path string) *AssetParseResult { return parser(path) }
+
+func TestAssetContentRebuildCompletion(t *testing.T) {
+ if !assetContentTestChild(t) {
+ return
+ }
+ setupAssetContentRegression(t)
+ util.Langs = map[string]map[int]string{Conf.Lang: {216: "running", 442: "completed", 443: "failed"}}
+ push := melody.New()
+ connected := make(chan *melody.Session, 2)
+ push.HandleConnect(func(session *melody.Session) {
+ if session.Request.URL.Query().Get("publish") == "true" {
+ session.Set("isPublish", true)
+ }
+ util.AddPushChan(session)
+ connected <- session
+ })
+ push.HandleDisconnect(util.RemovePushChan)
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { _ = push.HandleRequest(w, r) }))
+ var connections []*websocket.Conn
+ var sessions []*melody.Session
+ for i := 0; i < 2; i++ {
+ url := fmt.Sprintf("ws%s/ws?app=asset-content-test&id=%d&type=main&publish=%t", strings.TrimPrefix(server.URL, "http"), i, i == 1)
+ connection, response, err := websocket.DefaultDialer.Dial(url, nil)
+ if err != nil {
+ t.Fatal(err)
+ }
+ _ = response.Body.Close()
+ connections = append(connections, connection)
+ sessions = append(sessions, <-connected)
+ }
+ t.Cleanup(func() {
+ for i, connection := range connections {
+ _ = connection.Close()
+ util.RemovePushChan(sessions[i])
+ }
+ _ = push.Close()
+ server.Close()
+ })
+ readEvents := func() [][]struct{ Cmd, Msg string } {
+ t.Helper()
+ if err := push.Broadcast([]byte(`{"cmd":"asset-index-barrier"}`)); err != nil {
+ t.Fatal(err)
+ }
+ ret := make([][]struct{ Cmd, Msg string }, len(connections))
+ for i, connection := range connections {
+ _ = connection.SetReadDeadline(time.Now().Add(5 * time.Second))
+ for {
+ var event struct{ Cmd, Msg string }
+ if err := connection.ReadJSON(&event); err != nil {
+ t.Fatal(err)
+ }
+ if event.Cmd == "asset-index-barrier" {
+ break
+ }
+ ret[i] = append(ret[i], event)
+ }
+ }
+ return ret
+ }
+ for _, mode := range []string{"success", "empty", "walk failure", "parser panic", "write failure"} {
+ t.Run(mode, func(t *testing.T) {
+ util.DataDir = t.TempDir()
+ dir := util.GetDataAssetsAbsPath()
+ if mode == "walk failure" {
+ if err := os.WriteFile(dir, []byte("not a directory"), 0644); err != nil {
+ t.Fatal(err)
+ }
+ } else if err := os.MkdirAll(dir, 0755); err != nil {
+ t.Fatal(err)
+ }
+ entered, release := make(chan struct{}), make(chan struct{})
+ var unblock sync.Once
+ t.Cleanup(func() { unblock.Do(func() { close(release) }) })
+ assetContentSearcher = NewAssetsSearcher()
+ calls := 0
+ assetContentSearcher.parsers[".txt"] = assetContentTestParser(func(string) *AssetParseResult {
+ calls++
+ close(entered)
+ <-release
+ if mode == "parser panic" {
+ panic("parser failed")
+ }
+ if mode == "write failure" {
+ sql.CloseDatabase()
+ }
+ return &AssetParseResult{Content: "last batch committed"}
+ })
+ if mode != "empty" && mode != "walk failure" {
+ if err := os.WriteFile(filepath.Join(dir, "last.txt"), []byte("source"), 0644); err != nil {
+ t.Fatal(err)
+ }
+ }
+ ReindexAssetContent()
+ if calls != 0 {
+ t.Fatal("submission ran indexing synchronously")
+ }
+ // 任务队列只取出已超过延迟的任务,避开 Windows 时钟分辨率下的同一时间点。
+ time.Sleep(10 * time.Millisecond)
+ done := make(chan struct{})
+ go func() { task.ExecTaskJob(); close(done) }()
+ if mode != "empty" && mode != "walk failure" {
+ select {
+ case <-entered:
+ case <-time.After(5 * time.Second):
+ t.Fatal("indexer did not start")
+ }
+ ReindexAssetContent()
+ for _, events := range readEvents() {
+ for _, event := range events {
+ if event.Cmd == "assetContentIndexCompleted" || event.Msg == "completed" {
+ t.Fatal("completion was sent before the final batch was written")
+ }
+ }
+ }
+ unblock.Do(func() { close(release) })
+ }
+ select {
+ case <-done:
+ case <-time.After(5 * time.Second):
+ t.Fatal("indexer did not finish")
+ }
+ events := readEvents()
+ if len(events[1]) != 0 {
+ t.Fatalf("publish session received index notifications: %+v", events[1])
+ }
+ completed, failed := false, false
+ for _, event := range events[0] {
+ completed = completed || event.Cmd == "assetContentIndexCompleted"
+ failed = failed || event.Msg == "failed"
+ }
+ wantSuccess := mode == "success" || mode == "empty"
+ if completed != wantSuccess || failed == wantSuccess {
+ t.Fatalf("wrong completion result: %+v", events[0])
+ }
+ if mode == "success" {
+ indexed := GetAssetContentByPath("assets/last.txt")
+ if indexed == nil || indexed.Content != "last batch committed" || calls != 1 {
+ t.Fatalf("completion preceded indexing or duplicate tasks ran: %+v, calls=%d", indexed, calls)
+ }
+ }
+ })
+ }
+}
diff --git a/kernel/sql/database.go b/kernel/sql/database.go
index 395a92d922..8ba97a2c6e 100644
--- a/kernel/sql/database.go
+++ b/kernel/sql/database.go
@@ -446,14 +446,16 @@ func initHistoryDBTables() {
var initAssetContentDatabaseLock = sync.Mutex{}
-func InitAssetContentDatabase(forceRebuild bool) {
+func InitAssetContentDatabase(forceRebuild bool) error {
+ assetContentTxLock.Lock()
+ defer assetContentTxLock.Unlock()
initAssetContentDatabaseLock.Lock()
defer initAssetContentDatabaseLock.Unlock()
initAssetContentDBConnection()
if !forceRebuild && gulu.File.IsExist(util.AssetContentDBPath) {
- return
+ return nil
}
assetContentDB.Close()
@@ -461,11 +463,12 @@ func InitAssetContentDatabase(forceRebuild bool) {
runtime.GC()
if err := os.RemoveAll(util.AssetContentDBPath); err != nil {
logging.LogErrorf("remove assets database file [%s] failed: %s", util.AssetContentDBPath, err)
- return
+ return err
}
initAssetContentDBConnection()
initAssetContentDBTables()
+ return nil
}
func initAssetContentDBConnection() {
diff --git a/kernel/sql/queue_asset_content.go b/kernel/sql/queue_asset_content.go
index 683abdc675..7aa524c2c0 100644
--- a/kernel/sql/queue_asset_content.go
+++ b/kernel/sql/queue_asset_content.go
@@ -48,15 +48,18 @@ func FlushAssetContentTxJob() {
task.AppendTask(task.AssetContentDatabaseIndexCommit, FlushAssetContentQueue)
}
-func FlushAssetContentQueue() {
+func FlushAssetContentQueue() error {
+ assetContentTxLock.Lock()
+ defer assetContentTxLock.Unlock()
ops := getAssetContentOperations()
total := len(ops)
if 1 > total {
- return
+ return nil
}
- assetContentTxLock.Lock()
- defer assetContentTxLock.Unlock()
+ if assetContentDB == nil {
+ return errors.New("asset content database is unavailable")
+ }
start := time.Now()
groupOpsTotal := map[string]int{}
@@ -68,12 +71,12 @@ func FlushAssetContentQueue() {
groupOpsCurrent := map[string]int{}
for i, op := range ops {
if util.IsExiting.Load() {
- return
+ return errors.New("asset content indexing interrupted by shutdown")
}
tx, err := beginAssetContentTx()
if err != nil {
- return
+ return err
}
groupOpsCurrent[op.action]++
@@ -84,12 +87,12 @@ func FlushAssetContentQueue() {
tx.Rollback()
logging.LogErrorf("queue operation failed: %s", err)
eventbus.Publish(util.EvtSQLAssetContentRebuild)
- return
+ return err
}
if err = commitAssetContentTx(tx); err != nil {
logging.LogErrorf("commit tx failed: %s", err)
- return
+ return err
}
if 16 < i && 0 == i%128 {
@@ -105,6 +108,7 @@ func FlushAssetContentQueue() {
if 7000 < elapsed {
logging.LogInfof("database asset content op tx [%dms]", elapsed)
}
+ return nil
}
func execAssetContentOp(op *assetContentDBQueueOperation, tx *sql.Tx, context map[string]any) (err error) {
diff --git a/kernel/sql/queue_asset_content_test.go b/kernel/sql/queue_asset_content_test.go
new file mode 100644
index 0000000000..d830ef42c1
--- /dev/null
+++ b/kernel/sql/queue_asset_content_test.go
@@ -0,0 +1,71 @@
+package sql
+
+import (
+ "database/sql"
+ "testing"
+
+ "github.com/siyuan-note/siyuan/kernel/util"
+)
+
+func TestAssetContentQueueReportsWriteFailure(t *testing.T) {
+ testDB, err := sql.Open("sqlite3", ":memory:")
+ if err != nil {
+ t.Fatal(err)
+ }
+ previousDB, previousQueue := assetContentDB, assetContentOperationQueue
+ assetContentDB, assetContentOperationQueue = testDB, nil
+ t.Cleanup(func() {
+ _ = testDB.Close()
+ assetContentDB, assetContentOperationQueue = previousDB, previousQueue
+ })
+ if _, err := testDB.Exec("CREATE TABLE asset_contents_fts_case_insensitive (id TEXT UNIQUE, name TEXT, ext TEXT, path TEXT, size INTEGER, updated INTEGER, content TEXT)"); err != nil {
+ t.Fatal(err)
+ }
+ IndexAssetContentsQueue([]*AssetContent{{ID: "first", Path: "assets/test.txt", Content: "content"}})
+ if err := FlushAssetContentQueue(); err != nil {
+ t.Fatal(err)
+ }
+ IndexAssetContentsQueue([]*AssetContent{{ID: "first", Path: "assets/duplicate.txt"}})
+ if err := FlushAssetContentQueue(); err == nil {
+ t.Fatal("failed write reported success")
+ }
+ var count int
+ if err := testDB.QueryRow("SELECT COUNT(*) FROM asset_contents_fts_case_insensitive").Scan(&count); err != nil || count != 1 {
+ t.Fatalf("failed write damaged committed data: count=%d err=%v", count, err)
+ }
+ DeleteAssetContentsByPathQueue("assets/test.txt")
+ if err := FlushAssetContentQueue(); err != nil {
+ t.Fatal(err)
+ }
+ if err := testDB.Close(); err != nil {
+ t.Fatal(err)
+ }
+ IndexAssetContentsQueue([]*AssetContent{{ID: "closed"}})
+ if err := FlushAssetContentQueue(); err == nil {
+ t.Fatal("closed database reported success")
+ }
+ assetContentDB = nil
+ IndexAssetContentsQueue([]*AssetContent{{ID: "missing"}})
+ if err := FlushAssetContentQueue(); err == nil {
+ t.Fatal("unavailable database reported success")
+ }
+}
+
+func TestAssetContentQueueReportsShutdown(t *testing.T) {
+ testDB, err := sql.Open("sqlite3", ":memory:")
+ if err != nil {
+ t.Fatal(err)
+ }
+ previousDB, previousQueue, previousExiting := assetContentDB, assetContentOperationQueue, util.IsExiting.Load()
+ assetContentDB, assetContentOperationQueue = testDB, nil
+ t.Cleanup(func() {
+ _ = testDB.Close()
+ assetContentDB, assetContentOperationQueue = previousDB, previousQueue
+ util.IsExiting.Store(previousExiting)
+ })
+ util.IsExiting.Store(true)
+ IndexAssetContentsQueue([]*AssetContent{{ID: "shutdown"}})
+ if err := FlushAssetContentQueue(); err == nil {
+ t.Fatal("interrupted indexing reported success")
+ }
+}