Names: stray quotes, single quotes, hosts, bracketed names; dates, repeats
Test and deploy / test (push) Successful in 50s
Test and deploy / edge (push) Successful in 2m8s
Test and deploy / deploy (push) Successful in 2m6s

From the first corpus sweep (183 ranges):
- A stray quote took the last quote pair ('"x.mp3" "Album_BY_WaRLoRD',
  '"x.nfo" " yEnc', '"x.nzb" yEnc"'): the last quoted part with an
  extension is the name. Each file was a release of its own.
- A single-quoted name at the end ("… [001/106] 'You, Me And Dupree.nfo'"),
  not the host before it (www.x2l.nl).
- Text ending in a host ("… www.libranews.nl") is no file name; a name in
  brackets comes first ("[01/77][LIBRATEAM_M2219009.par2]",
  "-^-[Mnozil Brass - Seven.nzb]-^-").
- A leading date is no item number ("09-30-2008_BAK_JRS.r00": a daily
  show's 32,621 files were one release under the poster's tag).
- The file name repeated elsewhere in the subject goes too
  ("(NELET11.par2) [01/58] - "NELET11.par2"").

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Daan MeijerandClaude Opus 5.5 committed 2026-10-12 09:58:04 +02:00
1 parent 885e4e6541
commit 1a5035d988
6 files changed
+115 -11

No files matched your search

