Skip to content

DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.

fix(knowledge): confirm MarginNote deletion before removing data

dajiaohuang857b7b48e7e1
diff --git a/deeptutor/knowledge/manager.py b/deeptutor/knowledge/manager.py
index 677512b64..a64165b94 100644
--- a/deeptutor/knowledge/manager.py
+++ b/deeptutor/knowledge/manager.py
@@ -1807,9 +1807,6 @@ class KnowledgeBaseManager:
# in an external resource the user manages. Leaving it behind would also
# resurrect every paired device the moment a library of the same name is
# connected again.
- if entry.get("type") == MARGINNOTE4_KB_TYPE:
- self._delete_marginnote4_store(name, entry)
-
if not confirm:
# Ask for confirmation in CLI
print(f"⚠️ Warning: This will permanently delete the knowledge base '{name}'")
@@ -1819,6 +1816,9 @@ class KnowledgeBaseManager:
print("Deletion cancelled.")
return False
+ if entry.get("type") == MARGINNOTE4_KB_TYPE:
+ self._delete_marginnote4_store(name, entry)
+
if dir_exists:
def _on_rmtree_error(func, path, exc_info):
diff --git a/tests/knowledge/test_delete_confirmation.py b/tests/knowledge/test_delete_confirmation.py
new file mode 100644
index 000000000..337e78bb8
--- /dev/null
+++ b/tests/knowledge/test_delete_confirmation.py
@@ -0,0 +1,38 @@
+"""Cancelled knowledge-base deletion must retain the native MarginNote store."""
+
+from pathlib import Path
+
+import pytest
+
+from deeptutor.capabilities.marginnote4.store import MarginNoteStore
+from deeptutor.knowledge.manager import KnowledgeBaseManager
+
+
[email protected]("response", ["no", "eof"])
+def test_cancelled_delete_preserves_marginnote_store(
+ tmp_path: Path, monkeypatch: pytest.MonkeyPatch, response: str
+) -> None:
+ database = tmp_path / "library.db"
+ store = MarginNoteStore(database)
+ device, _token = store.pair_device(device_name="iPad")
+ manager = KnowledgeBaseManager(base_dir=str(tmp_path / "kbs"))
+ manager.register_marginnote4_kb("Library", db_path=str(database))
+ original_config = manager.config_file.read_bytes()
+ original_database = database.read_bytes()
+
+ def answer(_prompt: str) -> str:
+ if response == "eof":
+ raise EOFError
+ return response
+
+ monkeypatch.setattr("builtins.input", answer)
+ if response == "eof":
+ with pytest.raises(EOFError):
+ manager.delete_knowledge_base("Library")
+ else:
+ assert manager.delete_knowledge_base("Library") is False
+
+ assert database.is_file()
+ assert database.read_bytes() == original_database
+ assert manager.config_file.read_bytes() == original_config
+ assert [item.device_id for item in store.list_devices()] == [device.device_id]