Browse Source

fix whipper log output messing up last track

tags/0.9.5
itismadness 4 years ago
parent
commit
8d97ac3b9e
5 changed files with 24 additions and 22 deletions
  1. +2
    -0
      src/Logchecker.php
  2. +4
    -4
      tests/logs/whipper/html/1.log
  3. +10
    -10
      tests/logs/whipper/html/4.log
  4. +4
    -4
      tests/logs/whipper/html/invalid_hash.log
  5. +4
    -4
      tests/logs/whipper/html/missing_hash.log

+ 2
- 0
src/Logchecker.php View File

@@ -261,6 +261,7 @@ class Logchecker
$Track[$Key] = "<span class='log1'>{$Track[$Key]}</span>"; $Track[$Key] = "<span class='log1'>{$Track[$Key]}</span>";
} }
} }
unset($Track);


// Tracks // Tracks
foreach ($Yaml['Tracks'] as &$Track) { foreach ($Yaml['Tracks'] as &$Track) {
@@ -297,6 +298,7 @@ class Logchecker
} }
} }
} }
unset($Track);


// Conclusive status report // Conclusive status report
$Key = 'Conclusive status report'; $Key = 'Conclusive status report';


+ 4
- 4
tests/logs/whipper/html/1.log View File

@@ -361,14 +361,14 @@ Tracks:
Status: <span class='good'>Copy OK</span> Status: <span class='good'>Copy OK</span>


17: 17:
Filename: <span class='log3'>./album/Not on Tour - Growing Pains/16. Not on Tour - Sign.flac</span>
Filename: <span class='log3'>./album/Not on Tour - Growing Pains/17. Not on Tour - Waste Your Time With Me.flac</span>
Pre-gap length: <span class='log3'>00:02:00</span> Pre-gap length: <span class='log3'>00:02:00</span>
Peak level: <span class='log3'>1.000000</span> Peak level: <span class='log3'>1.000000</span>
Pre-emphasis: No Pre-emphasis: No
Extraction speed: <span class='log3'>3.3 X</span>
Extraction speed: <span class='log3'>3.5 X</span>
Extraction quality: <span class='log3'>100.00 %</span> Extraction quality: <span class='log3'>100.00 %</span>
Test CRC: <span class='good'>ED475001</span>
Copy CRC: <span class='good'>ED475001</span>
Test CRC: <span class='good'>DFDD20E0</span>
Copy CRC: <span class='good'>DFDD20E0</span>
AccurateRip v1: AccurateRip v1:
Result: <span class='badish'>Track not present in AccurateRip database</span> Result: <span class='badish'>Track not present in AccurateRip database</span>
AccurateRip v2: AccurateRip v2:


+ 10
- 10
tests/logs/whipper/html/4.log View File

@@ -348,24 +348,24 @@ Tracks:
Status: <span class='good'>Copy OK</span> Status: <span class='good'>Copy OK</span>


13: 13:
Filename: <span class='log3'>./soundtrack/Various Artists - Shark Tale - Motion Picture Soundtrack/12. Cheryl Lynn - Sweet Kind of Life.flac</span>
Filename: <span class='log3'>./soundtrack/Various Artists - Shark Tale - Motion Picture Soundtrack/13. Hans Zimmer - Some of My Best Friends Are Sharks.flac</span>
Pre-gap length: <span class='log3'>00:00:74</span> Pre-gap length: <span class='log3'>00:00:74</span>
Peak level: <span class='log3'>0.999969</span>
Peak level: <span class='log3'>0.986694</span>
Pre-emphasis: No Pre-emphasis: No
Extraction speed: <span class='log3'>11.3 X</span>
Extraction speed: <span class='log3'>12.1 X</span>
Extraction quality: <span class='log3'>100.00 %</span> Extraction quality: <span class='log3'>100.00 %</span>
Test CRC: <span class='good'>4F8B805C</span>
Copy CRC: <span class='good'>4F8B805C</span>
Test CRC: <span class='good'>A6755B8E</span>
Copy CRC: <span class='good'>A6755B8E</span>
AccurateRip v1: AccurateRip v1:
Result: <span class='good'>Found, exact match</span> Result: <span class='good'>Found, exact match</span>
Confidence: 14
Local CRC: <span class='goodish'>D2765DE4</span>
Remote CRC: <span class='goodish'>D2765DE4</span>
Confidence: 13
Local CRC: <span class='goodish'>010845D0</span>
Remote CRC: <span class='goodish'>010845D0</span>
AccurateRip v2: AccurateRip v2:
Result: <span class='good'>Found, exact match</span> Result: <span class='good'>Found, exact match</span>
Confidence: 10 Confidence: 10
Local CRC: <span class='goodish'>B0323938</span>
Remote CRC: <span class='goodish'>B0323938</span>
Local CRC: <span class='goodish'>1131D8D8</span>
Remote CRC: <span class='goodish'>1131D8D8</span>
Status: <span class='good'>Copy OK</span> Status: <span class='good'>Copy OK</span>


