From e5029b9f982f69b766047634d7234c207de30a36 Mon Sep 17 00:00:00 2001 From: itismadness Date: Thu, 22 Apr 2021 03:50:21 +0000 Subject: [PATCH] add normalization deduction --- src/Logchecker.php | 11 ++ tests/logs/eac/details/en_normalization.json | 11 ++ tests/logs/eac/html/en_normalization.log | 208 ++++++++++++++++++++++++++ tests/logs/eac/originals/en_normalization.log | Bin 0 -> 15426 bytes 4 files changed, 230 insertions(+) create mode 100644 tests/logs/eac/details/en_normalization.json create mode 100644 tests/logs/eac/html/en_normalization.log create mode 100644 tests/logs/eac/originals/en_normalization.log diff --git a/src/Logchecker.php b/src/Logchecker.php index 60bc933..cd01ad4 100644 --- a/src/Logchecker.php +++ b/src/Logchecker.php @@ -728,6 +728,10 @@ class Logchecker if (!$Count && $EAC) { $this->account('Could not verify null samples'); } + $Log = preg_replace_callback('/Normalize to( +): ([0-9% ]+)/i', array( + $this, + 'normalizeEac' + ), $Log, 1); $Log = preg_replace( '/Used interface( +): ([^\n]+)/i', 'Used interface$1: $2', @@ -1768,6 +1772,13 @@ class Logchecker '' . $Matches[2] . ''; } + private function normalizeEac($Matches) + { + $this->account('Normalization should be not be active', 100); + return 'Normalize to'. $Matches[1] . ': ' . + '' . $Matches[2] . ''; + } + private function gapHandling($Matches) { if (strpos($Matches[2], 'Not detected') !== false) { diff --git a/tests/logs/eac/details/en_normalization.json b/tests/logs/eac/details/en_normalization.json new file mode 100644 index 0000000..d92eabf --- /dev/null +++ b/tests/logs/eac/details/en_normalization.json @@ -0,0 +1,11 @@ +{ + "ripper": "EAC", + "version": "1.6", + "language": "en", + "combined": false, + "score": 0, + "checksum": "checksum_invalid", + "details": [ + "Normalization should be not be active (-100 points)" + ] +} diff --git a/tests/logs/eac/html/en_normalization.log b/tests/logs/eac/html/en_normalization.log new file mode 100644 index 0000000..550be42 --- /dev/null +++ b/tests/logs/eac/html/en_normalization.log @@ -0,0 +1,208 @@ +Exact Audio Copy V1.6 from 23. October 2020 + +EAC extraction logfile from 2. April 2021, 18:13 + +Various / Cr2 Presents Live & Direct Space Ibiza - Around The World + +Used Drive : hp BD ROM BC-5501H Adapter: 1 ID: 1 + +Read mode : Secure +Utilize accurate stream : Yes +Defeat audio cache : Yes +Make use of C2 pointers : No + +Read offset correction : 48 +Overread into Lead-In and Lead-Out : No +Fill up missing offset samples with silence : Yes +Delete leading and trailing silent blocks : No +Null samples used in CRC calculations : Yes +Normalize to : 98 % +Used interface : Native Win32 interface for Win NT & 2000 +Gap handling : Appended to previous track + +Used output format : User Defined Encoder +Selected bitrate : 1024 kBit/s +Quality : High +Add ID3 tag : No +Command line compressor : C:\Program Files (x86)\Exact Audio Copy\Flac\flac.exe +Additional command line options : -8 -e -p -V -T "ARTIST=%artist%" -T "TITLE=%title%" -T "ALBUM=%albumtitle%" -T "DATE=%year%" +-T +"TRACKNUMBER=%tracknr%" -T "GENRE=%genre%" -T "PERFORMER=%albuminterpret%" -T "COMPOSER=%composer%" %haslyrics%--tag-from-file=LYRICS="%lyricsfile%"%haslyrics% -T "ALBUMARTIST=%albumartist%" -T "DISCNUMBER=%cdnumber%" -T "TOTALDISCS=%totalcds%" -T "TOTALTRACKS=%numtracks%" -T "COMMENT=%comment%" %source% -o %dest% + + +TOC of the extracted CD + + Track | Start | Length | Start sector | End sector + --------------------------------------------------------- + 1 | 0:00.00 | 7:48.50 | 0 | 35149 + 2 | 7:48.50 | 5:24.43 | 35150 | 59492 + 3 | 13:13.18 | 5:32.46 | 59493 | 84438 + 4 | 18:45.64 | 7:16.41 | 84439 | 117179 + 5 | 26:02.30 | 4:01.67 | 117180 | 135321 + 6 | 30:04.22 | 5:17.37 | 135322 | 159133 + 7 | 35:21.59 | 5:02.29 | 159134 | 181812 + 8 | 40:24.13 | 3:44.67 | 181813 | 198679 + 9 | 44:09.05 | 5:53.30 | 198680 | 225184 + 10 | 50:02.35 | 6:02.63 | 225185 | 252397 + 11 | 56:05.23 | 5:17.37 | 252398 | 276209 + 12 | 61:22.60 | 8:25.04 | 276210 | 314088 + + +Track 1 + + Filename C:\Users\Matej\Desktop\Various ‎– Cr2 Presents Live & Direct Space Ibiza - Around The World (2009) [FLAC] {CDC2LD013}\CD 1\01 - Neuroxyde Vs. Doomwork - Jazzy Stuff.wav + + Pre-gap length 0:00:02.00 + + Peak level 98.8 % + Extraction speed 2.5 X + Track quality 100.0 % + Test CRC 917CD349 + Copy CRC 917CD349 + Accurately ripped (confidence 1) [BCC56ACC] (AR v1) + Copy OK + +Track 2 + + Filename C:\Users\Matej\Desktop\Various ‎– Cr2 Presents Live & Direct Space Ibiza - Around The World (2009) [FLAC] {CDC2LD013}\CD 1\02 - MYNC & Harry Choo Choo Romero & Jose Nunez - Boogers (Uner & Coyu Abreme La Puerta Mix).wav + + Peak level 98.8 % + Extraction speed 2.8 X + Track quality 100.0 % + Test CRC 6DF27310 + Copy CRC 6DF27310 + Accurately ripped (confidence 1) [3B6E59FF] (AR v1) + Copy OK + +Track 3 + + Filename C:\Users\Matej\Desktop\Various ‎– Cr2 Presents Live & Direct Space Ibiza - Around The World (2009) [FLAC] {CDC2LD013}\CD 1\03 - The Junkies - Ritmo (Loko Mix).wav + + Peak level 100.0 % + Extraction speed 2.7 X + Track quality 99.9 % + Test CRC AF156D08 + Copy CRC AF156D08 + Accurately ripped (confidence 1) [617C38F8] (AR v1) + Copy OK + +Track 4 + + Filename C:\Users\Matej\Desktop\Various ‎– Cr2 Presents Live & Direct Space Ibiza - Around The World (2009) [FLAC] {CDC2LD013}\CD 1\04 - Baeka - Right At It (Michel Cleis Remix).wav + + Peak level 98.8 % + Extraction speed 3.1 X + Track quality 99.9 % + Test CRC 4DBD27C3 + Copy CRC 4DBD27C3 + Accurately ripped (confidence 1) [60CE1856] (AR v1) + Copy OK + +Track 5 + + Filename C:\Users\Matej\Desktop\Various ‎– Cr2 Presents Live & Direct Space Ibiza - Around The World (2009) [FLAC] {CDC2LD013}\CD 1\05 - Stefano Azati - Horns (Original Mix).wav + + Peak level 98.8 % + Extraction speed 3.5 X + Track quality 100.0 % + Test CRC 21CF34DD + Copy CRC 21CF34DD + Accurately ripped (confidence 1) [9FDB43C8] (AR v1) + Copy OK + +Track 6 + + Filename C:\Users\Matej\Desktop\Various ‎– Cr2 Presents Live & Direct Space Ibiza - Around The World (2009) [FLAC] {CDC2LD013}\CD 1\06 - Wolfgang Gartner - Latin Fever.wav + + Peak level 98.8 % + Extraction speed 3.8 X + Track quality 100.0 % + Test CRC 4FB566CD + Copy CRC 4FB566CD + Accurately ripped (confidence 1) [32024FA3] (AR v1) + Copy OK + +Track 7 + + Filename C:\Users\Matej\Desktop\Various ‎– Cr2 Presents Live & Direct Space Ibiza - Around The World (2009) [FLAC] {CDC2LD013}\CD 1\07 - WWW (5) - Relaxx (Uner & Coyu Remix).wav + + Peak level 98.8 % + Extraction speed 3.9 X + Track quality 100.0 % + Test CRC C272162F + Copy CRC C272162F + Accurately ripped (confidence 1) [B6811E79] (AR v1) + Copy OK + +Track 8 + + Filename C:\Users\Matej\Desktop\Various ‎– Cr2 Presents Live & Direct Space Ibiza - Around The World (2009) [FLAC] {CDC2LD013}\CD 1\08 - Anil Chawla - 209 (Original Mix).wav + + Peak level 98.8 % + Extraction speed 4.0 X + Track quality 100.0 % + Test CRC 3E987E57 + Copy CRC 3E987E57 + Accurately ripped (confidence 1) [A44B17F6] (AR v1) + Copy OK + +Track 9 + + Filename C:\Users\Matej\Desktop\Various ‎– Cr2 Presents Live & Direct Space Ibiza - Around The World (2009) [FLAC] {CDC2LD013}\CD 1\09 - Chuckie & LMFAO - Let The Bass Kick In Miami Bitch.wav + + Peak level 98.8 % + Extraction speed 4.3 X + Track quality 100.0 % + Test CRC 6E5E9229 + Copy CRC 6E5E9229 + Accurately ripped (confidence 1) [3D3EFFB4] (AR v1) + Copy OK + +Track 10 + + Filename C:\Users\Matej\Desktop\Various ‎– Cr2 Presents Live & Direct Space Ibiza - Around The World (2009) [FLAC] {CDC2LD013}\CD 1\10 - Juan Kidd Vs. Prok & Fitch - Mantra.wav + + Peak level 98.8 % + Extraction speed 4.0 X + Track quality 99.9 % + Test CRC 69CAC0F2 + Copy CRC 69CAC0F2 + Accurately ripped (confidence 1) [C635F32E] (AR v1) + Copy OK + +Track 11 + + Filename C:\Users\Matej\Desktop\Various ‎– Cr2 Presents Live & Direct Space Ibiza - Around The World (2009) [FLAC] {CDC2LD013}\CD 1\11 - Nick & Danny Chatelain - Rumba (Camilo Franco Que Rumba Remix).wav + + Peak level 100.0 % + Extraction speed 4.6 X + Track quality 100.0 % + Test CRC 7A356FD0 + Copy CRC 7A356FD0 + Accurately ripped (confidence 1) [A145E589] (AR v1) + Copy OK + +Track 12 + + Filename C:\Users\Matej\Desktop\Various ‎– Cr2 Presents Live & Direct Space Ibiza - Around The World (2009) [FLAC] {CDC2LD013}\CD 1\12 - Elio Riso - 24 Horas Of Happiness.wav + + Peak level 100.0 % + Extraction speed 5.0 X + Track quality 100.0 % + Test CRC D1DA512D + Copy CRC D1DA512D + Accurately ripped (confidence 1) [34BCA92A] (AR v1) + Copy OK + + +All tracks accurately ripped + +No errors occurred + +End of status report + +---- CUETools DB Plugin V2.1.6 + +[CTDB TOCID: lnivlQfRVKD6aXMqt3tIoEq4g6A-] disk not present in database +Submit result: lnivlQfRVKD6aXMqt3tIoEq4g6A- has been uploaded +==== Log checksum 48A84BB714608F6DCB2D4954260BB8331D8F255BDCBCF03AEDF85E3DCA20DAA0 ==== \ No newline at end of file diff --git a/tests/logs/eac/originals/en_normalization.log b/tests/logs/eac/originals/en_normalization.log new file mode 100644 index 0000000000000000000000000000000000000000..c11a1c30e73d4fa1c3b753e5b2368cabf2476b51 GIT binary patch literal 15426 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 Ko{U