From 39f516b456f01814a2b933bb7b31d1ae236e4ad9 Mon Sep 17 00:00:00 2001 From: itismadness Date: Thu, 1 Feb 2024 16:12:09 +0000 Subject: [PATCH] Add detection for xld range rips --- src/Logchecker.php | 16 ++- tests/logs/xld/details/range-vbox.json | 11 +++ tests/logs/xld/html/range-vbox.log | 97 +++++++++++++++++++ .../{range-vbox.log.log => range-vbox.log} | 0 4 files changed, 120 insertions(+), 4 deletions(-) create mode 100644 tests/logs/xld/details/range-vbox.json create mode 100644 tests/logs/xld/html/range-vbox.log rename tests/logs/xld/originals/{range-vbox.log.log => range-vbox.log} (100%) diff --git a/src/Logchecker.php b/src/Logchecker.php index 60433ea..e9bb799 100644 --- a/src/Logchecker.php +++ b/src/Logchecker.php @@ -828,11 +828,19 @@ class Logchecker 1, $Count ); + // XLD Range + $Log = preg_replace( + '/\n(All Tracks\n(?: *))(Filename)/i', + "\n$1$2", + $Log, + 1, + $XLDRange, + ); // xld album gain $Log = preg_replace( - "/All Tracks\s*\n(\s*Album gain\s+:) (.*)?\n(\s*Peak\s+:) (.*)?/i", - "All Tracks\n$1 $2\n" . - "$3 $4", + "/All Tracks(\s*\n)((?:.*)\n)?(\s*Album gain\s+:) (.*)?\n(\s*Peak\s+:) (.*)?/i", + "All Tracks$1$2$3 $4\n" . + "$5 $6", $Log, 1, $Count @@ -980,7 +988,7 @@ class Logchecker 1, $Range2 ); - if ($Range1 || $Range2) { + if ($Range1 || $Range2 || $XLDRange) { $this->Range = 1; $this->account('Range rip detected', 30); } diff --git a/tests/logs/xld/details/range-vbox.json b/tests/logs/xld/details/range-vbox.json new file mode 100644 index 0000000..027d450 --- /dev/null +++ b/tests/logs/xld/details/range-vbox.json @@ -0,0 +1,11 @@ +{ + "ripper": "XLD", + "version": "20170729", + "language": "en", + "combined": false, + "score": 70, + "checksum": "checksum_ok", + "details": [ + "Range rip detected (-30 points)" + ] +} \ No newline at end of file diff --git a/tests/logs/xld/html/range-vbox.log b/tests/logs/xld/html/range-vbox.log new file mode 100644 index 0000000..5955d55 --- /dev/null +++ b/tests/logs/xld/html/range-vbox.log @@ -0,0 +1,97 @@ +X Lossless Decoder version 20170729 (150.3) + +XLD extraction logfile from 2017-08-01 14:56:16 -0300 + +KARA / ジャンピン + +Used Drive : VBOX CD-ROM (revision 1.0) (not found in database) +Media type : Pressed CD + +Ripper mode : XLD Secure Ripper +Disable audio cache : OK for the drive with a cache less than 1375KiB +Make use of C2 pointers : NO +Read offset correction : 6 +Max retry count : 20 +Gap status : Analyzed, Appended + +TOC of the extracted CD + Track | Start | Length | Start sector | End sector + --------------------------------------------------------- + 1 | 00:00:00 | 03:00:27 | 0 | 13526 + 2 | 03:00:27 | 03:32:48 | 13527 | 29474 + 3 | 06:33:00 | 02:59:05 | 29475 | 42904 + +AccurateRip Summary (DiscID: 00014f93-0004617c-1e023c03) + Track 01 : OK (v1+v2, confidence 11/11) + Track 02 : OK (v1+v2, confidence 9/9) + Track 03 : OK (v1+v2, confidence 9/9) + ->All tracks accurately ripped. + +All Tracks + Filename : /Users/dubious/xld rips/01. ジャンピン.flac + Album gain : -11.92 dB + Peak : 1.000000 + CRC32 hash (test run) : F55D3134 + CRC32 hash : F55D3134 + CRC32 hash (skip zero) : 2154552F + Statistics + Read error : 0 + Jitter error (maybe fixed) : 0 + Retry sector count : 0 + Damaged sector count : 0 + + Filename 01 + Pre-gap length : 00:02:00 + + Track gain : -11.95 dB + Peak : 1.000000 + CRC32 hash (test run) : 0248840B + CRC32 hash : 0248840B + CRC32 hash (skip zero) : 8DAB64A0 + AccurateRip v1 signature : AB11CF3F + AccurateRip v2 signature : 0021EFA8 + ->Accurately ripped (v1+v2, confidence 5+6/11) + Statistics + Read error : 0 + Jitter error (maybe fixed) : 0 + Retry sector count : 0 + Damaged sector count : 0 + + Filename 02 + + Track gain : -12.51 dB + Peak : 1.000000 + CRC32 hash (test run) : DB57CD66 + CRC32 hash : DB57CD66 + CRC32 hash (skip zero) : 15D163C0 + AccurateRip v1 signature : D627D9F5 + AccurateRip v2 signature : 689E1528 + ->Accurately ripped (v1+v2, confidence 3+6/9) + Statistics + Read error : 0 + Jitter error (maybe fixed) : 0 + Retry sector count : 0 + Damaged sector count : 0 + + Filename 03 + + Track gain : -9.38 dB + Peak : 1.000000 + CRC32 hash (test run) : 07AB8339 + CRC32 hash : 07AB8339 + CRC32 hash (skip zero) : 73FCDD4A + AccurateRip v1 signature : A61A5EA8 + AccurateRip v2 signature : 7081171C + ->Accurately ripped (v1+v2, confidence 4+5/9) + Statistics + Read error : 0 + Jitter error (maybe fixed) : 0 + Retry sector count : 0 + Damaged sector count : 0 + +No errors occurred + +End of status report +-----BEGIN XLD SIGNATURE----- +9NvFdxRPNWm8G8dJyzLLbEkLcpVqzExZwC1NJ6OKyjUQNpvIZZ24MD3aoglPsjyU28tRYNsxO11FjHIvl3E1vavNwxiVZ1gT_RhqPDq +-----END XLD SIGNATURE----- \ No newline at end of file diff --git a/tests/logs/xld/originals/range-vbox.log.log b/tests/logs/xld/originals/range-vbox.log similarity index 100% rename from tests/logs/xld/originals/range-vbox.log.log rename to tests/logs/xld/originals/range-vbox.log