diff --git a/src/Logchecker.php b/src/Logchecker.php
index 60ad97e..a974a11 100644
--- a/src/Logchecker.php
+++ b/src/Logchecker.php
@@ -1028,7 +1028,26 @@ class Logchecker
$Count
);
if (!$Count && !$this->Range) {
- $this->accountTrack('Could not verify filename', 1);
+ // EAC truncates file names that would exceed 243 characters, so we'll just mark
+ // it as fine, as it almost always is, and if it wouldn't have been, then
+ // some other filename will have hit the -1 deduction anyway.
+ if ($EAC) {
+ preg_match('/Filename (.+)\n/i', $TrackBody, $Matches);
+ if (strlen($Matches[1]) >= 243) {
+ $TrackBody = preg_replace(
+ '/Filename ((.+)?)\n/i',
+ "Filename $1\n",
+ $TrackBody,
+ -1,
+ $Count
+ );
+ $this->accountTrack('Could not verify filename, too long');
+ } else {
+ $this->accountTrack('Could not verify filename or file extension', 1);
+ }
+ } else {
+ $this->accountTrack('Could not verify filename or file extension', 1);
+ }
}
// xld track gain
$TrackBody = preg_replace(
diff --git a/tests/logs/eac/details/combined_1.json b/tests/logs/eac/details/combined_1.json
index c5df08e..4e1e8f2 100644
--- a/tests/logs/eac/details/combined_1.json
+++ b/tests/logs/eac/details/combined_1.json
@@ -3,7 +3,7 @@
"version": "0.99 prebeta 1",
"language": "en",
"combined": true,
- "score": 66,
+ "score": 69,
"checksum": "checksum_missing",
"details": [
"Combined Log (8)",
@@ -12,8 +12,8 @@
"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)",
- "Track 05 (1): Could not verify filename (-1 point)",
- "Track 07 (1): Could not verify filename (-1 point)"
+ "Track 02 (1): Could not verify filename, too long",
+ "Track 05 (1): Could not verify filename, too long",
+ "Track 07 (1): Could not verify filename, too long"
]
}
diff --git a/tests/logs/eac/details/long_filename.json b/tests/logs/eac/details/long_filename.json
new file mode 100644
index 0000000..9d23f42
--- /dev/null
+++ b/tests/logs/eac/details/long_filename.json
@@ -0,0 +1,12 @@
+{
+ "ripper": "EAC",
+ "version": "1.0 beta 3",
+ "language": "en",
+ "combined": false,
+ "score": 99,
+ "checksum": "checksum_invalid",
+ "details": [
+ "Track 01: Could not verify filename or file extension (-1 point)",
+ "Track 11: Could not verify filename, too long"
+ ]
+}
diff --git a/tests/logs/eac/html/combined_1.log b/tests/logs/eac/html/combined_1.log
index e8de4e8..7640ff3 100644
--- a/tests/logs/eac/html/combined_1.log
+++ b/tests/logs/eac/html/combined_1.log
@@ -57,7 +57,7 @@ Exact Audio Copy V0.99 prebeta 1 from Track 2
- Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\02-DJ Food - Scratch Yer Head (Squarepusher Mix) - DJ Food - Scratch Yer Head (Squarepusher Mix).w
+ Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\02-DJ Food - Scratch Yer Head (Squarepusher Mix) - DJ Food - Scratch Yer Head (Squarepusher Mix).w
Pre-gap length 0:00:00.05
@@ -69,7 +69,7 @@ Exact Audio Copy V0.99 prebeta 1 from Track 3
- Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\03-East Flatbush Project - Tried By 12 (Squarepusher Mix) - East Flatbush Project - Tried By 12 (S
+ Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\03-East Flatbush Project - Tried By 12 (Squarepusher Mix) - East Flatbush Project - Tried By 12 (S
Copy aborted
@@ -85,7 +85,7 @@ Exact Audio Copy V0.99 prebeta 1 from Track 5
- Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\05-2 Player - Extreme Possibilities (Wagon Christ Mix) - 2 Player - Extreme Possibilities (Wagon C
+ Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\05-2 Player - Extreme Possibilities (Wagon Christ Mix) - 2 Player - Extreme Possibilities (Wagon C
Pre-gap length 0:00:50.04
@@ -107,7 +107,7 @@ Exact Audio Copy V0.99 prebeta 1 from Track 7
- Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\07-DJ Vadim - USSR Reconstruction (Jamie Hodge Mix) - DJ Vadim - USSR Reconstruction (Jamie Hodge
+ Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\07-DJ Vadim - USSR Reconstruction (Jamie Hodge Mix) - DJ Vadim - USSR Reconstruction (Jamie Hodge
Peak level 98.8 %
Track quality 100.0 %
@@ -139,7 +139,7 @@ Exact Audio Copy V0.99 prebeta 1 from Track 10
- Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\10-Cinematic Orchestra - All That You Give (Dr Rockit Mix) - Cinematic Orchestra - All That You Gi
+ Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\10-Cinematic Orchestra - All That You Give (Dr Rockit Mix) - Cinematic Orchestra - All That You Gi
Pre-gap length 0:00:00.01
@@ -197,7 +197,7 @@ Exact Audio Copy V0.99 prebeta 1 from Track 3
- Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\03-East Flatbush Project - Tried By 12 (Squarepusher Mix) - East Flatbush Project - Tried By 12 (S
+ Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\03-East Flatbush Project - Tried By 12 (Squarepusher Mix) - East Flatbush Project - Tried By 12 (S
Copy aborted
@@ -253,7 +253,7 @@ Exact Audio Copy V0.99 prebeta 1 from Track 10
- Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\10-Cinematic Orchestra - All That You Give (Dr Rockit Mix) - Cinematic Orchestra - All That You Gi
+ Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\10-Cinematic Orchestra - All That You Give (Dr Rockit Mix) - Cinematic Orchestra - All That You Gi
Pre-gap length 0:00:00.01
@@ -306,7 +306,7 @@ Exact Audio Copy V0.99 prebeta 1 from Track 3
- Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\03-East Flatbush Project - Tried By 12 (Squarepusher Mix) - East Flatbush Project - Tried By 12 (S
+ Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\03-East Flatbush Project - Tried By 12 (Squarepusher Mix) - East Flatbush Project - Tried By 12 (S
Copy aborted
@@ -362,7 +362,7 @@ Exact Audio Copy V0.99 prebeta 1 from Track 3
- Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\03-East Flatbush Project - Tried By 12 (Squarepusher Mix) - East Flatbush Project - Tried By 12 (S
+ Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\03-East Flatbush Project - Tried By 12 (Squarepusher Mix) - East Flatbush Project - Tried By 12 (S
Copy aborted
@@ -413,7 +413,7 @@ Exact Audio Copy V0.99 prebeta 1 from Track 3
- Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\03-East Flatbush Project - Tried By 12 (Squarepusher Mix) - East Flatbush Project - Tried By 12 (S
+ Filename D:\Documents and Settings\fz0bgd\My Documents\My Music\Lossless Music\Trip-Hop\Various Artists\ZEN RMX - A Ninja Tune Remix Retrospective (CD-1)\03-East Flatbush Project - Tried By 12 (Squarepusher Mix) - East Flatbush Project - Tried By 12 (S
Copy aborted
diff --git a/tests/logs/eac/html/long_filename.log b/tests/logs/eac/html/long_filename.log
new file mode 100644
index 0000000..2bf9b4f
--- /dev/null
+++ b/tests/logs/eac/html/long_filename.log
@@ -0,0 +1,206 @@
+Exact Audio Copy V1.0 beta 3 from 29. August 2011
+
+EAC extraction logfile from 5. April 2013, 14:40
+
+Various Artists / Modern Classics: Stravinsky's Les Noces and music by Dun, Glass, Nielsen, Tavener, Lutoslawski BBC Music Vol. VI No. 6
+
+Used Drive : HL-DT-STBDDVDRW CH10LS28 Adapter: 0 ID: 3
+
+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 : 128 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 -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 | 4:46.00 | 0 | 21449
+ 2 | 4:46.00 | 5:12.07 | 21450 | 44856
+ 3 | 9:58.07 | 6:05.33 | 44857 | 72264
+ 4 | 16:03.40 | 3:11.10 | 72265 | 86599
+ 5 | 19:14.50 | 10:32.32 | 86600 | 134031
+ 6 | 29:47.07 | 7:49.20 | 134032 | 169226
+ 7 | 37:36.27 | 15:14.08 | 169227 | 237784
+ 8 | 52:50.35 | 6:08.25 | 237785 | 265409
+ 9 | 58:58.60 | 2:47.45 | 265410 | 277979
+ 10 | 61:46.30 | 5:06.27 | 277980 | 300956
+ 11 | 66:52.57 | 8:35.02 | 300957 | 339583
+ 12 | 77:59.59 | 1:03.33 | 350984 | 355741
+
+
+Track 1
+
+ Filename C:\EAC\Modern Classics - Stravinsky's Les Noces, etc (1998) [FLAC]\01 - Philadelphia Orchestra and Eugene Ormandy - Nielsen- Maskarade Overture
+
+ Pre-gap length 0:00:02.00
+
+ Peak level 100.0 %
+ Extraction speed 1.3 X
+ Track quality 100.0 %
+ Test CRC 0C63A520
+ Copy CRC 0C63A520
+ Accurately ripped (confidence 5) [58AA7F29] (AR v2)
+ Copy OK
+
+Track 2
+
+ Filename C:\EAC\Modern Classics - Stravinsky's Les Noces, etc (1998) [FLAC]\02 - American Concert Choir, Columbia percussion Ensemble and Igor Stravinsky - Stravinsky- Les Noces - The Bride's Chamber.wav
+
+ Pre-gap length 0:00:07.33
+
+ Peak level 86.6 %
+ Extraction speed 1.3 X
+ Track quality 99.9 %
+ Test CRC BA3B2595
+ Copy CRC BA3B2595
+ Accurately ripped (confidence 5) [727877A3] (AR v2)
+ Copy OK
+
+Track 3
+
+ Filename C:\EAC\Modern Classics - Stravinsky's Les Noces, etc (1998) [FLAC]\03 - American Concert Choir, Columbia percussion Ensemble and Igor Stravinsky - Stravinsky- Les Noces - At the Bridegroom's.wav
+
+ Peak level 100.0 %
+ Extraction speed 1.6 X
+ Track quality 100.0 %
+ Test CRC 10CD21A3
+ Copy CRC 10CD21A3
+ Accurately ripped (confidence 5) [8553EB25] (AR v2)
+ Copy OK
+
+Track 4
+
+ Filename C:\EAC\Modern Classics - Stravinsky's Les Noces, etc (1998) [FLAC]\04 - American Concert Choir, Columbia percussion Ensemble and Igor Stravinsky - Stravinsky- Les Noces - The Bride's Departure.wav
+
+ Peak level 80.9 %
+ Extraction speed 1.6 X
+ Track quality 100.0 %
+ Test CRC B50F5266
+ Copy CRC B50F5266
+ Accurately ripped (confidence 5) [80B1BD7E] (AR v2)
+ Copy OK
+
+Track 5
+
+ Filename C:\EAC\Modern Classics - Stravinsky's Les Noces, etc (1998) [FLAC]\05 - American Concert Choir, Columbia percussion Ensemble and Igor Stravinsky - Stravinsky- Les Noces - The Wedding Feast.wav
+
+ Peak level 100.0 %
+ Extraction speed 1.9 X
+ Track quality 99.9 %
+ Test CRC 8B701CE8
+ Copy CRC 8B701CE8
+ Accurately ripped (confidence 5) [B19DB77F] (AR v2)
+ Copy OK
+
+Track 6
+
+ Filename C:\EAC\Modern Classics - Stravinsky's Les Noces, etc (1998) [FLAC]\06 - Philadelphia Orchestra and Eugene Ormandy - Barber- Adagio for Strings.wav
+
+ Pre-gap length 0:00:07.35
+
+ Peak level 65.6 %
+ Extraction speed 2.1 X
+ Track quality 100.0 %
+ Test CRC 9638FE26
+ Copy CRC 9638FE26
+ Accurately ripped (confidence 5) [16106AC7] (AR v2)
+ Copy OK
+
+Track 7
+
+ Filename C:\EAC\Modern Classics - Stravinsky's Les Noces, etc (1998) [FLAC]\07 - John Shirley-Quirk, Los Aneles Philharmonic Orchestra and Esa-Pekka Salonen - Lutoslawski- Les espaces du sommeil.wav
+
+ Pre-gap length 0:00:07.35
+
+ Peak level 66.5 %
+ Extraction speed 2.4 X
+ Track quality 100.0 %
+ Test CRC 916F417F
+ Copy CRC 916F417F
+ Accurately ripped (confidence 5) [4A2EC24D] (AR v2)
+ Copy OK
+
+Track 8
+
+ Filename C:\EAC\Modern Classics - Stravinsky's Les Noces, etc (1998) [FLAC]\08 - Philip Glass Ensemble and Martin Reisman - Glass- Floe.wav
+
+ Pre-gap length 0:00:07.33
+
+ Peak level 83.4 %
+ Extraction speed 2.5 X
+ Track quality 100.0 %
+ Test CRC 320984BC
+ Copy CRC 320984BC
+ Accurately ripped (confidence 5) [B516F43C] (AR v2)
+ Copy OK
+
+Track 9
+
+ Filename C:\EAC\Modern Classics - Stravinsky's Les Noces, etc (1998) [FLAC]\09 - Westminister Abbey Chior and Martin Neary - Tavener- Hymn to the Mother of God.wav
+
+ Pre-gap length 0:00:07.33
+
+ Peak level 47.7 %
+ Extraction speed 2.3 X
+ Track quality 100.0 %
+ Test CRC 3F04210F
+ Copy CRC 3F04210F
+ Accurately ripped (confidence 5) [6241FBD0] (AR v2)
+ Copy OK
+
+Track 10
+
+ Filename C:\EAC\Modern Classics - Stravinsky's Les Noces, etc (1998) [FLAC]\10 - Westminister Abbey Chior and Martin Neary - Tavener- Hymn for the Dormition of the Mother of God.wav
+
+ Peak level 15.1 %
+ Extraction speed 2.6 X
+ Track quality 100.0 %
+ Test CRC FA5DB906
+ Copy CRC FA5DB906
+ Accurately ripped (confidence 5) [40D92044] (AR v2)
+ Copy OK
+
+Track 11
+
+ Filename C:\EAC\Modern Classics - Stravinsky's Les Noces, etc (1998) [FLAC]\11 - Yo-Yo Ma, Imperial Bells Ensemble of China, Yips Children's Choir, Hong Kong Philharmonic Orchestra and Tan Dun - Tan Dun- Symphony 1997, `Heaven Earth Mankind'- Song of P
+
+ Pre-gap length 0:00:07.32
+
+ Peak level 98.8 %
+ Extraction speed 2.8 X
+ Track quality 100.0 %
+ Test CRC 1527E52C
+ Copy CRC 1527E52C
+ Accurately ripped (confidence 5) [9B8379D2] (AR v2)
+ Copy OK
+
+
+All tracks accurately ripped
+
+No errors occurred
+
+End of status report
+
+---- CUETools DB Plugin V2.1.3
+
+[CTDB TOCID: A7fUI4Bw9WkDiwqax05U3EEyntY-] disk not present in database, Submit result: A7fUI4Bw9WkDiwqax05U3EEyntY- has been uploaded
+
+==== Log checksum F56138A858854449A74BA8415C4997E1C79A4C675274AA99E7F61FCD259C5557 ====
\ No newline at end of file
diff --git a/tests/logs/eac/originals/long_filename.log b/tests/logs/eac/originals/long_filename.log
new file mode 100644
index 0000000..eb6521e
Binary files /dev/null and b/tests/logs/eac/originals/long_filename.log differ