Fix bug 72484

This commit is contained in:
Alexey Nagaev
2025-01-17 20:07:45 +03:00
parent fb934ef527
commit 172bb09305

View File

@ -5,6 +5,14 @@ class CFormatsList;
class Cx2tTester;
class CConverter;
std::wstring GetFileExtLower(const std::wstring& file)
{
std::wstring input_ext = NSFile::GetFileExtention(file);
for (auto& c : input_ext)
c = std::tolower(c);
return input_ext;
}
CFormatsList::CFormatsList()
{
}
@ -522,7 +530,7 @@ void Cx2tTester::Start()
{
std::wstring& input_file = files[i];
std::wstring input_filename = NSFile::GetFileName(input_file);
std::wstring input_ext = NSFile::GetFileExtention(input_file);
std::wstring input_ext = GetFileExtLower(input_file);
// if no format in input formats - skip
if(std::find(m_inputExts.begin(), m_inputExts.end(), input_ext) == m_inputExts.end()
@ -619,7 +627,7 @@ void Cx2tTester::Convert(const std::vector<std::wstring>& files, bool bNoDirecto
{
const std::wstring& input_file = files[i];
std::wstring input_filename = NSFile::GetFileName(input_file);
std::wstring input_ext = NSFile::GetFileExtention(input_file);
std::wstring input_ext = GetFileExtLower(input_file);
std::wstring input_file_directory = NSFile::GetDirectoryName(input_file);
// takes full directory after input folder
@ -865,6 +873,8 @@ std::vector<std::wstring> Cx2tTester::ParseExtensionsString(std::wstring extensi
while ((pos = extensions.find(' ')) != std::wstring::npos)
{
std::wstring ext = extensions.substr(0, pos);
for (auto& c : ext)
c = std::tolower(c);
if(ext == L"documents")
exts = fl.GetDocuments();
@ -1145,7 +1155,7 @@ DWORD CConverter::ThreadProc()
Cx2tTester::Report report;
report.inputFile = input_filename;
report.outputFile = output_filename;
report.direction = input_ext.substr(1, input_ext.size() - 1) + L"-" + output_ext.substr(1, output_ext.size() - 1);
report.direction = m_inputExt + L"-" + output_ext.substr(1, output_ext.size() - 1);
report.time = NSTimers::GetTickCount() - time_file_start;
report.inputSize = input_size;
report.outputSize = output_size;