diff --git a/src/Logchecker.php b/src/Logchecker.php
index db38c60..a176062 100644
--- a/src/Logchecker.php
+++ b/src/Logchecker.php
@@ -526,6 +526,7 @@ class Logchecker
1,
$XLD
);
+
if (!$EAC && !$XLD) {
if ($this->Combined) {
unset($this->Details);
@@ -571,6 +572,22 @@ class Logchecker
$this->checksumStatus = Check\Checksum::CHECKSUM_INVALID;
}
+ if (
+ $EAC
+ && (
+ preg_match("/Used output format[ ]+:[ ]+[a-z0-9 ]+MP3/i", $Log) === 1
+ || preg_match("/Command line compressor[ ]+:.+(MP3|lame)\.exe/i", $Log) === 1
+ )
+ ) {
+ if ($this->Combined) {
+ $this->Details[] = "Skipping Log (" . $this->CurrLog . "), MP3 Rip";
+ } else {
+ $this->account("Invalid Log (MP3)", 100);
+ }
+ $this->logs[$LogArrayKey] = $Log;
+ continue;
+ }
+
$Log = preg_replace_callback("/Used drive( *): (.+)/i", array(
$this,
'drive'
diff --git a/tests/logs/eac/details/combined_mp3_1.json b/tests/logs/eac/details/combined_mp3_1.json
index 936f819..59b73e3 100644
--- a/tests/logs/eac/details/combined_mp3_1.json
+++ b/tests/logs/eac/details/combined_mp3_1.json
@@ -3,10 +3,10 @@
"version": "1.5",
"language": "en",
"combined": true,
- "score": 99,
+ "score": 100,
"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)"
+ "Skipping Log (2), MP3 Rip"
]
}
diff --git a/tests/logs/eac/details/combined_mp3_2.json b/tests/logs/eac/details/combined_mp3_2.json
new file mode 100644
index 0000000..61ace87
--- /dev/null
+++ b/tests/logs/eac/details/combined_mp3_2.json
@@ -0,0 +1,12 @@
+{
+ "ripper": "EAC",
+ "version": "1.4",
+ "language": "en",
+ "combined": true,
+ "score": 100,
+ "checksum": "checksum_ok",
+ "details": [
+ "Combined Log (2)",
+ "Skipping Log (2), MP3 Rip"
+ ]
+}
diff --git a/tests/logs/eac/html/combined_mp3_1.log b/tests/logs/eac/html/combined_mp3_1.log
index 57f2bf8..3fea338 100644
--- a/tests/logs/eac/html/combined_mp3_1.log
+++ b/tests/logs/eac/html/combined_mp3_1.log
@@ -109,7 +109,7 @@ Track | CTDB Status
==== Log checksum 5168768818AD8271F9E33889E0FF7123188A08EB490B3FD922F4335E1C74BEDC ====
-------------------------------------------------------------
+------------------------------------------------------------
Exact Audio Copy V1.5 from 20. February 2020
@@ -117,98 +117,97 @@ Exact Audio Copy V1.5 from 20. Febr
John Coltrane / A Love Supreme
-Used Drive : HL-DT-STDVDRAM GH24NSB0 Adapter: 1 ID: 0
+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 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
+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%
+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
+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 | 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
+Track 1
- Filename E:\Test Rip\01 Acknowledgement.wav
+ Filename E:\Test Rip\01 Acknowledgement.wav
- Pre-gap length 0:00:02.00
+ 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
+ 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
+Track 2
- Filename E:\Test Rip\02 Resolution.wav
+ 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
+ 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
+Track 3
- Filename E:\Test Rip\03 Pursuance.wav
+ Filename E:\Test Rip\03 Pursuance.wav
- Pre-gap length 0:00:01.46
+ 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
+ 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
+Track 4
- Filename E:\Test Rip\04 Psalm.wav
+ 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
+ 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
+All tracks accurately ripped
-No errors occurred
+No errors occurred
-End of status report
+End of status report
---- CUETools DB Plugin V2.1.6
diff --git a/tests/logs/eac/html/combined_mp3_2.log b/tests/logs/eac/html/combined_mp3_2.log
new file mode 100644
index 0000000..2aee04e
--- /dev/null
+++ b/tests/logs/eac/html/combined_mp3_2.log
@@ -0,0 +1,340 @@
+Exact Audio Copy V1.4 from 3. February 2020
+
+EAC extraction logfile from 19. February 2020, 0:20
+
+Various Artists / The Widescreen Versions
+
+Used Drive : HL-DT-STDVD-RW GH41N Adapter: 1 ID: 0
+
+Read mode : Secure
+Utilize accurate stream : Yes
+Defeat audio cache : Yes
+Make use of C2 pointers : No
+
+Read offset correction : 667
+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 : 896 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 | 6:10.55 | 0 | 27804
+ 2 | 6:10.55 | 5:35.70 | 27805 | 52999
+ 3 | 11:46.50 | 5:47.35 | 53000 | 79059
+ 4 | 17:34.10 | 5:32.17 | 79060 | 103976
+ 5 | 23:06.27 | 7:25.10 | 103977 | 137361
+ 6 | 30:31.37 | 5:36.35 | 137362 | 162596
+ 7 | 36:07.72 | 7:09.00 | 162597 | 194771
+ 8 | 43:16.72 | 5:42.23 | 194772 | 220444
+
+
+Track 1
+
+ Filename C:\EAC Rip\The Widescreen Versions\01 - Klute - LEO9 (Stasis mix).wav
+
+ Pre-gap length 0:00:02.00
+
+ Peak level 100.0 %
+ Extraction speed 2.9 X
+ Track quality 100.0 %
+ Test CRC 68366A6F
+ Copy CRC 68366A6F
+ Accurately ripped (confidence 6) [E40957E7] (AR v2)
+ Copy OK
+
+Track 2
+
+ Filename C:\EAC Rip\The Widescreen Versions\02 - Mainline - Dakota (Future,Past mix).wav
+
+ Peak level 100.0 %
+ Extraction speed 3.3 X
+ Track quality 100.0 %
+ Test CRC 1952292A
+ Copy CRC 1952292A
+ Accurately ripped (confidence 6) [2CA57D06] (AR v2)
+ Copy OK
+
+Track 3
+
+ Filename C:\EAC Rip\The Widescreen Versions\03 - Lexis - Hypnotise (Autechre slow mix).wav
+
+ Peak level 88.4 %
+ Extraction speed 3.7 X
+ Track quality 100.0 %
+ Test CRC C2915EF1
+ Copy CRC C2915EF1
+ Accurately ripped (confidence 7) [A9AABD1D] (AR v2)
+ Copy OK
+
+Track 4
+
+ Filename C:\EAC Rip\The Widescreen Versions\04 - Lexis - Irrampent (Midnight Funk Association mix).wav
+
+ Peak level 100.0 %
+ Extraction speed 4.0 X
+ Track quality 100.0 %
+ Test CRC 03AC4E60
+ Copy CRC 03AC4E60
+ Accurately ripped (confidence 6) [BB4D6ABA] (AR v2)
+ Copy OK
+
+Track 5
+
+ Filename C:\EAC Rip\The Widescreen Versions\05 - Paradox + DMR - Zonation (Unorthodox remix).wav
+
+ Peak level 100.0 %
+ Extraction speed 4.4 X
+ Track quality 100.0 %
+ Test CRC 505B61B5
+ Copy CRC 505B61B5
+ Accurately ripped (confidence 6) [06630CB8] (AR v2)
+ Copy OK
+
+Track 6
+
+ Filename C:\EAC Rip\The Widescreen Versions\06 - Klute - Silent Weapons (Two Lone Swordsmen mix).wav
+
+ Peak level 100.0 %
+ Extraction speed 4.7 X
+ Track quality 100.0 %
+ Test CRC 8451E7D1
+ Copy CRC 8451E7D1
+ Accurately ripped (confidence 7) [7F8721BE] (AR v2)
+ Copy OK
+
+Track 7
+
+ Filename C:\EAC Rip\The Widescreen Versions\07 - Studio Pressure - Relics (Plaid remix).wav
+
+ Peak level 100.0 %
+ Extraction speed 5.1 X
+ Track quality 100.0 %
+ Test CRC 70DFEA14
+ Copy CRC 70DFEA14
+ Accurately ripped (confidence 7) [39D83A4B] (AR v2)
+ Copy OK
+
+Track 8
+
+ Filename C:\EAC Rip\The Widescreen Versions\08 - Klute - Perception (Override mix).wav
+
+ Peak level 100.0 %
+ Extraction speed 4.8 X
+ Track quality 99.9 %
+ Test CRC 6E46DE06
+ Copy CRC 6E46DE06
+ Accurately ripped (confidence 6) [6EB952B6] (AR v2)
+ Copy OK
+
+
+All tracks accurately ripped
+
+No errors occurred
+
+End of status report
+
+---- AcoustID Plugin V1.2.0
+
+Total fingerprints: 8
+
+
+---- CUETools DB Plugin V2.1.6
+
+[CTDB TOCID: kYH6G86.IlDImawe7FZM5ovfruo-] found
+Submit result: already submitted
+Track | CTDB Status
+ 1 | (8/8) Accurately ripped
+ 2 | (8/8) Accurately ripped
+ 3 | (8/8) Accurately ripped
+ 4 | (8/8) Accurately ripped
+ 5 | (8/8) Accurately ripped
+ 6 | (8/8) Accurately ripped
+ 7 | (7/8) Accurately ripped
+ 8 | (7/8) Accurately ripped
+
+==== Log checksum 4F316542139212B55D1DF2651968ED5299A63AB6F3045A13E724D9B767A65333 ====
+
+------------------------------------------------------------
+
+Exact Audio Copy V1.4 from 3. February 2020
+
+EAC extraction logfile from 19. February 2020, 0:20
+
+Various Artists / The Widescreen Versions
+
+Used drive : HL-DT-STDVD-RW GH41N Adapter: 1 ID: 0
+
+Read mode : Secure
+Utilize accurate stream : Yes
+Defeat audio cache : Yes
+Make use of C2 pointers : No
+
+Read offset correction : 667
+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 : L3Enc MP3 Encoder & Compatible
+Selected bitrate : 128 kBit/s
+Quality : High
+Add ID3 tag : Yes
+Command line compressor : MP3Encoder.exe
+Additional command line options :
+
+
+TOC of the extracted CD
+
+ Track | Start | Length | Start sector | End sector
+ ---------------------------------------------------------
+ 1 | 0:00.00 | 6:10.55 | 0 | 27804
+ 2 | 6:10.55 | 5:35.70 | 27805 | 52999
+ 3 | 11:46.50 | 5:47.35 | 53000 | 79059
+ 4 | 17:34.10 | 5:32.17 | 79060 | 103976
+ 5 | 23:06.27 | 7:25.10 | 103977 | 137361
+ 6 | 30:31.37 | 5:36.35 | 137362 | 162596
+ 7 | 36:07.72 | 7:09.00 | 162597 | 194771
+ 8 | 43:16.72 | 5:42.23 | 194772 | 220444
+
+
+Track 1
+
+ Filename C:\EAC Rip\The Widescreen Versions\01 - Klute - LEO9 (Stasis mix).wav
+
+ Pre-gap length 0:00:02.00
+
+ Peak level 100.0 %
+ Extraction speed 2.9 X
+ Track quality 100.0 %
+ Test CRC 68366A6F
+ Copy CRC 68366A6F
+ Accurately ripped (confidence 6) [E40957E7] (AR v2)
+ Copy OK
+
+Track 2
+
+ Filename C:\EAC Rip\The Widescreen Versions\02 - Mainline - Dakota (Future,Past mix).wav
+
+ Peak level 100.0 %
+ Extraction speed 3.3 X
+ Track quality 100.0 %
+ Test CRC 1952292A
+ Copy CRC 1952292A
+ Accurately ripped (confidence 6) [2CA57D06] (AR v2)
+ Copy OK
+
+Track 3
+
+ Filename C:\EAC Rip\The Widescreen Versions\03 - Lexis - Hypnotise (Autechre slow mix).wav
+
+ Peak level 88.4 %
+ Extraction speed 3.7 X
+ Track quality 100.0 %
+ Test CRC C2915EF1
+ Copy CRC C2915EF1
+ Accurately ripped (confidence 7) [A9AABD1D] (AR v2)
+ Copy OK
+
+Track 4
+
+ Filename C:\EAC Rip\The Widescreen Versions\04 - Lexis - Irrampent (Midnight Funk Association mix).wav
+
+ Peak level 100.0 %
+ Extraction speed 4.0 X
+ Track quality 100.0 %
+ Test CRC 03AC4E60
+ Copy CRC 03AC4E60
+ Accurately ripped (confidence 6) [BB4D6ABA] (AR v2)
+ Copy OK
+
+Track 5
+
+ Filename C:\EAC Rip\The Widescreen Versions\05 - Paradox + DMR - Zonation (Unorthodox remix).wav
+
+ Peak level 100.0 %
+ Extraction speed 4.4 X
+ Track quality 100.0 %
+ Test CRC 505B61B5
+ Copy CRC 505B61B5
+ Accurately ripped (confidence 6) [06630CB8] (AR v2)
+ Copy OK
+
+Track 6
+
+ Filename C:\EAC Rip\The Widescreen Versions\06 - Klute - Silent Weapons (Two Lone Swordsmen mix).wav
+
+ Peak level 100.0 %
+ Extraction speed 4.7 X
+ Track quality 100.0 %
+ Test CRC 8451E7D1
+ Copy CRC 8451E7D1
+ Accurately ripped (confidence 7) [7F8721BE] (AR v2)
+ Copy OK
+
+Track 7
+
+ Filename C:\EAC Rip\The Widescreen Versions\07 - Studio Pressure - Relics (Plaid remix).wav
+
+ Peak level 100.0 %
+ Extraction speed 5.1 X
+ Track quality 100.0 %
+ Test CRC 70DFEA14
+ Copy CRC 70DFEA14
+ Accurately ripped (confidence 7) [39D83A4B] (AR v2)
+ Copy OK
+
+Track 8
+
+ Filename C:\EAC Rip\The Widescreen Versions\08 - Klute - Perception (Override mix).wav
+
+ Peak level 100.0 %
+ Extraction speed 4.8 X
+ Track quality 99.9 %
+ Test CRC 6E46DE06
+ Copy CRC 6E46DE06
+ Accurately ripped (confidence 6) [6EB952B6] (AR v2)
+ Copy OK
+
+
+All tracks accurately ripped
+
+No errors occurred
+
+End of status report
+
+---- AcoustID Plugin V1.2.0
+
+Total fingerprints: 8
+
+
+---- CUETools DB Plugin V2.1.6
+
+[CTDB TOCID: kYH6G86.IlDImawe7FZM5ovfruo-] found
+Submit result: already submitted
+Track | CTDB Status
+ 1 | (8/8) Accurately ripped
+ 2 | (8/8) Accurately ripped
+ 3 | (8/8) Accurately ripped
+ 4 | (8/8) Accurately ripped
+ 5 | (8/8) Accurately ripped
+ 6 | (8/8) Accurately ripped
+ 7 | (7/8) Accurately ripped
+ 8 | (7/8) Accurately ripped
+
+==== Log checksum 4FE0CFB19731350AFE075931B4A9E4D9EC13DE2889BF2F5A12650B927A2472A8 ====
\ No newline at end of file
diff --git a/tests/logs/eac/originals/combined_mp3_2.log b/tests/logs/eac/originals/combined_mp3_2.log
new file mode 100644
index 0000000..9e136ad
Binary files /dev/null and b/tests/logs/eac/originals/combined_mp3_2.log differ