diff --git a/src/Logchecker.php b/src/Logchecker.php index d07c90c..60ad97e 100644 --- a/src/Logchecker.php +++ b/src/Logchecker.php @@ -1787,6 +1787,9 @@ class Logchecker } elseif (strpos($Matches[2], 'Appended to next track') !== false) { $Class = 'bad'; $this->account('Gap handling should be appended to previous track', 10); + } elseif (strpos($Matches[2], 'Left out') !== false) { + $Class = 'bad'; + $this->account('Gap handling should be appended to previous track', 10); } elseif (strpos($Matches[2], 'Appended to previous track') !== false) { $Class = 'good'; } else { diff --git a/tests/logs/eac/details/combined_1.json b/tests/logs/eac/details/combined_1.json index faa359c..c5df08e 100644 --- a/tests/logs/eac/details/combined_1.json +++ b/tests/logs/eac/details/combined_1.json @@ -3,12 +3,13 @@ "version": "0.99 prebeta 1", "language": "en", "combined": true, - "score": 76, + "score": 66, "checksum": "checksum_missing", "details": [ "Combined Log (8)", "\"Defeat audio cache\" should be yes (-10 points)", "Could not verify null samples", + "Gap handling should be appended to previous track (-10 points)", "Test and copy was not used (-10 points)", "Could not verify id3 tag setting (-1 point)", "Track 02 (1): Could not verify filename (-1 point)", diff --git a/tests/logs/eac/details/gap_handling_left_out.json b/tests/logs/eac/details/gap_handling_left_out.json new file mode 100644 index 0000000..aa8eb5f --- /dev/null +++ b/tests/logs/eac/details/gap_handling_left_out.json @@ -0,0 +1,12 @@ +{ + "ripper": "EAC", + "version": "1.0 beta 3", + "language": "en", + "combined": true, + "score": 90, + "checksum": "checksum_ok", + "details": [ + "Combined Log (2)", + "Gap handling should be appended to previous track (-10 points)" + ] +} diff --git a/tests/logs/eac/html/combined_1.log b/tests/logs/eac/html/combined_1.log index 3a25303..e8de4e8 100644 --- a/tests/logs/eac/html/combined_1.log +++ b/tests/logs/eac/html/combined_1.log @@ -16,7 +16,7 @@ Exact Audio Copy V0.99 prebeta 1 from Fill up missing offset samples with silence : Yes Delete leading and trailing silent blocks : No Used interface : Installed external ASPI interface -Gap handling : Left out +Gap handling : Left out Used output format : User Defined Encoder Selected bitrate : 320 kBit/s @@ -168,7 +168,7 @@ Exact Audio Copy V0.99 prebeta 1 from Fill up missing offset samples with silence : Yes Delete leading and trailing silent blocks : No Used interface : Installed external ASPI interface -Gap handling : Left out +Gap handling : Left out Used output format : User Defined Encoder Selected bitrate : 320 kBit/s @@ -224,7 +224,7 @@ Exact Audio Copy V0.99 prebeta 1 from Fill up missing offset samples with silence : Yes Delete leading and trailing silent blocks : No Used interface : Installed external ASPI interface -Gap handling : Left out +Gap handling : Left out Used output format : User Defined Encoder Selected bitrate : 320 kBit/s @@ -282,7 +282,7 @@ Exact Audio Copy V0.99 prebeta 1 from Fill up missing offset samples with silence : Yes Delete leading and trailing silent blocks : No Used interface : Installed external ASPI interface -Gap handling : Left out +Gap handling : Left out Used output format : Internal WAV Routines Sample format : 44.100 Hz; 16 Bit; Stereo @@ -333,7 +333,7 @@ Exact Audio Copy V0.99 prebeta 1 from Fill up missing offset samples with silence : Yes Delete leading and trailing silent blocks : No Used interface : Installed external ASPI interface -Gap handling : Left out +Gap handling : Left out Used output format : User Defined Encoder Selected bitrate : 320 kBit/s @@ -389,7 +389,7 @@ Exact Audio Copy V0.99 prebeta 1 from Fill up missing offset samples with silence : Yes Delete leading and trailing silent blocks : No Used interface : Installed external ASPI interface -Gap handling : Left out +Gap handling : Left out Used output format : Internal WAV Routines Sample format : 44.100 Hz; 16 Bit; Stereo @@ -440,7 +440,7 @@ Exact Audio Copy V0.99 prebeta 1 from Fill up missing offset samples with silence : Yes Delete leading and trailing silent blocks : No Used interface : Installed external ASPI interface -Gap handling : Left out +Gap handling : Left out Used output format : User Defined Encoder Selected bitrate : 320 kBit/s @@ -500,7 +500,7 @@ Exact Audio Copy V0.99 prebeta 1 from Fill up missing offset samples with silence : Yes Delete leading and trailing silent blocks : No Used interface : Installed external ASPI interface -Gap handling : Left out +Gap handling : Left out Used output format : User Defined Encoder Selected bitrate : 320 kBit/s diff --git a/tests/logs/eac/html/gap_handling_left_out.log b/tests/logs/eac/html/gap_handling_left_out.log new file mode 100644 index 0000000..3681b87 --- /dev/null +++ b/tests/logs/eac/html/gap_handling_left_out.log @@ -0,0 +1,545 @@ +Exact Audio Copy V1.0 beta 3 from 29. August 2011 + +EAC extraction logfile from 11. July 2016, 0:07 + +Adriana Calcanhotto / Cantada + +Used Drive : HL-DT-STDVDRAM GP65NW60 Adapter: 0 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 : Left out + +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 : -6 -V -T "ARTIST=%artist%" -T "TITLE=%title%" -T "ALBUM=%albumtitle%" -T "DATE=%year%" -T +"TRACKNUMBER=%tracknr%" -T "GENRE=%genre%" -T "COMMENT=%comment%" -T "BAND=%albuminterpret%" -T "ALBUMARTIST=%albuminterpret%" -T "COMPOSER=%composer%" %haslyrics%--tag-from-file=LYRICS="%lyricsfile%"%haslyrics% -T "DISCNUMBER=%cdnumber%" -T "TOTALDISCS=%totalcds%" -T "TOTALTRACKS=%numtracks%" %hascover%--picture="%coverfile%"%hascover% %source% -o %dest% + + +TOC of the extracted CD + + Track | Start | Length | Start sector | End sector + --------------------------------------------------------- + 1 | 0:00.00 | 3:46.55 | 0 | 17004 + 2 | 3:46.55 | 3:45.32 | 17005 | 33911 + 3 | 7:32.12 | 3:24.20 | 33912 | 49231 + 4 | 10:56.32 | 3:57.60 | 49232 | 67066 + 5 | 14:54.17 | 3:41.73 | 67067 | 83714 + 6 | 18:36.15 | 3:43.40 | 83715 | 100479 + 7 | 22:19.55 | 4:14.20 | 100480 | 119549 + 8 | 26:34.00 | 3:46.57 | 119550 | 136556 + 9 | 30:20.57 | 4:22.08 | 136557 | 156214 + 10 | 34:42.65 | 4:07.60 | 156215 | 174799 + 11 | 38:50.50 | 3:09.40 | 174800 | 189014 + 12 | 42:00.15 | 4:00.15 | 189015 | 207029 + 13 | 46:00.30 | 3:48.55 | 207030 | 224184 + 14 | 49:49.10 | 3:16.65 | 224185 | 238949 + 15 | 53:06.00 | 1:45.30 | 238950 | 246854 + + +Track 1 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[1] Programa - Adriana Calcanhotto With Moreno +2.wav + + Pre-gap length 0:00:02.00 + + Peak level 94.8 % + Extraction speed 2.8 X + Track quality 100.0 % + Test CRC E281E2B0 + Copy CRC E281E2B0 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 2 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[2] Justo Agora - Adriana Calcanhotto.wav + + Pre-gap length 0:00:01.13 + + Peak level 94.8 % + Extraction speed 3.0 X + Track quality 100.0 % + Test CRC BFCC6B80 + Copy CRC BFCC6B80 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 3 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[3] Pelos Ares - Adriana Calcanhotto.wav + + Pre-gap length 0:00:02.12 + + Peak level 94.8 % + Extraction speed 3.2 X + Track quality 100.0 % + Test CRC DA0560E9 + Copy CRC DA0560E9 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 4 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[4] Eu Espero - Adriana Calcanhotto.wav + + Pre-gap length 0:00:01.20 + + Peak level 94.8 % + Extraction speed 3.5 X + Track quality 100.0 % + Test CRC 0030BA90 + Copy CRC 0030BA90 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 5 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[5] Noite - Adriana Calcanhotto.wav + + Pre-gap length 0:00:03.15 + + Peak level 93.1 % + Extraction speed 3.7 X + Track quality 100.0 % + Test CRC A7482243 + Copy CRC A7482243 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 6 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[6] Calor - Adriana Calcanhotto.wav + + Pre-gap length 0:00:03.18 + + Peak level 84.0 % + Extraction speed 3.9 X + Track quality 100.0 % + Test CRC 59DE87A8 + Copy CRC 59DE87A8 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 7 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[7] Sobre A Tarde - Adriana Calcanhotto.wav + + Pre-gap length 0:00:01.48 + + Peak level 94.8 % + Extraction speed 4.1 X + Track quality 100.0 % + Test CRC D77076E2 + Copy CRC D77076E2 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 8 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[8] Cantada (Depois De Ter Você) - Adriana Calcanhotto.wav + + Pre-gap length 0:00:01.35 + + Peak level 94.4 % + Extraction speed 4.3 X + Track quality 100.0 % + Test CRC A6CAA2F7 + Copy CRC A6CAA2F7 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 9 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[9] A Mulher Barbada - Adriana Calcanhotto With Los Hermanos.wav + + Pre-gap length 0:00:02.05 + + Peak level 94.8 % + Extraction speed 4.5 X + Track quality 100.0 % + Test CRC 4C5A1B1C + Copy CRC 4C5A1B1C + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 10 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[10] Sou Sua - Adriana Calcanhotto.wav + + Pre-gap length 0:00:02.08 + + Peak level 94.8 % + Extraction speed 4.7 X + Track quality 100.0 % + Test CRC F6C22632 + Copy CRC F6C22632 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 11 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[11] Intimidade (Sou Seu) - Adriana Calcanhotto.wav + + Pre-gap length 0:00:00.55 + + Peak level 77.9 % + Extraction speed 4.6 X + Track quality 100.0 % + Test CRC E43AA27C + Copy CRC E43AA27C + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 12 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[12] Impressive Instant - Adriana Calcanhotto With Daniel Jobim.wav + + Pre-gap length 0:00:01.35 + + Peak level 94.8 % + Extraction speed 5.0 X + Track quality 100.0 % + Test CRC 893B48F2 + Copy CRC 893B48F2 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 13 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[13] Se Tudo Pode Acontecer - Adriana Calcanhotto.wav + + Pre-gap length 0:00:04.15 + + Peak level 94.8 % + Extraction speed 5.1 X + Track quality 100.0 % + Test CRC 4F10A145 + Copy CRC 4F10A145 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 14 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[14] Jornal De Serviço - Adriana Calcanhotto With BossaCucaNova.wav + + Pre-gap length 0:00:07.38 + + Peak level 94.8 % + Extraction speed 4.1 X + Track quality 99.9 % + Test CRC 958244F3 + Copy CRC 958244F3 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 15 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[15] Ninar - Adriana Calcanhotto.wav + + Pre-gap length 0:00:00.73 + + Peak level 70.3 % + Extraction speed 4.5 X + Track quality 100.0 % + Test CRC 23846FF7 + Copy CRC 23846FF7 + Accurately ripped (confidence 3) [A6C112BB] (AR v2) + Copy OK + + + 1 track(s) accurately ripped +14 track(s) not fully ripped for AccurateRip lookup + +Some tracks could not be verified as accurate + +No errors occurred + +End of status report +==== Log checksum 7F46B0D52AA1ED0AC0C78E003D6E17F93E3497986AC65B0ECB7DB0DF8D0A2D94 ==== + +------------------------------------------------------------ + +Exact Audio Copy V1.0 beta 3 from 29. August 2011 + +EAC extraction logfile from 11. July 2016, 0:07 + +Adriana Calcanhotto / Cantada + +Used Drive : HL-DT-STDVDRAM GP65NW60 Adapter: 0 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 : Left out + +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 : -6 -V -T "ARTIST=%artist%" -T "TITLE=%title%" -T "ALBUM=%albumtitle%" -T "DATE=%year%" -T +"TRACKNUMBER=%tracknr%" -T "GENRE=%genre%" -T "COMMENT=%comment%" -T "BAND=%albuminterpret%" -T "ALBUMARTIST=%albuminterpret%" -T "COMPOSER=%composer%" %haslyrics%--tag-from-file=LYRICS="%lyricsfile%"%haslyrics% -T "DISCNUMBER=%cdnumber%" -T "TOTALDISCS=%totalcds%" -T "TOTALTRACKS=%numtracks%" %hascover%--picture="%coverfile%"%hascover% %source% -o %dest% + + +TOC of the extracted CD + + Track | Start | Length | Start sector | End sector + --------------------------------------------------------- + 1 | 0:00.00 | 3:46.55 | 0 | 17004 + 2 | 3:46.55 | 3:45.32 | 17005 | 33911 + 3 | 7:32.12 | 3:24.20 | 33912 | 49231 + 4 | 10:56.32 | 3:57.60 | 49232 | 67066 + 5 | 14:54.17 | 3:41.73 | 67067 | 83714 + 6 | 18:36.15 | 3:43.40 | 83715 | 100479 + 7 | 22:19.55 | 4:14.20 | 100480 | 119549 + 8 | 26:34.00 | 3:46.57 | 119550 | 136556 + 9 | 30:20.57 | 4:22.08 | 136557 | 156214 + 10 | 34:42.65 | 4:07.60 | 156215 | 174799 + 11 | 38:50.50 | 3:09.40 | 174800 | 189014 + 12 | 42:00.15 | 4:00.15 | 189015 | 207029 + 13 | 46:00.30 | 3:48.55 | 207030 | 224184 + 14 | 49:49.10 | 3:16.65 | 224185 | 238949 + 15 | 53:06.00 | 1:45.30 | 238950 | 246854 + + +Track 1 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[1] Programa - Adriana Calcanhotto With Moreno +2.wav + + Pre-gap length 0:00:02.00 + + Peak level 94.8 % + Extraction speed 2.8 X + Track quality 100.0 % + Test CRC E281E2B0 + Copy CRC E281E2B0 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 2 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[2] Justo Agora - Adriana Calcanhotto.wav + + Pre-gap length 0:00:01.13 + + Peak level 94.8 % + Extraction speed 3.0 X + Track quality 100.0 % + Test CRC BFCC6B80 + Copy CRC BFCC6B80 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 3 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[3] Pelos Ares - Adriana Calcanhotto.wav + + Pre-gap length 0:00:02.12 + + Peak level 94.8 % + Extraction speed 3.2 X + Track quality 100.0 % + Test CRC DA0560E9 + Copy CRC DA0560E9 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 4 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[4] Eu Espero - Adriana Calcanhotto.wav + + Pre-gap length 0:00:01.20 + + Peak level 94.8 % + Extraction speed 3.5 X + Track quality 100.0 % + Test CRC 0030BA90 + Copy CRC 0030BA90 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 5 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[5] Noite - Adriana Calcanhotto.wav + + Pre-gap length 0:00:03.15 + + Peak level 93.1 % + Extraction speed 3.7 X + Track quality 100.0 % + Test CRC A7482243 + Copy CRC A7482243 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 6 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[6] Calor - Adriana Calcanhotto.wav + + Pre-gap length 0:00:03.18 + + Peak level 84.0 % + Extraction speed 3.9 X + Track quality 100.0 % + Test CRC 59DE87A8 + Copy CRC 59DE87A8 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 7 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[7] Sobre A Tarde - Adriana Calcanhotto.wav + + Pre-gap length 0:00:01.48 + + Peak level 94.8 % + Extraction speed 4.1 X + Track quality 100.0 % + Test CRC D77076E2 + Copy CRC D77076E2 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 8 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[8] Cantada (Depois De Ter Você) - Adriana Calcanhotto.wav + + Pre-gap length 0:00:01.35 + + Peak level 94.4 % + Extraction speed 4.3 X + Track quality 100.0 % + Test CRC A6CAA2F7 + Copy CRC A6CAA2F7 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 9 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[9] A Mulher Barbada - Adriana Calcanhotto With Los Hermanos.wav + + Pre-gap length 0:00:02.05 + + Peak level 94.8 % + Extraction speed 4.5 X + Track quality 100.0 % + Test CRC 4C5A1B1C + Copy CRC 4C5A1B1C + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 10 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[10] Sou Sua - Adriana Calcanhotto.wav + + Pre-gap length 0:00:02.08 + + Peak level 94.8 % + Extraction speed 4.7 X + Track quality 100.0 % + Test CRC F6C22632 + Copy CRC F6C22632 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 11 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[11] Intimidade (Sou Seu) - Adriana Calcanhotto.wav + + Pre-gap length 0:00:00.55 + + Peak level 77.9 % + Extraction speed 4.6 X + Track quality 100.0 % + Test CRC E43AA27C + Copy CRC E43AA27C + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 12 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[12] Impressive Instant - Adriana Calcanhotto With Daniel Jobim.wav + + Pre-gap length 0:00:01.35 + + Peak level 94.8 % + Extraction speed 5.0 X + Track quality 100.0 % + Test CRC 893B48F2 + Copy CRC 893B48F2 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 13 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[13] Se Tudo Pode Acontecer - Adriana Calcanhotto.wav + + Pre-gap length 0:00:04.15 + + Peak level 94.8 % + Extraction speed 5.1 X + Track quality 100.0 % + Test CRC 4F10A145 + Copy CRC 4F10A145 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 14 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[14] Jornal De Serviço - Adriana Calcanhotto With BossaCucaNova.wav + + Pre-gap length 0:00:07.38 + + Peak level 94.8 % + Extraction speed 4.1 X + Track quality 99.9 % + Test CRC 958244F3 + Copy CRC 958244F3 + Track not fully ripped for AccurateRip lookup + Copy OK + +Track 15 + + Filename C:\FLAC\Adriana Calcanhotto - Cantada\[15] Ninar - Adriana Calcanhotto.wav + + Pre-gap length 0:00:00.73 + + Peak level 70.3 % + Extraction speed 4.5 X + Track quality 100.0 % + Test CRC 23846FF7 + Copy CRC 23846FF7 + Accurately ripped (confidence 3) [A6C112BB] (AR v2) + Copy OK + + + 1 track(s) accurately ripped +14 track(s) not fully ripped for AccurateRip lookup + +Some tracks could not be verified as accurate + +No errors occurred + +End of status report +==== Log checksum 7F46B0D52AA1ED0AC0C78E003D6E17F93E3497986AC65B0ECB7DB0DF8D0A2D94 ==== \ No newline at end of file diff --git a/tests/logs/eac/originals/gap_handling_left_out.log b/tests/logs/eac/originals/gap_handling_left_out.log new file mode 100644 index 0000000..d56072d Binary files /dev/null and b/tests/logs/eac/originals/gap_handling_left_out.log differ