Переглянути джерело

fix bug where some combined logs would be checksum_missing instead of checksum_invalid

tags/0.9.2
itismadness 4 роки тому
джерело
коміт
525b5fc17d
4 змінених файлів з 464 додано та 2 видалено
  1. +6
    -2
      src/Logchecker.php
  2. +12
    -0
      tests/logs/eac/details/combined_mp3_1.json
  3. +223
    -0
      tests/logs/eac/html/combined_mp3_1.log
  4. +223
    -0
      tests/logs/eac/originals/combined_mp3_1.log

+ 6
- 2
src/Logchecker.php Переглянути файл

@@ -536,14 +536,18 @@ class Logchecker
}

$Class = $this->checksumStatus === Check\Checksum::CHECKSUM_OK ? 'good' : 'bad';
$Log = preg_replace('/(\=+\s+Log checksum.*)/i', "<span class='{$Class}'>$1</span>", $Log, 1, $Count);
$Log = preg_replace('/(\=+\s+Log checksum.*)/i', "<span class='{$Class}'>$1</span>", $Log, 1, $eacCount);
$Log = preg_replace(
'/([\-]+BEGIN XLD SIGNATURE[\S\n\-]+END XLD SIGNATURE[\-]+)/i',
"<span class='{$Class}'>$1</span>",
$Log,
1,
$Count
$xldCount
);
// EAC will at least output "no checksum" for some malformed logs with checksums
if (($eacCount > 0 || $xldCount > 0) && $this->checksumStatus === Check\Checksum::CHECKSUM_MISSING) {
$this->checksumStatus = Check\Checksum::CHECKSUM_INVALID;
}

