mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Changed charset detection to always include local charset (hopeful fix to #676)

Browse source 
Originally committed to SVN as r1926.
This commit is contained in:
Rodrigo Braz Monteiro 2008-03-06 20:49:04 +00:00
parent 75e39a2660
commit 2e7a77ec64
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
aegisub/charset_detect.cpp
View file

@ -40,6 +40,7 @@
#include "charset_detect.h" #include "charset_detect.h"
#include "text_file_reader.h" #include "text_file_reader.h"
#include "../universalchardet/nsCharSetProber.h" #include "../universalchardet/nsCharSetProber.h"
#include <wx/intl.h>
#include <wx/choicdlg.h> #include <wx/choicdlg.h>
@ -67,7 +68,9 @@ wxString CharSetDetect::GetEncoding(wxString filename) {
DataEnd(); DataEnd();
// Grab every result obtained // Grab every result obtained
wxString local = wxLocale::GetSystemEncodingName();
std::list<CharDetResult> results; std::list<CharDetResult> results;
bool gotLocal = false;
for (int i=0;i<NUM_OF_CHARSET_PROBERS;i++) { for (int i=0;i<NUM_OF_CHARSET_PROBERS;i++) {
if (mCharSetProbers[i]) { if (mCharSetProbers[i]) {
int probes = mCharSetProbers[i]->GetProbeCount(); int probes = mCharSetProbers[i]->GetProbeCount();
@ -75,9 +78,10 @@ wxString CharSetDetect::GetEncoding(wxString filename) {
float conf = mCharSetProbers[i]->GetConfidence(j); float conf = mCharSetProbers[i]->GetConfidence(j);
// Only bother with those whose confidence is at least 1% // Only bother with those whose confidence is at least 1%
if (conf > 0.01f) { wxString curName = wxString(mCharSetProbers[i]->GetCharSetName(j),wxConvUTF8);
if (conf > 0.01f || curName == local) {
results.push_back(CharDetResult()); results.push_back(CharDetResult());
results.back().name = wxString(mCharSetProbers[i]->GetCharSetName(j),wxConvUTF8); results.back().name = curName;
results.back().confidence = mCharSetProbers[i]->GetConfidence(j); results.back().confidence = mCharSetProbers[i]->GetConfidence(j);
} }
} }
@ -86,6 +90,14 @@ wxString CharSetDetect::GetEncoding(wxString filename) {
// If you got more than one valid result, ask the user which he wants // If you got more than one valid result, ask the user which he wants
if (results.size() > 1) { if (results.size() > 1) {
// Add local
if (!gotLocal) {
results.push_back(CharDetResult());
results.back().name = local;
results.back().confidence = 0;
}
// Sort by confidence
results.sort(); results.sort();
// Get choice from user // Get choice from user
@ -97,7 +109,16 @@ wxString CharSetDetect::GetEncoding(wxString filename) {
wxString name = (*cur).name; wxString name = (*cur).name;
if (picked.Index(name) == wxNOT_FOUND) { if (picked.Index(name) == wxNOT_FOUND) {
picked.Add(name); picked.Add(name);
choices.Add(wxString::Format(_T("%f%% - "),(*cur).confidence*100.0f) + name);
// Generate name
wxString choiceStr;
if ((*cur).confidence > 0.0f) choiceStr = wxString::Format(_T("%f%% - "),(*cur).confidence*100.0f);
else choiceStr = _T("Unknown - ");
choiceStr += name;
if (name == local) choiceStr += _T(" (local)");
// Insert
choices.Add(choiceStr);
i++; i++;
if (i == 20) break; if (i == 20) break;
} }