diff --git a/src/Logchecker.php b/src/Logchecker.php index 907a0e6..6975cc5 100644 --- a/src/Logchecker.php +++ b/src/Logchecker.php @@ -1991,6 +1991,11 @@ class Logchecker return $this->language; } + public function isCombinedLog(): bool + { + return !is_null($this->Combined) && $this->Combined > 0; + } + public static function getAcceptValues(): string { return ".txt,.TXT,.log,.LOG"; diff --git a/tests/LogcheckerTest.php b/tests/LogcheckerTest.php index ab3b92c..896e557 100644 --- a/tests/LogcheckerTest.php +++ b/tests/LogcheckerTest.php @@ -43,6 +43,7 @@ class LogcheckerTest extends TestCase 'ripper' => $logchecker->getRipper(), 'version' => $logchecker->getRipperVersion(), 'language' => $logchecker->getLanguage(), + 'combined' => $logchecker->isCombinedLog(), 'score' => $logchecker->getScore(), 'checksum' => $logchecker->getChecksumState(), 'details' => $logchecker->getDetails() diff --git a/tests/logs/eac/details/combined_1.json b/tests/logs/eac/details/combined_1.json index 66a9f18..faa359c 100644 --- a/tests/logs/eac/details/combined_1.json +++ b/tests/logs/eac/details/combined_1.json @@ -2,6 +2,7 @@ "ripper": "EAC", "version": "0.99 prebeta 1", "language": "en", + "combined": true, "score": 76, "checksum": "checksum_missing", "details": [ diff --git a/tests/logs/eac/details/cs_1.json b/tests/logs/eac/details/cs_1.json index 597a352..13a3db9 100644 --- a/tests/logs/eac/details/cs_1.json +++ b/tests/logs/eac/details/cs_1.json @@ -2,6 +2,7 @@ "ripper": "EAC", "version": "0.99 prebeta 4", "language": "cs", + "combined": false, "score": 100, "checksum": "checksum_missing", "details": [ diff --git a/tests/logs/eac/details/en_1.json b/tests/logs/eac/details/en_1.json index 158afc0..774cf54 100644 --- a/tests/logs/eac/details/en_1.json +++ b/tests/logs/eac/details/en_1.json @@ -2,6 +2,7 @@ "ripper": "EAC", "version": null, "language": "en", + "combined": false, "score": 59, "checksum": "checksum_missing", "details": [ diff --git a/tests/logs/eac/details/en_2.json b/tests/logs/eac/details/en_2.json index 5c11fa7..8c54461 100644 --- a/tests/logs/eac/details/en_2.json +++ b/tests/logs/eac/details/en_2.json @@ -2,6 +2,7 @@ "ripper": "EAC", "version": "1.3", "language": "en", + "combined": false, "score": 100, "checksum": "checksum_ok", "details": [] diff --git a/tests/logs/eac/details/en_3.json b/tests/logs/eac/details/en_3.json index 1456e5e..7f53b4e 100644 --- a/tests/logs/eac/details/en_3.json +++ b/tests/logs/eac/details/en_3.json @@ -2,6 +2,7 @@ "ripper": "EAC", "version": "1.0 beta 3", "language": "en", + "combined": false, "score": 89, "checksum": "checksum_ok", "details": [ diff --git a/tests/logs/eac/details/en_4.json b/tests/logs/eac/details/en_4.json index ad974bf..56d8758 100644 --- a/tests/logs/eac/details/en_4.json +++ b/tests/logs/eac/details/en_4.json @@ -2,6 +2,7 @@ "ripper": "EAC", "version": "1.0 beta 6", "language": "en", + "combined": false, "score": 100, "checksum": "checksum_ok", "details": [] diff --git a/tests/logs/eac/details/en_5.json b/tests/logs/eac/details/en_5.json index db34994..48ee356 100644 --- a/tests/logs/eac/details/en_5.json +++ b/tests/logs/eac/details/en_5.json @@ -2,6 +2,7 @@ "ripper": "EAC", "version": "0.99 prebeta 5", "language": "en", + "combined": false, "score": 100, "checksum": "checksum_missing", "details": [] diff --git a/tests/logs/eac/details/en_6.json b/tests/logs/eac/details/en_6.json index 7bfb9ca..adebf76 100644 --- a/tests/logs/eac/details/en_6.json +++ b/tests/logs/eac/details/en_6.json @@ -2,6 +2,7 @@ "ripper": "EAC", "version": "1.0 beta 3", "language": "en", + "combined": false, "score": 59, "checksum": "checksum_ok", "details": [ diff --git a/tests/logs/eac/details/pl_1.json b/tests/logs/eac/details/pl_1.json index 2475afd..85070f3 100644 --- a/tests/logs/eac/details/pl_1.json +++ b/tests/logs/eac/details/pl_1.json @@ -2,6 +2,7 @@ "ripper": "EAC", "version": null, "language": "pl", + "combined": false, "score": 4, "checksum": "checksum_missing", "details": [ diff --git a/tests/logs/whipper/details/1.json b/tests/logs/whipper/details/1.json index c424140..bfb531d 100644 --- a/tests/logs/whipper/details/1.json +++ b/tests/logs/whipper/details/1.json @@ -2,6 +2,7 @@ "ripper": "whipper", "version": "0.7.4.dev76+g57d386e", "language": "en", + "combined": false, "score": 100, "checksum": "checksum_ok", "details": [] diff --git a/tests/logs/whipper/details/4.json b/tests/logs/whipper/details/4.json index f47dc12..0392896 100644 --- a/tests/logs/whipper/details/4.json +++ b/tests/logs/whipper/details/4.json @@ -2,6 +2,7 @@ "ripper": "whipper", "version": "0.7.3", "language": "en", + "combined": false, "score": 100, "checksum": "checksum_ok", "details": [] diff --git a/tests/logs/whipper/details/invalid_hash.json b/tests/logs/whipper/details/invalid_hash.json index 4f70d0e..916e08d 100644 --- a/tests/logs/whipper/details/invalid_hash.json +++ b/tests/logs/whipper/details/invalid_hash.json @@ -2,6 +2,7 @@ "ripper": "whipper", "version": "0.7.4.dev76+g57d386e", "language": "en", + "combined": false, "score": 100, "checksum": "checksum_invalid", "details": [] diff --git a/tests/logs/whipper/details/missing_hash.json b/tests/logs/whipper/details/missing_hash.json index 005201c..b2660ca 100644 --- a/tests/logs/whipper/details/missing_hash.json +++ b/tests/logs/whipper/details/missing_hash.json @@ -2,6 +2,7 @@ "ripper": "whipper", "version": "0.7.4.dev76+g57d386e", "language": "en", + "combined": false, "score": 100, "checksum": "checksum_missing", "details": [] diff --git a/tests/logs/xld/details/old_no_checksum.json b/tests/logs/xld/details/old_no_checksum.json index 5c73cab..7d4235f 100644 --- a/tests/logs/xld/details/old_no_checksum.json +++ b/tests/logs/xld/details/old_no_checksum.json @@ -2,6 +2,7 @@ "ripper": "XLD", "version": "20100711", "language": "en", + "combined": false, "score": 100, "checksum": "checksum_missing", "details": [] diff --git a/tests/logs/xld/details/xld_perfect.json b/tests/logs/xld/details/xld_perfect.json index 38791b2..d96e0c7 100644 --- a/tests/logs/xld/details/xld_perfect.json +++ b/tests/logs/xld/details/xld_perfect.json @@ -2,6 +2,7 @@ "ripper": "XLD", "version": "20161007", "language": "en", + "combined": false, "score": 100, "checksum": "checksum_ok", "details": [] diff --git a/tests/logs/xld/details/xld_perfect_2.json b/tests/logs/xld/details/xld_perfect_2.json index a0998f9..e2594d5 100644 --- a/tests/logs/xld/details/xld_perfect_2.json +++ b/tests/logs/xld/details/xld_perfect_2.json @@ -2,6 +2,7 @@ "ripper": "XLD", "version": "20181019", "language": "en", + "combined": false, "score": 100, "checksum": "checksum_ok", "details": []