This commit is contained in:
lychang
2026-07-20 04:07:40 +08:00
parent 9093f08441
commit 00af6e8528
4 changed files with 354 additions and 5 deletions

View File

@@ -357,8 +357,14 @@ pub async fn phase_parse_dirty(db: &Database, dirty_set: &DirtySet) -> (usize, u
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 };
// 尝试用 include 列表扩展为更长的完整匹配(如 "杨晨晨" → "杨晨晨Yome")
let expanded = tag_dict::get_tag_dict()
.find_longest_included_match(name)
.filter(|longer| longer.len() > name.len()); // 仅当更长时替换
let effective_name = expanded.as_deref().unwrap_or(name.as_str());
let (primary, aliases) = title_parser::split_person_name_with_aliases(effective_name);
let final_name = if primary.is_empty() { effective_name.to_string() } else { primary };
// 跳过字符串 <= 2 的人名(太短不像人名)
if final_name.chars().count() <= 2 {
@@ -366,7 +372,7 @@ 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;
db.update_album_person_with_tx(&mut tx, &album.id, effective_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;

View File

@@ -275,6 +275,24 @@ impl TagDict {
|| self.included_person_names.contains(&name_lower)
}
/// 在 include 列表中查找以 name 开头的最长匹配。
///
/// 例如 include 中有 "杨晨晨Yome", "杨晨晨Sugar",
/// 传入 "杨晨晨" 会返回 "杨晨晨Yome"(取最长的那条)。
/// 传入 "Yome" 也返回 "杨晨晨Yome"(取包含该词的最长的那条)。
pub fn find_longest_included_match(&self, name: &str) -> Option<String> {
let name_lower = name.to_lowercase();
self.included_person_names.iter()
.filter(|included| {
let inc_lower = included.to_lowercase();
// include 以 name 开头 ? 或 name 以 include 开头 ?
inc_lower.starts_with(&name_lower) || name_lower.starts_with(&inc_lower)
|| inc_lower.contains(&name_lower) // include 包含 name(中文核心→全名)
})
.max_by_key(|s| s.len())
.cloned()
}
/// 获取强制包含人名集合
pub fn get_included_persons(&self) -> &HashSet<String> {
&self.included_person_names

View File

@@ -291,8 +291,11 @@ pub fn is_likely_person_name(name: &str) -> bool {
if name.is_empty() { return false; }
// 强制包含名单优先放行(已知模特名,跳过所有启发式检查)
// 同时支持通过更长匹配扩展 name(如 "杨晨晨" → "杨晨晨Yome")
let dict = tag_dict::get_tag_dict();
if dict.is_included_person(name) { return true; }
if dict.is_included_person(name) || dict.find_longest_included_match(name).is_some() {
return true;
}
// 字符数必须 >= 3(人名至少需要 2 个中文字或 3 个英文字母)
if name.chars().count() <= 2 { return false; }