IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

CsvTxImpProps - simplify exception handling

Browse Source 
- catch multiple exception types in one block
  the exception handling code was the same anyway
- stop rethrowing the exception. The calling code
  doesn't need this and just ignores it.
This commit is contained in:
Geert Janssens 2023-02-11 14:15:10 +01:00
parent 81e17531b9
commit 807340bcd7
1 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
View File

@ -285,37 +285,22 @@ void GncPreTrans::set (GncTransPropType prop_type, const std::string& value)
break;
}
}
catch (const std::invalid_argument& e)
catch (const std::exception& e)
{
auto err_str = (bl::format (std::string{_("{1}: {2}")}) %
std::string{_(gnc_csv_col_type_strs[prop_type])} %
e.what()).str();
m_errors.emplace(prop_type, err_str);
throw std::invalid_argument (err_str);
}
catch (const std::out_of_range& e)
{
auto err_str = (bl::format (std::string{_("{1}: {2}")}) %
std::string{_(gnc_csv_col_type_strs[prop_type])} %
e.what()).str();
m_errors.emplace(prop_type, err_str);
throw std::invalid_argument (err_str);
}
}
void GncPreTrans::reset (GncTransPropType prop_type)
{
try
{
set (prop_type, std::string());
}
catch (...)
{
// Set with an empty string will effectively clear the property
// but can also set an error for the property. Clear that error here.
m_errors.erase(prop_type);
}
}
StrVec GncPreTrans::verify_essentials (void)
@ -521,36 +506,21 @@ void GncPreSplit::set (GncTransPropType prop_type, const std::string& value)
break;
}
}
catch (const std::invalid_argument& e)
catch (const std::exception& e)
{
auto err_str = (bl::format (std::string{_("{1}: {2}")}) %
std::string{_(gnc_csv_col_type_strs[prop_type])} %
e.what()).str();
m_errors.emplace(prop_type, err_str);
throw std::invalid_argument (err_str);
}
catch (const std::out_of_range& e)
{
auto err_str = (bl::format (std::string{_("{1}: {2}")}) %
std::string{_(gnc_csv_col_type_strs[prop_type])} %
e.what()).str();
m_errors.emplace(prop_type, err_str);
throw std::invalid_argument (err_str);
}
}
void GncPreSplit::reset (GncTransPropType prop_type)
{
try
{
set (prop_type, std::string());
}
catch (...)
{
// Set with an empty string will effectively clear the property
// but can also set an error for the property. Clear that error here.
m_errors.erase(prop_type);
}
}
void GncPreSplit::add (GncTransPropType prop_type, const std::string& value)
@ -598,21 +568,12 @@ void GncPreSplit::add (GncTransPropType prop_type, const std::string& value)
break;
}
}
catch (const std::invalid_argument& e)
catch (const std::exception& e)
{
auto err_str = (bl::format (std::string{_("{1}: {2}")}) %
std::string{_(gnc_csv_col_type_strs[prop_type])} %
e.what()).str();
m_errors.emplace(prop_type, err_str);
throw std::invalid_argument (err_str);
}
catch (const std::out_of_range& e)
{
auto err_str = (bl::format (std::string{_("{1}: {2}")}) %
std::string{_(gnc_csv_col_type_strs[prop_type])} %
e.what()).str();
m_errors.emplace(prop_type, err_str);
throw std::invalid_argument (err_str);
}
}