Conclusive status report: Conclusive status report:


+ 4
- 4
tests/logs/whipper/html/invalid_hash.log View File

@@ -361,14 +361,14 @@ Tracks:
Status: <span class='good'>Copy OK</span> Status: <span class='good'>Copy OK</span>


17: 17:
Filename: <span class='log3'>./album/Not on Tour - Growing Pains/16. Not on Tour - Sign.flac</span>
Filename: <span class='log3'>./album/Not on Tour - Growing Pains/17. Not on Tour - Waste Your Time With Me.flac</span>
Pre-gap length: <span class='log3'>00:02:00</span> Pre-gap length: <span class='log3'>00:02:00</span>
Peak level: <span class='log3'>1.000000</span> Peak level: <span class='log3'>1.000000</span>
Pre-emphasis: No Pre-emphasis: No
Extraction speed: <span class='log3'>3.3 X</span>
Extraction speed: <span class='log3'>3.5 X</span>
Extraction quality: <span class='log3'>100.00 %</span> Extraction quality: <span class='log3'>100.00 %</span>
Test CRC: <span class='good'>ED475001</span>
Copy CRC: <span class='good'>ED475001</span>
Test CRC: <span class='good'>DFDD20E0</span>
Copy CRC: <span class='good'>DFDD20E0</span>
AccurateRip v1: AccurateRip v1:
Result: <span class='badish'>Track not present in AccurateRip database</span> Result: <span class='badish'>Track not present in AccurateRip database</span>
AccurateRip v2: AccurateRip v2:


+ 4
- 4
tests/logs/whipper/html/missing_hash.log View File

@@ -361,14 +361,14 @@ Tracks:
Status: <span class='good'>Copy OK</span> Status: <span class='good'>Copy OK</span>


17: 17:
Filename: <span class='log3'>./album/Not on Tour - Growing Pains/16. Not on Tour - Sign.flac</span>
Filename: <span class='log3'>./album/Not on Tour - Growing Pains/17. Not on Tour - Waste Your Time With Me.flac</span>
Pre-gap length: <span class='log3'>00:02:00</span> Pre-gap length: <span class='log3'>00:02:00</span>
Peak level: <span class='log3'>1.000000</span> Peak level: <span class='log3'>1.000000</span>
Pre-emphasis: No Pre-emphasis: No
Extraction speed: <span class='log3'>3.3 X</span>
Extraction speed: <span class='log3'>3.5 X</span>
Extraction quality: <span class='log3'>100.00 %</span> Extraction quality: <span class='log3'>100.00 %</span>
Test CRC: <span class='good'>ED475001</span>
Copy CRC: <span class='good'>ED475001</span>
Test CRC: <span class='good'>DFDD20E0</span>
Copy CRC: <span class='good'>DFDD20E0</span>
AccurateRip v1: AccurateRip v1:
Result: <span class='badish'>Track not present in AccurateRip database</span> Result: <span class='badish'>Track not present in AccurateRip database</span>
AccurateRip v2: AccurateRip v2:


Loading…
Cancel
Save