Compare commits

..
4 Commits
Author SHA1 Message Date
itismadness 97741692df 0.9.5 release 2020-09-24 07:31:37 +00:00
itismadness 8d97ac3b9e fix whipper log output messing up last track 2020-09-24 07:02:22 +00:00
itismadness 03133c5184 0.9.4 2020-05-24 06:23:10 +01:00
itismadness afb9fc8a4f wrap getLanguage call with try/catch and fallback to en default 2020-05-24 06:22:03 +01:00
7 changed files with 71 additions and 63 deletions

No files matched your search

+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "orpheusnet/logchecker",
"description": "Logchecker for validating logs generated from supported ripping programs (like EAC and XLD)",
"version": "0.9.3",
"version": "0.9.5",
"license": "Unlicense",
"type": "library",
"authors": [
Generated
+29 -29
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "cf86be9f969915a6352efc74903d5f86",
"content-hash": "f5c4077db4231ebf6281fc6e59924228",
"packages": [
{
"name": "psr/container",
@@ -147,16 +147,16 @@
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.15.0",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14"
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
"reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"shasum": ""
},
"require": {
@@ -168,7 +168,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.15-dev"
"dev-master": "1.17-dev"
}
},
"autoload": {
@@ -215,20 +215,20 @@
"type": "tidelift"
}
],
"time": "2020-02-27T09:26:54+00:00"
"time": "2020-05-12T16:14:59+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.15.0",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac"
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
"reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
"shasum": ""
},
"require": {
@@ -240,7 +240,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.15-dev"
"dev-master": "1.17-dev"
}
},
"autoload": {
@@ -288,20 +288,20 @@
"type": "tidelift"
}
],
"time": "2020-03-09T19:04:49+00:00"
"time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/polyfill-php73",
"version": "v1.15.0",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
"reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7"
"reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
"reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
"reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
"shasum": ""
},
"require": {
@@ -310,7 +310,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.15-dev"
"dev-master": "1.17-dev"
}
},
"autoload": {
@@ -360,7 +360,7 @@
"type": "tidelift"
}
],
"time": "2020-02-27T09:26:54+00:00"
"time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/process",
@@ -1046,16 +1046,16 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.19",
"version": "0.12.25",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d"
"reference": "9619551d68b2d4c0d681a8df73f3c847c798ee64"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d",
"reference": "054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/9619551d68b2d4c0d681a8df73f3c847c798ee64",
"reference": "9619551d68b2d4c0d681a8df73f3c847c798ee64",
"shasum": ""
},
"require": {
@@ -1098,7 +1098,7 @@
"type": "tidelift"
}
],
"time": "2020-04-19T20:35:10+00:00"
"time": "2020-05-10T20:36:16+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -1354,16 +1354,16 @@
},
{
"name": "phpunit/phpunit",
"version": "8.5.4",
"version": "8.5.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "8474e22d7d642f665084ba5ec780626cbd1efd23"
"reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8474e22d7d642f665084ba5ec780626cbd1efd23",
"reference": "8474e22d7d642f665084ba5ec780626cbd1efd23",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34c18baa6a44f1d1fbf0338907139e9dce95b997",
"reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997",
"shasum": ""
},
"require": {
@@ -1443,7 +1443,7 @@
"type": "github"
}
],
"time": "2020-04-23T04:39:42+00:00"
"time": "2020-06-22T07:06:58+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
+19 -11
View File
@@ -3,6 +3,7 @@
namespace OrpheusNET\Logchecker;
use OrpheusNET\Logchecker\Check\Ripper;
use OrpheusNET\Logchecker\Exception\UnknownLanguageException;
use OrpheusNET\Logchecker\Exception\UnknownRipperException;
use OrpheusNET\Logchecker\Parser\EAC\Translator;
use Symfony\Component\Yaml\Yaml;
@@ -260,6 +261,7 @@ class Logchecker
$Track[$Key] = "<span class='log1'>{$Track[$Key]}</span>";
}
}
unset($Track);
// Tracks
foreach ($Yaml['Tracks'] as &$Track) {
@@ -296,6 +298,7 @@ class Logchecker
}
}
}
unset($Track);
// Conclusive status report
$Key = 'Conclusive status report';
@@ -366,17 +369,22 @@ class Logchecker
{
if ($this->ripper === Ripper::EAC) {
$translator = new Translator();
$lang = $translator->getLanguage($this->log);
if ($lang['code'] !== 'en') {
$this->language = $lang['code'];
$this->account(
"Translated log from {$lang['name']} ({$lang['name_english']}) to English.",
false,
false,
false,
true
);
$this->log = $translator->translate($this->log, $lang['code']);
try {
$lang = $translator->getLanguage($this->log);
if ($lang['code'] !== 'en') {
$this->language = $lang['code'];
$this->account(
"Translated log from {$lang['name']} ({$lang['name_english']}) to English.",
false,
false,
false,
true
);
$this->log = $translator->translate($this->log, $lang['code']);
}
} catch (UnknownLanguageException $exc) {
$this->language = 'en';
$this->account('Could not determine language. Assuming English.', false, false, false, true);
}
}
+4 -4
View File
@@ -361,14 +361,14 @@ Tracks:
Status: <span class='good'>Copy OK</span>
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>
Peak level: <span class='log3'>1.000000</span>
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>
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:
Result: <span class='badish'>Track not present in AccurateRip database</span>
AccurateRip v2:
+10 -10
View File
@@ -348,24 +348,24 @@ Tracks:
Status: <span class='good'>Copy OK</span>
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>
Peak level: <span class='log3'>0.999969</span>
Peak level: <span class='log3'>0.986694</span>
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>
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:
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:
Result: <span class='good'>Found, exact match</span>
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>
Conclusive status report:
+4 -4
View File
@@ -361,14 +361,14 @@ Tracks:
Status: <span class='good'>Copy OK</span>
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>
Peak level: <span class='log3'>1.000000</span>
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>
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:
Result: <span class='badish'>Track not present in AccurateRip database</span>
AccurateRip v2:
+4 -4
View File
@@ -361,14 +361,14 @@ Tracks:
Status: <span class='good'>Copy OK</span>
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>
Peak level: <span class='log3'>1.000000</span>
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>
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:
Result: <span class='badish'>Track not present in AccurateRip database</span>
AccurateRip v2: