update
This commit is contained in:
@@ -199,41 +199,8 @@ pub async fn phase_detect_person_in_tags(db: &Database) -> (DirtySet, usize) {
|
||||
}
|
||||
|
||||
if changed || !has_person {
|
||||
// ── 写入 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 };
|
||||
|
||||
// 跳过字符串 <= 2 的人名(太短不像人名)
|
||||
if final_name.chars().count() <= 2 {
|
||||
// 仍需将标签从 clean_tags 中排除(人名相关标签已被移除)
|
||||
let tags_json_new = serde_json::to_string(&clean_tags).unwrap_or_else(|_| "[]".to_string());
|
||||
let all_words_json = album.all_words.as_deref().unwrap_or("[]");
|
||||
let all_words_new: Vec<[String; 2]> = serde_json::from_str::<Vec<[String; 2]>>(all_words_json)
|
||||
.unwrap_or_default()
|
||||
.into_iter()
|
||||
.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;
|
||||
continue;
|
||||
}
|
||||
|
||||
// 用事务包裹所有写入,避免逐条 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_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_with_tx(&mut tx, pid, at, an).await;
|
||||
}
|
||||
}
|
||||
db.update_person_counts_with_tx(&mut tx, pid).await;
|
||||
}
|
||||
|
||||
// ── 写入清理后的标签 ──
|
||||
// ── 只清理标签中的人名,不写入 person 字段 ──
|
||||
// 人名提取统一由 Phase 1 从标题解析完成,保证一个相册只有一个 pid
|
||||
let tags_json_new = serde_json::to_string(&clean_tags).unwrap_or_else(|_| "[]".to_string());
|
||||
let all_words_json = album.all_words.as_deref().unwrap_or("[]");
|
||||
let all_words_new: Vec<[String; 2]> = serde_json::from_str::<Vec<[String; 2]>>(all_words_json)
|
||||
@@ -242,11 +209,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_with_tx(&mut tx, &album.id, &tags_json_new, &words_json_new).await;
|
||||
db.update_album_tags(&album.id, &tags_json_new, &words_json_new).await;
|
||||
|
||||
tx.commit().await.expect("commit tx");
|
||||
|
||||
if has_person { dirty.add(&album.id); }
|
||||
dirty.add(&album.id);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -410,7 +375,11 @@ pub async fn phase_parse_dirty(db: &Database, dirty_set: &DirtySet) -> (usize, u
|
||||
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;
|
||||
// 先清旧关联:删除该相册的所有旧 person_album 记录
|
||||
db.delete_album_person_albums_with_tx(&mut tx, &album.id).await;
|
||||
db.insert_person_album_with_tx(&mut tx, pid, &album.id).await;
|
||||
// 先清旧别名:删除该人物的所有旧别名,再插入新的
|
||||
db.delete_person_aliases_with_tx(&mut tx, pid).await;
|
||||
for (at, an) in &aliases {
|
||||
if !an.is_empty() && an != &final_name {
|
||||
db.insert_person_alias_with_tx(&mut tx, pid, at, an).await;
|
||||
|
||||
Reference in New Issue
Block a user