+49 -2
View File
@@ -282,6 +282,20 @@ pub fn name_beside_quotes(quoted: &str, before_counter: &str) -> Option<String>
if has_extension(quoted) {
return None;
}
// A stray quote took the last pair: the last quoted part that is a file name.
let mut named = None;
let mut rest = before_counter;
while let Some(open) = rest.find('"') {
let Some(close) = rest[open + 1..].find('"') else { break };
let part = &rest[open + 1..open + 1 + close];
if has_extension(part) {
named = Some(part);
}
rest = &rest[open + 1 + close + 1..];
}
if let Some(part) = named {
return Some(part.to_string());
}
// .replace(/"[^"]*"/g, ' ')
let mut text = String::with_capacity(before_counter.len());
let mut rest = before_counter;
@@ -344,6 +358,15 @@ pub fn unquoted_name(before_counter: &str) -> Option<String> {
let word = &before[before.rfind(' ').map_or(0, |i| i + 1)..];
return has_extension(word).then(|| word.to_string());
}
// A single-quoted name at the end: /'([^']*[^.\s']\.[A-Za-z0-9]{2,4})'$/
if let Some(inner) = text.strip_suffix('\'') {
if let Some(open) = inner.rfind('\'') {
let part = &inner[open + 1..];
if has_extension(part) {
return Some(part.to_string());
}
}
}
if has_extension(text) {
let bracket = text.rfind("] ").map_or(0, |i| i + 2);
// A track or part number (/ - \d{1,3} - /): the name starts there; else after the last " - ".
@@ -361,9 +384,30 @@ pub fn unquoted_name(before_counter: &str) -> Option<String> {
return Some(last.to_string());
}
}
return (!name.is_empty() && has_extension(name)).then(|| name.to_string());
// Ending in a host is no file name: the one in brackets or a word follows.
if !is_host(name) {
return (!name.is_empty() && has_extension(name)).then(|| name.to_string());
}
}
text.split(' ').find(|w| has_extension(w)).map(str::to_string)
// A name in brackets: the last /\[([^[\]]*[^.\s[\]]\.[A-Za-z0-9]{2,4})\]/.
let mut bracketed = None;
for (open, _) in text.match_indices('[') {
let inside = &text[open + 1..];
let Some(close) = inside.find(']') else { break };
let part = &inside[..close];
if !part.contains('[') && has_extension(part) {
bracketed = Some(part);
}
}
if let Some(part) = bracketed {
return Some(part.to_string());
}
text.split(' ').find(|w| has_extension(w) && !is_host(w)).map(str::to_string)
}
/// /www\./i: a host ("www.libranews.nl"), whose ".nl" is no extension.
fn is_host(s: &str) -> bool {
s.to_ascii_lowercase().contains("www.")
}
/// One line of an XOVER reply: number, subject, from, date, message-id, bytes, xref (scanOverviewText).
@@ -935,6 +979,9 @@ mod unquoted_tests {
("[03/21 Geroellheimer - S03E16.part01.rar\" yEnc ", Some("Geroellheimer - S03E16.part01.rar")),
("<Group> FP -> {EXL01~P~004} -> Alexia (3) -> VF -> [0001 of 0076] -> Exclusive-tgirls_000000-lg.jpg ", Some("Exclusive-tgirls_000000-lg.jpg")),
("<abm> <Duke> here's a little thanksgiving present: AB: part2 0573-1002 043.jpg ", Some("043.jpg")),
("xlady post You, Me And Dupree www.x2l.nl [001/106] 'You, Me And Dupree.nfo'", Some("You, Me And Dupree.nfo")),
("[01/77][LIBRATEAM_M2219009.par2] Onbeperkt downloaden met een snelheid van 1,22 MB p.s. en dat voor maar 7,95 p.m. www.libranews.nl", Some("LIBRATEAM_M2219009.par2")),
("patensas post -^-[Mnozil Brass - Seven.nzb]-^-www.usenet2day.cc -^-[000/107]-^-www.libranews.nl-^- yEnc", Some("Mnozil Brass - Seven.nzb")),
("[7w] - 9BbEV2MrTi59GBTEFlVrssBrXNwXf2SK9cQEeDjg yEnc ", None),
("Re: Will somebody answer the question? ", None),
];
+27 -5
View File
@@ -641,14 +641,16 @@ pub fn release_identity(poster: &str, subject: &str, name: &str) -> Release {
// The subject here has its spaces collapsed; the name may not.
// Other quoted text stays: it names the release (">>> CREATIVE COMMONS NZB <<< "0190 alarm 5.0 " - File 1 of 9: …").
let quoted = format!("\"{name}\"");
let named = if subject.contains(&quoted) {
subject.replacen(&quoted, " ", 1).replace('"', " ")
let without = if subject.contains(&quoted) {
subject.replacen(&quoted, " ", 1)
} else {
let collapsed = js::collapse_spaces(name);
let collapsed = js::trim(&collapsed);
let without = if subject.contains(name) { subject.replacen(name, " ", 1) } else { subject.replacen(collapsed, " ", 1) };
without.replace('"', " ")
if subject.contains(name) { subject.replacen(name, " ", 1) } else { subject.replacen(collapsed, " ", 1) }
};
// The name repeated elsewhere ("(NELET11.par2) [01/58] - "NELET11.par2"").
let without = if name.encode_utf16().count() >= 5 { without.replace(name, " ") } else { without };
let named = without.replace('"', " ");
let remainder = subject_remainder(&named);
// Counted without the file name: "shyla-shy-09-0195.jpg hardcore …" is no "9 of 195".
let total = counter_total(&named);
@@ -672,7 +674,16 @@ pub fn release_identity(poster: &str, subject: &str, name: &str) -> Release {
let letters = b.iter().take_while(|c| c.is_ascii_uppercase()).count();
let code_digits = b[letters..].iter().take_while(|c| c.is_ascii_digit()).count();
let code = (1..=5).contains(&letters) && (2..=6).contains(&code_digits) && matches!(b.get(letters + code_digits), Some(b'-' | b'_' | b' '));
index_at(0) || (code && index_at(letters + code_digits + 1))
// Not a date: /^\d{1,2}[-._]\d{1,2}[-._](?:19|20)\d{2}(?!\d)/ ("09-30-2008_BAK_JRS").
let date = {
let run = |at: usize| b.get(at..).map_or(0, |s| s.iter().take_while(|c| c.is_ascii_digit()).count());
let sep = |at: usize| matches!(b.get(at), Some(b'-' | b'.' | b'_'));
let d1 = run(0);
let d2 = if (1..=2).contains(&d1) && sep(d1) { run(d1 + 1) } else { 0 };
let y = d1 + 1 + d2 + 1;
(1..=2).contains(&d2) && sep(d1 + 1 + d2) && run(y) == 4 && matches!(&b[y..y + 2], b"19" | b"20")
};
(index_at(0) || (code && index_at(letters + code_digits + 1))) && !date
};
// A hashed stem under text without a counter is the upload, the text a tag ("Seit 1753 Tagen - usenet4ever.info - …").
let hashed = file_total.is_none() && test(&HASHED, &stem);
@@ -1272,6 +1283,17 @@ mod image_set_tests {
assert_ne!(vlad("185", 77, "P8250001.JPG").key, vlad("234", 77, "P5300085.JPG").key);
}
#[test]
fn dates_lead_no_numbered_items_and_repeated_names_go() {
let show = |n: &str| release_identity("#sterntuary <aa@aa.com>", &format!(r#"#sterntuary - Jeff Rense Radio Program - "{n}" yEnc"#), n);
assert_eq!(show("09-30-2008_BAK_JRS.nfo").key, show("09-30-2008_BAK_JRS.r00").key);
assert_ne!(show("09-30-2008_BAK_JRS.r00").key, show("10-01-2008_BAK_JRS.r00").key);
let nelet = |n: &str, i: u32| release_identity("p", &format!(r#"({n}) [{i:02}/58] - "{n}" yEnc"#), n);
assert_eq!(nelet("NELET11.par2", 1).key, nelet("NELET11.part01.rar", 2).key);
let wl = |n: &str| release_identity("p", &format!(r#"(01/26) "{n}" "Silicon Dream - Time Machine_BY_WaRLoRD```` yEnc"#), n);
assert_eq!(wl("01 Time Machine.mp3").key, wl("02 Jimmy Dean Loved Marilyn.mp3").key);
}
#[test]
fn hashed_stems_volume_numbers_and_scene_tracks() {
let u4e = |n: &str| release_identity("p", &format!(r#"Seit 1753 Tagen - usenet4ever.info - "{n}" yEnc"#), n);