update
This commit is contained in:
@@ -17,6 +17,7 @@ use crate::db::Database;
|
||||
use crate::engine::title_parser;
|
||||
use crate::engine::tag_extractor;
|
||||
use crate::engine::person_merger;
|
||||
use sqlx::Acquire;
|
||||
use std::collections::HashSet;
|
||||
|
||||
// ════════════════════════════════════════════════
|
||||
@@ -201,17 +202,20 @@ pub async fn phase_detect_person_in_tags(db: &Database) -> (DirtySet, usize) {
|
||||
// ── 写入 person_name(直接提取,无需等待 Phase 1)──
|
||||
let (primary, aliases) = title_parser::split_person_name_with_aliases(person_name);
|
||||
let final_name = if primary.is_empty() { person_name.clone() } else { primary };
|
||||
db.update_album_person(&album.id, person_name, &final_name).await;
|
||||
|
||||
// 用事务包裹所有写入,避免逐条 autocommit 导致巨慢
|
||||
let mut tx = db.pool.begin().await.expect("begin tx");
|
||||
db.update_album_person_with_tx(&mut tx, &album.id, person_name, &final_name).await;
|
||||
|
||||
if !title_parser::is_excluded_name(&final_name) {
|
||||
let pid = db.insert_person(&final_name, None).await;
|
||||
db.insert_person_album(pid, &album.id).await;
|
||||
let pid = db.insert_person_with_tx(&mut tx, &final_name, None).await;
|
||||
db.insert_person_album_with_tx(&mut tx, pid, &album.id).await;
|
||||
for (at, an) in &aliases {
|
||||
if !an.is_empty() && an != &final_name {
|
||||
db.insert_person_alias(pid, at, an).await;
|
||||
db.insert_person_alias_with_tx(&mut tx, pid, at, an).await;
|
||||
}
|
||||
}
|
||||
db.update_person_counts(pid).await;
|
||||
db.update_person_counts_with_tx(&mut tx, pid).await;
|
||||
}
|
||||
|
||||
// ── 写入清理后的标签 ──
|
||||
@@ -223,7 +227,9 @@ pub async fn phase_detect_person_in_tags(db: &Database) -> (DirtySet, usize) {
|
||||
.filter(|pair| !known_persons.contains(&pair[0].to_lowercase()))
|
||||
.collect();
|
||||
let words_json_new = serde_json::to_string(&all_words_new).unwrap_or_else(|_| "[]".to_string());
|
||||
db.update_album_tags(&album.id, &tags_json_new, &words_json_new).await;
|
||||
db.update_album_tags_with_tx(&mut tx, &album.id, &tags_json_new, &words_json_new).await;
|
||||
|
||||
tx.commit().await.expect("commit tx");
|
||||
|
||||
if has_person { dirty.add(&album.id); }
|
||||
}
|
||||
@@ -323,18 +329,23 @@ pub async fn phase_parse_dirty(db: &Database, dirty_set: &DirtySet) -> (usize, u
|
||||
jieba_person
|
||||
};
|
||||
|
||||
// 用事务包裹所有写入,避免逐条 autocommit 导致巨慢
|
||||
let mut pending_tx: Option<sqlx::Transaction<'_, sqlx::Sqlite>> = None;
|
||||
|
||||
if let Some(name) = &best_person {
|
||||
let (primary, aliases) = title_parser::split_person_name_with_aliases(name);
|
||||
let final_name = if primary.is_empty() { name.clone() } else { primary };
|
||||
db.update_album_person(&album.id, name, &final_name).await;
|
||||
let pid = db.insert_person(&final_name, None).await;
|
||||
db.insert_person_album(pid, &album.id).await;
|
||||
let mut tx = db.pool.begin().await.expect("begin tx");
|
||||
db.update_album_person_with_tx(&mut tx, &album.id, name, &final_name).await;
|
||||
let pid = db.insert_person_with_tx(&mut tx, &final_name, None).await;
|
||||
db.insert_person_album_with_tx(&mut tx, pid, &album.id).await;
|
||||
for (at, an) in &aliases {
|
||||
if !an.is_empty() && an != &final_name {
|
||||
db.insert_person_alias(pid, at, an).await;
|
||||
db.insert_person_alias_with_tx(&mut tx, pid, at, an).await;
|
||||
}
|
||||
}
|
||||
db.update_person_counts(pid).await;
|
||||
db.update_person_counts_with_tx(&mut tx, pid).await;
|
||||
pending_tx = Some(tx);
|
||||
person_updated += 1;
|
||||
}
|
||||
|
||||
@@ -354,8 +365,16 @@ pub async fn phase_parse_dirty(db: &Database, dirty_set: &DirtySet) -> (usize, u
|
||||
let tags_json = serde_json::to_string(&tag_names).unwrap_or_else(|_| "[]".to_string());
|
||||
let all_words: Vec<[String; 2]> = unique.iter().map(|(t, tp)| [t.clone(), tp.clone()]).collect();
|
||||
let words_json = serde_json::to_string(&all_words).unwrap_or_else(|_| "[]".to_string());
|
||||
db.update_album_tags(&album.id, &tags_json, &words_json).await;
|
||||
let mut tx = match pending_tx.take() {
|
||||
Some(t) => t,
|
||||
None => db.pool.begin().await.expect("begin tx"),
|
||||
};
|
||||
db.update_album_tags_with_tx(&mut tx, &album.id, &tags_json, &words_json).await;
|
||||
tx.commit().await.expect("commit tx");
|
||||
tag_updated += 1;
|
||||
} else if let Some(tx) = pending_tx.take() {
|
||||
// 只有 person 写入,没有标签写入
|
||||
tx.commit().await.expect("commit tx");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user