Take the padded volume back out: it merged a dump's versions
208ca1d's volume of 3-5 digits after a digit (YME's "CHT PCK 2 9.26.001") also took versions for volumes: "K-ML 3.8.233", "3.8.239", "3.8.241" and Kaizen's "v2.0.1021" ... "v2.0.1057" became one release (505 names on the corpus). The random name's volumes with their own extensions stay. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
208ca1d535
commit
eddbe2863f
3 files changed
+11
-14
No files matched your search
+4
-6
@@ -895,8 +895,8 @@ pub fn release_identity(poster: &str, subject: &str, name: &str) -> Release {
|
||||
}
|
||||
}
|
||||
// A numbered volume as the extension, within the counter's total ("DN.VPL PCK.1508" of 2195): one upload.
|
||||
// Also zero-padded after a date ("CHT PCK 2 9.26.001").
|
||||
let volume = VOLUME_NUMBER.captures(stem.as_bytes()).or_else(|| PADDED_VOLUME.captures(stem.as_bytes()));
|
||||
// Not after a digit: "CHT PCK 2 9.26.001" looks just like a dump's versions ("K-ML 3.8.233").
|
||||
let volume = VOLUME_NUMBER.captures(stem.as_bytes());
|
||||
let base = match (volume, post_total.filter(|&n| n != 0)) {
|
||||
(Some(c), Some(total)) if number(&c[2]) <= total as f64 => String::from_utf8(c[1].to_vec()).unwrap(),
|
||||
_ => stem.clone(),
|
||||
@@ -928,8 +928,6 @@ static SCENE_RELEASE: LazyLock<Regex> = LazyLock::new(|| {
|
||||
});
|
||||
/// RANDOM_VOLUME (lib/release/identity.ts): a file of a multi-volume upload.
|
||||
static RANDOM_VOLUME: LazyLock<Regex> = LazyLock::new(|| re(r"(?i)\.(?:part[0-9]+\.rar|vol[0-9]+[+-][0-9]+\.par2|par2|r[0-9]{2,3}|7z\.[0-9]{3}|zip\.[0-9]{3}|[0-9]{3})$"));
|
||||
/// PADDED_VOLUME (lib/release/identity.ts): a volume number of 3–5 digits after a dot.
|
||||
static PADDED_VOLUME: LazyLock<Regex> = LazyLock::new(|| re(r"^(.*[A-Za-z].*?)\.([0-9]{3,5})$"));
|
||||
/// RANDOM_PART (lib/release/identity.ts): a random name's volume with any short extension, or none.
|
||||
static RANDOM_PART: LazyLock<Regex> = LazyLock::new(|| re(r"^(.+)\.part[0-9]{2,}(?:\.[A-Za-z0-9]{1,5})?$"));
|
||||
|
||||
@@ -1602,8 +1600,8 @@ mod image_set_tests {
|
||||
assert_eq!(rv("01", "69", "df2BkeRxIvHcWrsWwwz.part01.cer").key, rv("69", "69", "df2BkeRxIvHcWrsWwwz.part69.bdmv").key);
|
||||
assert_eq!(rv("01", "32", "jA0eSSUMat8tQtIKUyPMA.part01").key, rv("32", "32", "jA0eSSUMat8tQtIKUyPMA.part32").key);
|
||||
assert_ne!(rv("01", "2", "Some.Movie.Part01.mkv").key, rv("02", "2", "Some.Movie.Part02.mkv").key);
|
||||
let pck = |i: &str, n: &str| super::release_identity("YME", &format!(r#"(????) [{i}/1009] - "{n}" yEnc"#), n);
|
||||
assert_eq!(pck("0001", "CHT PCK 2 9.26.001").key, pck("0002", "CHT PCK 2 9.26.002").key);
|
||||
let dump = |i: &str, n: &str| super::release_identity("janusch", &format!(r#"(????) [{i}/15816] - "{n}""#), n);
|
||||
assert_ne!(dump("00005", "K-ML 3.8.233").key, dump("00006", "K-ML 3.8.239").key);
|
||||
let mdg = |post: &str, i: &str, n: &str| super::release_identity("p", &format!(r#"{post} - ({i}/90) "{n}" - 16,14 MB - yEnc"#), n);
|
||||
assert_eq!(mdg("MDG005b", "01", "IMG_2307.JPG").key, mdg("MDG005b", "02", "IMG_2308.jpg").key);
|
||||
assert_ne!(mdg("MDG005b", "01", "IMG_2307.JPG").key, mdg("MDG006a", "01", "IMG_4410.JPG").key);
|
||||
|
||||
Reference in new issue
Block a user