diff --git a/src-tauri/src/db.rs b/src-tauri/src/db.rs index a9caf14..9b5caf8 100644 --- a/src-tauri/src/db.rs +++ b/src-tauri/src/db.rs @@ -2074,11 +2074,16 @@ pub fn delete_folder(conn: &Connection, folder_id: i64) -> Result<()> { rows }; - let tx = conn.unchecked_transaction()?; - for image_id in image_ids { - vector::delete_embedding(&tx, image_id)?; - vector::delete_caption_embedding(&tx, image_id)?; + // Delete sqlite-vec rows outside any transaction — DML on virtual tables is + // unreliable inside a transaction and will cause remove_folder to fail for + // folders that have generated embeddings. The folder cascade (images rows) + // is handled by the FK ON DELETE CASCADE when the folder row is deleted. + for image_id in &image_ids { + vector::delete_embedding(conn, *image_id)?; + vector::delete_caption_embedding(conn, *image_id)?; } + + let tx = conn.unchecked_transaction()?; tx.execute("DELETE FROM folders WHERE id = ?1", params![folder_id])?; tx.commit()?; Ok(()) diff --git a/src/store.ts b/src/store.ts index 60f406a..82d456d 100644 --- a/src/store.ts +++ b/src/store.ts @@ -657,8 +657,8 @@ export const useGalleryStore = create((set, get) => ({ const { selectedFolderId, loadFolders, loadImages, loadBackgroundJobProgress } = get(); await loadFolders(); await loadBackgroundJobProgress(); - // Invalidate tag cloud cache since library content changed - set({ tagCloudFolderId: undefined, tagCloudEntries: [] }); + // Invalidate tag cloud and explore-tags cache since library content changed + set({ tagCloudFolderId: undefined, tagCloudEntries: [], exploreTagsFolderId: undefined }); if (selectedFolderId === folderId) { set({ selectedFolderId: null }); await loadImages(true); @@ -810,7 +810,7 @@ export const useGalleryStore = create((set, get) => ({ if (collectionTitle === "Explore Cluster") return; if (collectionTitle === "Similar Images" && similarSourceImageId !== null) { if (!similarHasMore) return; - await get().loadSimilarImages(similarSourceImageId, similarFolderId, false); + await get().loadSimilarImages(similarSourceImageId, similarFolderId, false, get().similarSourceFolderId ?? null); return; } if (collectionTitle === "Region Search Results" && similarSourceImageId !== null && similarCrop !== null) {