@@ -52,7 +52,8 @@ def logRip(self, ripResult, epoch):
52
52
# Ripper version
53
53
# ATM differs from EAC's typical log line
54
54
from morituri .configure import configure
55
- lines .append ("morituri version %s (eac logger)" % configure .version )
55
+ lines .append ("morituri version %s (eac logger 0.3.1)" %
56
+ configure .version )
56
57
lines .append ("" )
57
58
58
59
# Rip date
@@ -77,11 +78,9 @@ def logRip(self, ripResult, epoch):
77
78
# Extra line (not included in EAC's logfiles)
78
79
lines .append ("Use cdparanoia mode : Yes (cdparanoia %s)" % (
79
80
ripResult .cdparanoiaVersion ))
80
- defeat = "Unknown "
81
- if ripResult .cdparanoiaDefeatsCache is True :
81
+ defeat = "No "
82
+ if ripResult .cdparanoiaDefeatsCache :
82
83
defeat = "Yes"
83
- if ripResult .cdparanoiaDefeatsCache is False :
84
- defeat = "No"
85
84
lines .append ("Defeat audio cache : %s" % defeat )
86
85
lines .append ("Make use of C2 pointers : No" )
87
86
lines .append ("" )
@@ -165,6 +164,7 @@ def logRip(self, ripResult, epoch):
165
164
lines .append ('' )
166
165
167
166
# AccurateRip summary at the end of the logfile
167
+ lines .append ("" )
168
168
if self ._inARDatabase == 0 :
169
169
lines .append ("None of the tracks are present "
170
170
"in the AccurateRip database" )
@@ -189,7 +189,8 @@ def logRip(self, ripResult, epoch):
189
189
lines .append ("All tracks accurately ripped" )
190
190
lines .append ("" )
191
191
192
- # FIXME: ATM this will always pick else (when does EAC report errors?)
192
+ # FIXME: ATM this will always pick else
193
+ # When does EAC report errors? (only on abort?)
193
194
if self ._errors :
194
195
lines .append ("There were errors" )
195
196
else :
@@ -204,6 +205,7 @@ def logRip(self, ripResult, epoch):
204
205
205
206
# Log checksum (uppercase hex encoded SHA256 hash of all lines)
206
207
# It isn't compatible with EAC's one: checklog fail
208
+ lines .append ("" )
207
209
hasher = hashlib .sha256 ()
208
210
hasher .update ("\n " .join (lines ).encode ("utf-8" ))
209
211
lines .append ("==== Log checksum %s ====" % hasher .hexdigest ().upper ())
@@ -217,10 +219,7 @@ def trackLog(self, trackResult):
217
219
lines = []
218
220
219
221
# Track number (formatting like EAC's one)
220
- if trackResult .number < 10 :
221
- lines .append ("Track %2d" % trackResult .number )
222
- else :
223
- lines .append ("Track %2d" % trackResult .number )
222
+ lines .append ("Track %2d" % trackResult .number )
224
223
lines .append ("" )
225
224
226
225
# Filename (including path) of ripped track
@@ -283,7 +282,7 @@ def trackLog(self, trackResult):
283
282
else :
284
283
lines .append (" Track not present in AccurateRip database" )
285
284
286
- # EAC emits 0 warnings even when a CRC mismatch occurs
285
+ # EAC emits zero warnings even when a CRC mismatch occurs
287
286
if trackResult .testcrc == trackResult .copycrc :
288
287
lines .append (" Copy OK" )
289
288
return lines
0 commit comments