obsidian-plugin/lllin000_PaperForge
1
0
Fork 0
mirror of https://github.com/lllin000/PaperForge.git synced 2026-07-22 06:50:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: refresh_paper FTS delete-before-upsert, import error checking

Browse source
This commit is contained in:
Research Assistant 2026-05-14 22:47:48 +08:00
parent e68d931134
commit 560be86b83
2 changed files with 52 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
paperforge/commands/reading_log.py
View file

@ -164,13 +164,14 @@ def import_reading_log(vault: Path, filepath: Path) -> dict:
papers_set: set[str] = set()
entries_imported = 0
errors: list[dict] = []
for paper in parsed["papers"]:
for section in paper["sections"]:
info = section.get("info", "")
use = section.get("use", "")
if info and use:
append_reading_note(
res = append_reading_note(
vault,
paper["paper_key"],
section["section_name"],
@ -178,10 +179,22 @@ def import_reading_log(vault: Path, filepath: Path) -> dict:
usage=use,
note=section.get("note", "") or "",
)
entries_imported += 1
papers_set.add(paper["paper_key"])
if res.get("ok"):
entries_imported += 1
papers_set.add(paper["paper_key"])
else:
errors.append({
"paper_key": paper["paper_key"],
"section": section["section_name"],
"error": res.get("error", "unknown"),
})
return {"ok": True, "papers_imported": len(papers_set), "entries_imported": entries_imported}
return {
"ok": len(errors) == 0,
"papers_imported": len(papers_set),
"entries_imported": entries_imported,
"errors": errors,
}
def lookup_paper_events(vault: Path, key: str) -> dict:

58
paperforge/memory/refresh.py
View file

@ -41,6 +41,20 @@ def refresh_paper(vault: Path, entry: dict) -> bool:
entry["next_step"] = str(compute_next_step(entry))
paper_values = build_paper_row(entry, generated_at)
# Step 1: Get old rowid before papers upsert (rowid may change on REPLACE)
old = conn.execute(
"SELECT rowid FROM papers WHERE zotero_key = ?",
(zotero_key,),
).fetchone()
# Step 2: Delete old FTS row BEFORE papers changes
if old:
conn.execute(
"DELETE FROM paper_fts WHERE rowid = ?",
(old["rowid"],),
)
# Step 3: Upsert papers
placeholders = ", ".join([f":{c}" for c in PAPER_COLUMNS])
cols = ", ".join(PAPER_COLUMNS)
conn.execute(
@ -78,33 +92,31 @@ def refresh_paper(vault: Path, entry: dict) -> bool:
(zotero_key, raw_str, raw_str.lower().strip(), alias_type),
)
row = conn.execute(
# Step 4: Get new rowid after upsert
new = conn.execute(
"SELECT rowid FROM papers WHERE zotero_key = ?",
(zotero_key,),
).fetchone()
if row:
conn.execute(
"INSERT INTO paper_fts(paper_fts, rowid) VALUES ('delete', ?)",
(row["rowid"],),
)
conn.execute(
"INSERT INTO paper_fts(rowid, zotero_key, citation_key, title, first_author, authors_json, abstract, journal, domain, collection_path, collections_json) "
"VALUES ((SELECT rowid FROM papers WHERE zotero_key = ?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
(
zotero_key,
zotero_key,
entry.get("citation_key", ""),
entry.get("title", ""),
entry.get("first_author", ""),
paper_values["authors_json"],
entry.get("abstract", ""),
entry.get("journal", ""),
entry.get("domain", ""),
entry.get("collection_path", ""),
paper_values["collections_json"],
),
)
# Step 5: Insert new FTS row
if new:
conn.execute(
"INSERT INTO paper_fts(rowid, zotero_key, citation_key, title, first_author, authors_json, abstract, journal, domain, collection_path, collections_json) "
"VALUES ((SELECT rowid FROM papers WHERE zotero_key = ?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
(
zotero_key,
zotero_key,
entry.get("citation_key", ""),
entry.get("title", ""),
entry.get("first_author", ""),
paper_values["authors_json"],
entry.get("abstract", ""),
entry.get("journal", ""),
entry.get("domain", ""),
entry.get("collection_path", ""),
paper_values["collections_json"],
),
)
conn.execute(PAPERS_AI_TRIGGER)
conn.commit()