Lower threshold for using chardet encoding

2026-11-07 06:16:01 -10:00 · 2025-10-13 23:02:58 +00:00
1 parent 66d93bc78d
commit e802bc947f
@@ -19,7 +19,6 @@ class Util
        } catch (\RuntimeException $exc) {
            $chardet = null;
        }
-        /** @var Chardet $chardet */

        // Whipper uses UTF-8 so we don't need to bother checking, especially as it's
        // possible a log may be falsely detected as a different encoding by chardet
@@ -38,29 +37,31 @@ class Util
            $log = substr($log, 3);
        } elseif ($chardet !== null) {
            $results = $chardet->analyze($logPath);
-            if ($results['charset'] !== 'utf-8' && $results['confidence'] > 0.7) {
-                // ideally we'd be able to use mb_convert_encoding as it has more widespread
-                // support vs iconv, but it does not support as many encodings as iconv, such
-                // as Windows-1250 (along with others) which is a common encoding for range logs
-                // coming from rutracker
-                // $log = mb_convert_encoding($log, 'UTF-8', $results['charset']);
-                $tmp = @iconv($results['charset'], 'UTF-8', $log);
+            if ($results['charset'] !== 'utf-8') {
+                if ($results['confidence'] > 0.6) {
+                    // ideally we'd be able to use mb_convert_encoding as it has more widespread
+                    // support vs iconv, but it does not support as many encodings as iconv, such
+                    // as Windows-1250 (along with others) which is a common encoding for range logs
+                    // coming from rutracker
+                    // $log = mb_convert_encoding($log, 'UTF-8', $results['charset']);
+                    $tmp = @iconv($results['charset'], 'UTF-8', $log);

-                // depending on your iconv version, some encodings may be represented
-                // with prefix of mac-* or mac (like maccentraleurope vs mac-centraleurope)
-                if ($tmp === false && substr($results['charset'], 0, 3) === 'mac') {
-                    $tmp = @iconv('mac-' . substr($results['charset'], 3), 'UTF-8', $log);
+                    // depending on your iconv version, some encodings may be represented
+                    // with prefix of mac-* or mac (like maccentraleurope vs mac-centraleurope)
+                    if ($tmp === false && substr($results['charset'], 0, 3) === 'mac') {
+                        $tmp = @iconv('mac-' . substr($results['charset'], 3), 'UTF-8', $log);
+                    }
+                    $log = $tmp;
+                    if ($log === false) {
+                        throw new \RuntimeException('Could not properly decode log encoding');
+                    }
+                } elseif ($results['charset'] !== 'utf-8' && $results['confidence'] > 0.3) {
+                    // If we've got a poor confidence on our decoding, we just use a generic
+                    // ISO-8859-1 as that covers a decent range of things that people would
+                    // inadvertently re-encode a log into. I seriously cannot express how
+                    // much I hate how EAC does not use always UTF-8.
+                    $log = iconv('ISO-8859-1', 'UTF-8', $log);
                }
-                $log = $tmp;
-                if ($log === false) {
-                    throw new \RuntimeException('Could not properly decode log encoding');
-                }
-            } elseif ($results['charset'] !== 'utf-8' && $results['confidence'] > 0.3) {
-                // If we've got a poor confidence on our decoding, we just use a generic
-                // ISO-8859-1 as that covers a decent range of things that people would
-                // inadvertently re-encode a log into. I seriously cannot express how
-                // much I hate how EAC does not use always UTF-8.
-                $log = iconv('ISO-8859-1', 'UTF-8', $log);
            }
        }

@@ -0,0 +1,19 @@
+{
+    "ripper": "EAC",
+    "version": "0.99 prebeta 1",
+    "language": "ru",
+    "combined": false,
+    "score": 55,
+    "checksum": "checksum_missing",
+    "details": [
+        "[Notice] Translated log from \u0420\u0443\u0441\u0441\u043a\u0438\u0439 (Russian) to English.",
+        "\"Defeat audio cache\" should be yes (-10 points)",
+        "C2 pointers were used (-10 points)",
+        "Could not verify read offset (-1 point)",
+        "Combined read\/write offset cannot be verified (-4 points)",
+        "Could not verify null samples",
+        "Gap handling was not detected (-10 points)",
+        "Could not verify id3 tag setting",
+        "Test and copy was not used (-10 points)"
+    ]
+}
@@ -0,0 +1,152 @@
+Exact Audio Copy <span class="log1">V0.99 prebeta 1</span> from <span class="log1">25. May 2007</span>
+
+<span class='good'>EAC extraction logfile from <span class='log5'>10. March 2010, 12:34</span></span>
+
+<span class="log4">Unknown Artist / Unknown Title</span>
+
+<span class="log5">Used Drive  </span>: <span class="good">_NEC    DVD_RW ND-4571A   Adapter: 0  ID: 0</span>
+
+<span class="log5">Read mode                 </span>: <span class="good">Secure</span>
+<span class="log5">Utilize accurate stream </span>: <span class="good">Yes</span>
+<span class="log5">Defeat audio cache        </span>: <span class="bad">No</span>
+<span class="log5">Make use of C2 pointers  </span>: <span class="bad">Yes</span>
+
+<span class="bad">Combined read/write offset correction        : 0</span>
+<span class="log5">Overread into Lead-In and Lead-Out </span>: <span class="log4">No</span>
+<span class="log5">Fill up missing offset samples with silence        </span>: <span class="good">Yes</span>
+<span class="log5">Delete leading and trailing silent blocks    </span>: <span class="good">No</span>
+<span class="log5">Used interface                                     </span>: <span class="log4">Native Win32 interface for Win NT & 2000</span>
+<span class="log5">Gap handling                             </span>: <span class="bad">Not detected, thus appended to previous track</span>
+
+<span class="log5">Used output format </span>: <span class="log4">Internal WAV Routines</span>
+<span class="log5">Sample format  </span>: <span class="log4">44.100 Hz; 16 Bit; Stereo</span>
+
+
+<span class="log4 log5">TOC of the extracted CD</span>
+
+<strong>     Track |   Start  | Length | Start sector | End sector </strong>
+    <strong>---------------------------------------------------------------------</strong>
+       <span class="log4">1</span>  <strong>|</strong>  <span class="log1">0:00.00</span> <strong>|</strong>    <span class="log1">6:54.17</span>   <strong>|</strong>           <span class="log1">0</span>      <strong>|</strong>      <span class="log1">31066</span>      
+       <span class="log4">2</span>  <strong>|</strong>  <span class="log1">6:54.17</span> <strong>|</strong>    <span class="log1">5:33.72</span>   <strong>|</strong>       <span class="log1">31067</span>      <strong>|</strong>      <span class="log1">56113</span>      
+       <span class="log4">3</span>  <strong>|</strong> <span class="log1">12:28.14</span> <strong>|</strong>    <span class="log1">3:46.71</span>   <strong>|</strong>       <span class="log1">56114</span>      <strong>|</strong>      <span class="log1">73134</span>      
+       <span class="log4">4</span>  <strong>|</strong> <span class="log1">16:15.10</span> <strong>|</strong>    <span class="log1">6:46.27</span>   <strong>|</strong>       <span class="log1">73135</span>      <strong>|</strong>     <span class="log1">103611</span>      
+       <span class="log4">5</span>  <strong>|</strong> <span class="log1">23:01.37</span> <strong>|</strong>    <span class="log1">6:05.59</span>   <strong>|</strong>      <span class="log1">103612</span>      <strong>|</strong>     <span class="log1">131045</span>      
+       <span class="log4">6</span>  <strong>|</strong> <span class="log1">29:07.21</span> <strong>|</strong>    <span class="log1">6:06.74</span>   <strong>|</strong>      <span class="log1">131046</span>      <strong>|</strong>     <span class="log1">158569</span>      
+       <span class="log4">7</span>  <strong>|</strong> <span class="log1">35:14.20</span> <strong>|</strong>    <span class="log1">4:10.03</span>   <strong>|</strong>      <span class="log1">158570</span>      <strong>|</strong>     <span class="log1">177322</span>      
+       <span class="log4">8</span>  <strong>|</strong> <span class="log1">39:24.23</span> <strong>|</strong>    <span class="log1">4:15.52</span>   <strong>|</strong>      <span class="log1">177323</span>      <strong>|</strong>     <span class="log1">196499</span>      
+       <span class="log4">9</span>  <strong>|</strong> <span class="log1">43:40.00</span> <strong>|</strong>    <span class="log1">7:47.55</span>   <strong>|</strong>      <span class="log1">196500</span>      <strong>|</strong>     <span class="log1">231579</span>      
+      <span class="log4">10</span>  <strong>|</strong> <span class="log1">51:27.55</span> <strong>|</strong>    <span class="log1">5:41.56</span>   <strong>|</strong>      <span class="log1">231580</span>      <strong>|</strong>     <span class="log1">257210</span>      
+      <span class="log4">11</span>  <strong>|</strong> <span class="log1">57:09.36</span> <strong>|</strong>    <span class="log1">7:47.53</span>   <strong>|</strong>      <span class="log1">257211</span>      <strong>|</strong>     <span class="log1">292288</span>      
+      <span class="log4">12</span>  <strong>|</strong> <span class="log1">64:57.14</span> <strong>|</strong>   <span class="log1">10:59.02</span>   <strong>|</strong>      <span class="log1">292289</span>      <strong>|</strong>     <span class="log1">341715</span>      
+
+
+<span class="log5">Track</span>  <span class="log4 log1">1</span>
+
+     <span class="log4">Filename <span class="log3">C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track01.wav</span></span>
+
+     <span class="log4">Peak level <span class="log3">99.9 %</span></span>
+     <span class="log4">Track quality <span class="log3">100.0 %</span></span>
+     <span class="log4">Copy CRC <span class="log3">37374B7A</span></span>
+     <span class="good">Copy OK</span>
+
+<span class="log5">Track</span>  <span class="log4 log1">2</span>
+
+     <span class="log4">Filename <span class="log3">C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track02.wav</span></span>
+
+     <span class="log4">Peak level <span class="log3">99.9 %</span></span>
+     <span class="log4">Track quality <span class="log3">100.0 %</span></span>
+     <span class="log4">Copy CRC <span class="log3">D7016D6A</span></span>
+     <span class="good">Copy OK</span>
+
+<span class="log5">Track</span>  <span class="log4 log1">3</span>
+
+     <span class="log4">Filename <span class="log3">C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track03.wav</span></span>
+
+     <span class="log4">Peak level <span class="log3">99.9 %</span></span>
+     <span class="log4">Track quality <span class="log3">99.9 %</span></span>
+     <span class="log4">Copy CRC <span class="log3">522AB415</span></span>
+     <span class="good">Copy OK</span>
+
+<span class="log5">Track</span>  <span class="log4 log1">4</span>
+
+     <span class="log4">Filename <span class="log3">C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track04.wav</span></span>
+
+     <span class="log4">Peak level <span class="log3">99.9 %</span></span>
+     <span class="log4">Track quality <span class="log3">100.0 %</span></span>
+     <span class="log4">Copy CRC <span class="log3">56E839AA</span></span>
+     <span class="good">Copy OK</span>
+
+<span class="log5">Track</span>  <span class="log4 log1">5</span>
+
+     <span class="log4">Filename <span class="log3">C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track05.wav</span></span>
+
+     <span class="log4">Peak level <span class="log3">99.9 %</span></span>
+     <span class="log4">Track quality <span class="log3">100.0 %</span></span>
+     <span class="log4">Copy CRC <span class="log3">5BB3F2A7</span></span>
+     <span class="good">Copy OK</span>
+
+<span class="log5">Track</span>  <span class="log4 log1">6</span>
+
+     <span class="log4">Filename <span class="log3">C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track06.wav</span></span>
+
+     <span class="log4">Peak level <span class="log3">99.9 %</span></span>
+     <span class="log4">Track quality <span class="log3">100.0 %</span></span>
+     <span class="log4">Copy CRC <span class="log3">C3D0197E</span></span>
+     <span class="good">Copy OK</span>
+
+<span class="log5">Track</span>  <span class="log4 log1">7</span>
+
+     <span class="log4">Filename <span class="log3">C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track07.wav</span></span>
+
+     <span class="log4">Peak level <span class="log3">99.9 %</span></span>
+     <span class="log4">Track quality <span class="log3">100.0 %</span></span>
+     <span class="log4">Copy CRC <span class="log3">F9D68CEA</span></span>
+     <span class="good">Copy OK</span>
+
+<span class="log5">Track</span>  <span class="log4 log1">8</span>
+
+     <span class="log4">Filename <span class="log3">C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track08.wav</span></span>
+
+     <span class="log4">Peak level <span class="log3">99.9 %</span></span>
+     <span class="log4">Track quality <span class="log3">100.0 %</span></span>
+     <span class="log4">Copy CRC <span class="log3">CD24B722</span></span>
+     <span class="good">Copy OK</span>
+
+<span class="log5">Track</span>  <span class="log4 log1">9</span>
+
+     <span class="log4">Filename <span class="log3">C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track09.wav</span></span>
+
+     <span class="log4">Peak level <span class="log3">99.9 %</span></span>
+     <span class="log4">Track quality <span class="log3">100.0 %</span></span>
+     <span class="log4">Copy CRC <span class="log3">DC1D7CA3</span></span>
+     <span class="good">Copy OK</span>
+
+<span class="log5">Track</span> <span class="log4 log1">10</span>
+
+     <span class="log4">Filename <span class="log3">C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track10.wav</span></span>
+
+     <span class="log4">Peak level <span class="log3">99.9 %</span></span>
+     <span class="log4">Track quality <span class="log3">100.0 %</span></span>
+     <span class="log4">Copy CRC <span class="log3">E736E801</span></span>
+     <span class="good">Copy OK</span>
+
+<span class="log5">Track</span> <span class="log4 log1">11</span>
+
+     <span class="log4">Filename <span class="log3">C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track11.wav</span></span>
+
+     <span class="log4">Peak level <span class="log3">99.9 %</span></span>
+     <span class="log4">Track quality <span class="log3">100.0 %</span></span>
+     <span class="log4">Copy CRC <span class="log3">DEDA10BB</span></span>
+     <span class="good">Copy OK</span>
+
+<span class="log5">Track</span> <span class="log4 log1">12</span>
+
+     <span class="log4">Filename <span class="log3">C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track12.wav</span></span>
+
+     <span class="log4">Peak level <span class="log3">99.9 %</span></span>
+     <span class="log4">Track quality <span class="log3">100.0 %</span></span>
+     <span class="log4">Copy CRC <span class="log3">8E4C6F91</span></span>
+     <span class="good">Copy OK</span>
+
+<span class="good">No errors occurred</span>
+<span class="good">End of status report</span>
@@ -0,0 +1,153 @@
+Exact Audio Copy V0.99 prebeta 1 from 25. May 2007
+
+Отчёт EAC об извлечении, выполненном 10. марта 2010, 12:34
+
+Unknown Artist / Unknown Title
+
+Дисковод: _NEC    DVD_RW ND-4571A   Adapter: 0  ID: 0
+
+Режим чтения                 : Достоверность
+Использование точного потока : Да
+Отключение кэша аудио        : Нет
+Использование указателей C2  : Да
+
+Комбинированное смещение чтения/записи        : 0
+Способность читать области Lead-in и Lead-out : Нет
+Заполнение пропущенных сэмплов тишиной        : Да
+Удаление блоков с тишиной в начале и конце    : Нет
+Интерфейс                                     : Встроенный Win32-интерфейс для Win NT/2000
+Обработка зазоров                             : Не обнаружено, добавлено к предыдущему треку
+
+Выходной формат : Внутренние WAV-операции
+Формат сэмплов  : 44.100 Гц; 16 бит; стерео
+
+
+TOC извлечённого CD
+
+     Трек |   Старт  | Длительность | Начальный сектор | Конечный сектор 
+    ---------------------------------------------------------------------
+       1  |  0:00.00 |    6:54.17   |           0      |      31066      
+       2  |  6:54.17 |    5:33.72   |       31067      |      56113      
+       3  | 12:28.14 |    3:46.71   |       56114      |      73134      
+       4  | 16:15.10 |    6:46.27   |       73135      |     103611      
+       5  | 23:01.37 |    6:05.59   |      103612      |     131045      
+       6  | 29:07.21 |    6:06.74   |      131046      |     158569      
+       7  | 35:14.20 |    4:10.03   |      158570      |     177322      
+       8  | 39:24.23 |    4:15.52   |      177323      |     196499      
+       9  | 43:40.00 |    7:47.55   |      196500      |     231579      
+      10  | 51:27.55 |    5:41.56   |      231580      |     257210      
+      11  | 57:09.36 |    7:47.53   |      257211      |     292288      
+      12  | 64:57.14 |   10:59.02   |      292289      |     341715      
+
+
+Трек  1
+
+     Имя файла C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track01.wav
+
+     Пиковый уровень 99.9 %
+     Качество трека 100.0 %
+     CRC копии 37374B7A
+     Копирование... OK
+
+Трек  2
+
+     Имя файла C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track02.wav
+
+     Пиковый уровень 99.9 %
+     Качество трека 100.0 %
+     CRC копии D7016D6A
+     Копирование... OK
+
+Трек  3
+
+     Имя файла C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track03.wav
+
+     Пиковый уровень 99.9 %
+     Качество трека 99.9 %
+     CRC копии 522AB415
+     Копирование... OK
+
+Трек  4
+
+     Имя файла C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track04.wav
+
+     Пиковый уровень 99.9 %
+     Качество трека 100.0 %
+     CRC копии 56E839AA
+     Копирование... OK
+
+Трек  5
+
+     Имя файла C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track05.wav
+
+     Пиковый уровень 99.9 %
+     Качество трека 100.0 %
+     CRC копии 5BB3F2A7
+     Копирование... OK
+
+Трек  6
+
+     Имя файла C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track06.wav
+
+     Пиковый уровень 99.9 %
+     Качество трека 100.0 %
+     CRC копии C3D0197E
+     Копирование... OK
+
+Трек  7
+
+     Имя файла C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track07.wav
+
+     Пиковый уровень 99.9 %
+     Качество трека 100.0 %
+     CRC копии F9D68CEA
+     Копирование... OK
+
+Трек  8
+
+     Имя файла C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track08.wav
+
+     Пиковый уровень 99.9 %
+     Качество трека 100.0 %
+     CRC копии CD24B722
+     Копирование... OK
+
+Трек  9
+
+     Имя файла C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track09.wav
+
+     Пиковый уровень 99.9 %
+     Качество трека 100.0 %
+     CRC копии DC1D7CA3
+     Копирование... OK
+
+Трек 10
+
+     Имя файла C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track10.wav
+
+     Пиковый уровень 99.9 %
+     Качество трека 100.0 %
+     CRC копии E736E801
+     Копирование... OK
+
+Трек 11
+
+     Имя файла C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track11.wav
+
+     Пиковый уровень 99.9 %
+     Качество трека 100.0 %
+     CRC копии DEDA10BB
+     Копирование... OK
+
+Трек 12
+
+     Имя файла C:\Users\BeatRokazZ\Desktop\[upload]\Freeland [2010] Cope™ Remixed [MAPACDA010]\Disc 1\Track12.wav
+
+     Пиковый уровень 99.9 %
+     Качество трека 100.0 %
+     CRC копии 8E4C6F91
+     Копирование... OK
+
+Ошибок не произошло
+
+Конец отчёта