$Log = preg_replace_callback("/Used drive( *): (.+)/i", array(
$this,


+ 12
- 0
tests/logs/eac/details/combined_mp3_1.json Переглянути файл

@@ -0,0 +1,12 @@
{
"ripper": "EAC",
"version": "1.5",
"language": "en",
"combined": true,
"score": 99,
"checksum": "checksum_invalid",
"details": [
"Combined Log (2)",
"ID3 tags should not be added to FLAC files - they are mainly for MP3 files. FLACs should have vorbis comments for tags instead. (-1 point)"
]
}

+ 223
- 0
tests/logs/eac/html/combined_mp3_1.log Переглянути файл

@@ -0,0 +1,223 @@
Exact Audio Copy <span class="log1">V1.5</span> from <span class="log1">20. February 2020</span>

<span class='good'>EAC extraction logfile from <span class='log5'>17. April 2020, 19:35</span></span>

<span class="log4">John Coltrane / A Love Supreme</span>

<span class="log5">Used Drive </span>: <span class="good">HL-DT-STDVDRAM GH24NSB0 Adapter: 1 ID: 0</span>

<span class="log5">Read mode </span>: <span class="good">Secure</span>
<span class="log5">Utilize accurate stream </span>: <span class="good">Yes</span>
<span class="log5">Defeat audio cache </span>: <span class="good">Yes</span>
<span class="log5">Make use of C2 pointers </span>: <span class="good">No</span>

<span class="log5">Read offset correction </span>: <span class="good">6</span>
<span class="log5">Overread into Lead-In and Lead-Out </span>: <span class="log4">No</span>
<span class="log5">Fill up missing offset samples with silence </span>: <span class="good">Yes</span>
<span class="log5">Delete leading and trailing silent blocks </span>: <span class="good">No</span>
<span class="log5">Null samples used in CRC calculations </span>: <span class="good">Yes</span>
<span class="log5">Used interface </span>: <span class="log4">Native Win32 interface for Win NT & 2000</span>
<span class="log5">Gap handling </span>: <span class="good">Appended to previous track</span>

<span class="log5">Used output format </span>: <span class="log4">User Defined Encoder</span>
<span class="log5">Selected bitrate </span>: <span class="log4">768 kBit/s</span>
<span class="log5">Quality </span>: <span class="log4">High</span>
<span class="log5">Add ID3 tag </span>: <span class="good">No</span>
<span class="log5">Command line compressor </span>: <span class="log4">C:\Program Files (x86)\Exact Audio Copy\FLAC\FLAC.EXE</span>
<span class="log5">Additional command line options </span>: <span class="log4">-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%</span>


<span class="log4 log5">TOC of the extracted CD</span>

<strong> Track | Start | Length | Start sector | End sector </strong>
<strong>---------------------------------------------------------</strong>
<span class="log4">1</span> <strong>|</strong> <span class="log1">0:00.00</span> <strong>|</strong> <span class="log1">7:42.65</span> <strong>|</strong> <span class="log1">0</span> <strong>|</strong> <span class="log1">34714</span>
<span class="log4">2</span> <strong>|</strong> <span class="log1">7:42.65</span> <strong>|</strong> <span class="log1">7:19.34</span> <strong>|</strong> <span class="log1">34715</span> <strong>|</strong> <span class="log1">67673</span>
<span class="log4">3</span> <strong>|</strong> <span class="log1">15:02.24</span> <strong>|</strong> <span class="log1">10:42.38</span> <strong>|</strong> <span class="log1">67674</span> <strong>|</strong> <span class="log1">115861</span>
<span class="log4">4</span> <strong>|</strong> <span class="log1">25:44.62</span> <strong>|</strong> <span class="log1">7:02.68</span> <strong>|</strong> <span class="log1">115862</span> <strong>|</strong> <span class="log1">147579</span>


<span class="log5">Track</span> <span class="log4 log1">1</span>

<span class="log4">Filename <span class="log3">E:\Test Rip\01 Acknowledgement.wav</span></span>

<span class="log4">Pre-gap length <span class="log3">0:00:02.00</span></span>

<span class="log4">Peak level <span class="log3">97.6 %</span></span>
<span class="log4">Extraction speed <span class="log3">5.3 X</span></span>
<span class="log4">Track quality <span class="log3">100.0 %</span></span>
<span class="log4">Test CRC <span class="good">322247B3</span></span>
<span class="log4">Copy CRC <span class="good">322247B3</span></span>
<span class="good">Accurately ripped (confidence 200) [FB072CAB]</span> (AR v2)
<span class="good">Copy OK</span>

<span class="log5">Track</span> <span class="log4 log1">2</span>

<span class="log4">Filename <span class="log3">E:\Test Rip\02 Resolution.wav</span></span>

<span class="log4">Peak level <span class="log3">97.6 %</span></span>
<span class="log4">Extraction speed <span class="log3">6.1 X</span></span>
<span class="log4">Track quality <span class="log3">100.0 %</span></span>
<span class="log4">Test CRC <span class="good">4732C420</span></span>
<span class="log4">Copy CRC <span class="good">4732C420</span></span>
<span class="good">Accurately ripped (confidence 200) [F8254929]</span> (AR v2)
<span class="good">Copy OK</span>

<span class="log5">Track</span> <span class="log4 log1">3</span>

<span class="log4">Filename <span class="log3">E:\Test Rip\03 Pursuance.wav</span></span>

<span class="log4">Pre-gap length <span class="log3">0:00:01.46</span></span>

<span class="log4">Peak level <span class="log3">97.6 %</span></span>
<span class="log4">Extraction speed <span class="log3">7.1 X</span></span>
<span class="log4">Track quality <span class="log3">100.0 %</span></span>
<span class="log4">Test CRC <span class="good">71958F92</span></span>
<span class="log4">Copy CRC <span class="good">71958F92</span></span>
<span class="good">Accurately ripped (confidence 200) [4FC2DCC6]</span> (AR v2)
<span class="good">Copy OK</span>

<span class="log5">Track</span> <span class="log4 log1">4</span>

<span class="log4">Filename <span class="log3">E:\Test Rip\04 Psalm.wav</span></span>

<span class="log4">Peak level <span class="log3">95.7 %</span></span>
<span class="log4">Extraction speed <span class="log3">7.6 X</span></span>
<span class="log4">Track quality <span class="log3">100.0 %</span></span>
<span class="log4">Test CRC <span class="good">0C8D6B7E</span></span>
<span class="log4">Copy CRC <span class="good">0C8D6B7E</span></span>
<span class="good">Accurately ripped (confidence 200) [36EF184C]</span> (AR v2)
<span class="good">Copy OK</span>


<span class="good">All tracks accurately ripped</span>

<span class="good">No errors occurred</span>

<span class="good">End of status report</span>

---- CUETools DB Plugin V2.1.6

[CTDB TOCID: 3Ymtej0heE3Qv3LM2ZTKNGwiRV8-] found
Submit result: already submitted
Track | CTDB Status
1 | (961/1326) Accurately ripped
2 | (966/1326) Accurately ripped
3 | (961/1326) Accurately ripped
4 | (963/1326) Accurately ripped

<span class='bad'>==== Log checksum 5168768818AD8271F9E33889E0FF7123188A08EB490B3FD922F4335E1C74BEDC ====</span>

<strong>------------------------------------------------------------</strong>

Exact Audio Copy <span class="log1">V1.5</span> from <span class="log1">20. February 2020</span>

<span class='good'>EAC extraction logfile from <span class='log5'>17. April 2020, 19:35</span></span>

<span class="log4">John Coltrane / A Love Supreme</span>

<span class="log5">Used Drive </span>: <span class="good">HL-DT-STDVDRAM GH24NSB0 Adapter: 1 ID: 0</span>

<span class="log5">Read mode </span>: <span class="good">Secure</span>
<span class="log5">Utilize accurate stream </span>: <span class="good">Yes</span>
<span class="log5">Defeat audio cache </span>: <span class="good">Yes</span>
<span class="log5">Make use of C2 pointers </span>: <span class="good">No</span>

<span class="log5">Read offset correction </span>: <span class="good">6</span>
<span class="log5">Overread into Lead-In and Lead-Out </span>: <span class="log4">No</span>
<span class="log5">Fill up missing offset samples with silence </span>: <span class="good">Yes</span>
<span class="log5">Delete leading and trailing silent blocks </span>: <span class="good">No</span>
<span class="log5">Null samples used in CRC calculations </span>: <span class="good">Yes</span>
<span class="log5">Used interface </span>: <span class="log4">Native Win32 interface for Win NT & 2000</span>
<span class="log5">Gap handling </span>: <span class="good">Appended to previous track</span>

<span class="log5">Used output format </span>: <span class="log4">User Defined Encoder</span>
<span class="log5">Selected bitrate </span>: <span class="log4">320 kBit/s</span>
<span class="log5">Quality </span>: <span class="log4">High</span>
<span class="log5">Add ID3 tag </span>: <span class="badish">Yes</span>
<span class="log5">Command line compressor </span>: <span class="log4">E:\Tools\lame.exe</span>
<span class="log5">Additional command line options </span>: <span class="log4">-V0 --vbr-new --tt "%title%" --ta "%artist%" --tl "%albumtitle%" --ty "%year%" --tn "%tracknr%" %source%
%dest%</span>


<span class="log4 log5">TOC of the extracted CD</span>

<strong> Track | Start | Length | Start sector | End sector </strong>
<strong>---------------------------------------------------------</strong>
<span class="log4">1</span> <strong>|</strong> <span class="log1">0:00.00</span> <strong>|</strong> <span class="log1">7:42.65</span> <strong>|</strong> <span class="log1">0</span> <strong>|</strong> <span class="log1">34714</span>
<span class="log4">2</span> <strong>|</strong> <span class="log1">7:42.65</span> <strong>|</strong> <span class="log1">7:19.34</span> <strong>|</strong> <span class="log1">34715</span> <strong>|</strong> <span class="log1">67673</span>
<span class="log4">3</span> <strong>|</strong> <span class="log1">15:02.24</span> <strong>|</strong> <span class="log1">10:42.38</span> <strong>|</strong> <span class="log1">67674</span> <strong>|</strong> <span class="log1">115861</span>
<span class="log4">4</span> <strong>|</strong> <span class="log1">25:44.62</span> <strong>|</strong> <span class="log1">7:02.68</span> <strong>|</strong> <span class="log1">115862</span> <strong>|</strong> <span class="log1">147579</span>


<span class="log5">Track</span> <span class="log4 log1">1</span>

<span class="log4">Filename <span class="log3">E:\Test Rip\01 Acknowledgement.wav</span></span>

<span class="log4">Pre-gap length <span class="log3">0:00:02.00</span></span>

<span class="log4">Peak level <span class="log3">97.6 %</span></span>
<span class="log4">Extraction speed <span class="log3">5.3 X</span></span>
<span class="log4">Track quality <span class="log3">100.0 %</span></span>
<span class="log4">Test CRC <span class="good">322247B3</span></span>
<span class="log4">Copy CRC <span class="good">322247B3</span></span>
<span class="good">Accurately ripped (confidence 200) [FB072CAB]</span> (AR v2)
<span class="good">Copy OK</span>

<span class="log5">Track</span> <span class="log4 log1">2</span>

<span class="log4">Filename <span class="log3">E:\Test Rip\02 Resolution.wav</span></span>

<span class="log4">Peak level <span class="log3">97.6 %</span></span>
<span class="log4">Extraction speed <span class="log3">6.1 X</span></span>
<span class="log4">Track quality <span class="log3">100.0 %</span></span>
<span class="log4">Test CRC <span class="good">4732C420</span></span>
<span class="log4">Copy CRC <span class="good">4732C420</span></span>
<span class="good">Accurately ripped (confidence 200) [F8254929]</span> (AR v2)
<span class="good">Copy OK</span>

<span class="log5">Track</span> <span class="log4 log1">3</span>

<span class="log4">Filename <span class="log3">E:\Test Rip\03 Pursuance.wav</span></span>

<span class="log4">Pre-gap length <span class="log3">0:00:01.46</span></span>

<span class="log4">Peak level <span class="log3">97.6 %</span></span>
<span class="log4">Extraction speed <span class="log3">7.1 X</span></span>
<span class="log4">Track quality <span class="log3">100.0 %</span></span>
<span class="log4">Test CRC <span class="good">71958F92</span></span>
<span class="log4">Copy CRC <span class="good">71958F92</span></span>
<span class="good">Accurately ripped (confidence 200) [4FC2DCC6]</span> (AR v2)
<span class="good">Copy OK</span>

<span class="log5">Track</span> <span class="log4 log1">4</span>

<span class="log4">Filename <span class="log3">E:\Test Rip\04 Psalm.wav</span></span>

<span class="log4">Peak level <span class="log3">95.7 %</span></span>
<span class="log4">Extraction speed <span class="log3">7.6 X</span></span>
<span class="log4">Track quality <span class="log3">100.0 %</span></span>
<span class="log4">Test CRC <span class="good">0C8D6B7E</span></span>
<span class="log4">Copy CRC <span class="good">0C8D6B7E</span></span>
<span class="good">Accurately ripped (confidence 200) [36EF184C]</span> (AR v2)
<span class="good">Copy OK</span>


<span class="good">All tracks accurately ripped</span>

<span class="good">No errors occurred</span>

<span class="good">End of status report</span>

---- CUETools DB Plugin V2.1.6

[CTDB TOCID: 3Ymtej0heE3Qv3LM2ZTKNGwiRV8-] found
Submit result: already submitted
Track | CTDB Status
1 | (961/1326) Accurately ripped
2 | (966/1326) Accurately ripped
3 | (961/1326) Accurately ripped
4 | (963/1326) Accurately ripped

<span class='bad'>==== Log checksum 9FE4FA4CE31EF3C9B70A448AFA4B9E5862E040593FE0673DC1C8A4BA257D9E97 ====</span>

+ 223
- 0
tests/logs/eac/originals/combined_mp3_1.log Переглянути файл

@@ -0,0 +1,223 @@
Exact Audio Copy V1.5 from 20. February 2020
EAC extraction logfile from 17. April 2020, 19:35
John Coltrane / A Love Supreme
Used drive : HL-DT-STDVDRAM GH24NSB0 Adapter: 1 ID: 0
Read mode : Secure
Utilize accurate stream : Yes
Defeat audio cache : Yes
Make use of C2 pointers : No
Read offset correction : 6
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
Used interface : Native Win32 interface for Win NT & 2000
Gap handling : Appended to previous track
Used output format : User Defined Encoder
Selected bitrate : 768 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:42.65 | 0 | 34714
2 | 7:42.65 | 7:19.34 | 34715 | 67673
3 | 15:02.24 | 10:42.38 | 67674 | 115861
4 | 25:44.62 | 7:02.68 | 115862 | 147579
Track 1
Filename E:\Test Rip\01 Acknowledgement.wav
Pre-gap length 0:00:02.00
Peak level 97.6 %
Extraction speed 5.3 X
Track quality 100.0 %
Test CRC 322247B3
Copy CRC 322247B3
Accurately ripped (confidence 200) [FB072CAB] (AR v2)
Copy OK
Track 2
Filename E:\Test Rip\02 Resolution.wav
Peak level 97.6 %
Extraction speed 6.1 X
Track quality 100.0 %
Test CRC 4732C420
Copy CRC 4732C420
Accurately ripped (confidence 200) [F8254929] (AR v2)
Copy OK
Track 3
Filename E:\Test Rip\03 Pursuance.wav
Pre-gap length 0:00:01.46
Peak level 97.6 %
Extraction speed 7.1 X
Track quality 100.0 %
Test CRC 71958F92
Copy CRC 71958F92
Accurately ripped (confidence 200) [4FC2DCC6] (AR v2)
Copy OK
Track 4
Filename E:\Test Rip\04 Psalm.wav
Peak level 95.7 %
Extraction speed 7.6 X
Track quality 100.0 %
Test CRC 0C8D6B7E
Copy CRC 0C8D6B7E
Accurately ripped (confidence 200) [36EF184C] (AR v2)
Copy OK
All tracks accurately ripped
No errors occurred
End of status report
---- CUETools DB Plugin V2.1.6
[CTDB TOCID: 3Ymtej0heE3Qv3LM2ZTKNGwiRV8-] found
Submit result: already submitted
Track | CTDB Status
1 | (961/1326) Accurately ripped
2 | (966/1326) Accurately ripped
3 | (961/1326) Accurately ripped
4 | (963/1326) Accurately ripped
==== Log checksum 5168768818AD8271F9E33889E0FF7123188A08EB490B3FD922F4335E1C74BEDC ====
------------------------------------------------------------
Exact Audio Copy V1.5 from 20. February 2020
EAC extraction logfile from 17. April 2020, 19:35
John Coltrane / A Love Supreme
Used drive : HL-DT-STDVDRAM GH24NSB0 Adapter: 1 ID: 0
Read mode : Secure
Utilize accurate stream : Yes
Defeat audio cache : Yes
Make use of C2 pointers : No
Read offset correction : 6
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
Used interface : Native Win32 interface for Win NT & 2000
Gap handling : Appended to previous track
Used output format : User Defined Encoder
Selected bitrate : 320 kBit/s
Quality : High
Add ID3 tag : Yes
Command line compressor : E:\Tools\lame.exe
Additional command line options : -V0 --vbr-new --tt "%title%" --ta "%artist%" --tl "%albumtitle%" --ty "%year%" --tn "%tracknr%" %source% %dest%
TOC of the extracted CD
Track | Start | Length | Start sector | End sector
---------------------------------------------------------
1 | 0:00.00 | 7:42.65 | 0 | 34714
2 | 7:42.65 | 7:19.34 | 34715 | 67673
3 | 15:02.24 | 10:42.38 | 67674 | 115861
4 | 25:44.62 | 7:02.68 | 115862 | 147579
Track 1
Filename E:\Test Rip\01 Acknowledgement.wav
Pre-gap length 0:00:02.00
Peak level 97.6 %
Extraction speed 5.3 X
Track quality 100.0 %
Test CRC 322247B3
Copy CRC 322247B3
Accurately ripped (confidence 200) [FB072CAB] (AR v2)
Copy OK
Track 2
Filename E:\Test Rip\02 Resolution.wav
Peak level 97.6 %
Extraction speed 6.1 X
Track quality 100.0 %
Test CRC 4732C420
Copy CRC 4732C420
Accurately ripped (confidence 200) [F8254929] (AR v2)
Copy OK
Track 3
Filename E:\Test Rip\03 Pursuance.wav
Pre-gap length 0:00:01.46
Peak level 97.6 %
Extraction speed 7.1 X
Track quality 100.0 %
Test CRC 71958F92
Copy CRC 71958F92
Accurately ripped (confidence 200) [4FC2DCC6] (AR v2)
Copy OK
Track 4
Filename E:\Test Rip\04 Psalm.wav
Peak level 95.7 %
Extraction speed 7.6 X
Track quality 100.0 %
Test CRC 0C8D6B7E
Copy CRC 0C8D6B7E
Accurately ripped (confidence 200) [36EF184C] (AR v2)
Copy OK
All tracks accurately ripped
No errors occurred
End of status report
---- CUETools DB Plugin V2.1.6
[CTDB TOCID: 3Ymtej0heE3Qv3LM2ZTKNGwiRV8-] found
Submit result: already submitted
Track | CTDB Status
1 | (961/1326) Accurately ripped
2 | (966/1326) Accurately ripped
3 | (961/1326) Accurately ripped
4 | (963/1326) Accurately ripped
==== Log checksum 9FE4FA4CE31EF3C9B70A448AFA4B9E5862E040593FE0673DC1C8A4BA257D9E97 ====

Завантаження…
Відмінити
Зберегти