combine both approaches

Gnucash · Sep 12, 2024 · 941c365 · 941c365
1 parent e8c7af9
commit 941c365
Showing 1 changed file with 51 additions and 57 deletions.
diff --git a/libgnucash/engine/gnc-datetime.cpp b/libgnucash/engine/gnc-datetime.cpp
@@ -82,6 +82,56 @@ static constexpr auto ticks_per_second = INT64_C(1000000);
 static constexpr auto ticks_per_second = INT64_C(1000000000);
 #endif
 
+
+static icu::Locale
+get_LCTIME_locale()
+{
+    const char* lc_time_locale = setlocale(LC_TIME, nullptr);
+
+    if (lc_time_locale == nullptr)
+        return icu::Locale::getDefault();
+
+    std::string localeStr(lc_time_locale);
+    size_t dotPos = localeStr.find('.');
+    if (dotPos != std::string::npos)
+        localeStr = localeStr.substr(0, dotPos);
+
+    return icu::Locale::createCanonical (localeStr.c_str());
+}
+
+static Date
+icu_string_to_date (const std::string str)
+{
+    UErrorCode status = U_ZERO_ERROR;
+    icu::Locale locale = get_LCTIME_locale();
+
+    static std::unique_ptr<icu::DateFormat> formatter(icu::DateFormat::createDateInstance(icu::DateFormat::kDefault, locale));
+    if (formatter == nullptr)
+        throw std::invalid_argument ("Cannot create date formatter.");
+
+    static std::unique_ptr<icu::Calendar> calendar(icu::Calendar::createInstance(locale, status));
+    if (U_FAILURE(status))
+        throw std::invalid_argument("Cannot create calendar instance.");
+    calendar->setLenient (false);
+
+    icu::UnicodeString input = icu::UnicodeString::fromUTF8(str);
+    icu::ParsePosition parsePos;
+
+    UDate date = formatter->parse(input, parsePos);
+    if (parsePos.getErrorIndex() != -1 || parsePos.getIndex() != input.length())
+        throw std::invalid_argument ("Cannot parse string");
+
+    calendar->setTime(date, status);
+    if (U_FAILURE(status))
+        throw std::invalid_argument ("Cannot set calendar time");
+
+    return Date (calendar->get(UCAL_YEAR, status),
+                 calendar->get(UCAL_MONTH, status) + 1,
+                 calendar->get(UCAL_DATE, status));
+}
+
+
+
 /* Vector of date formats understood by gnucash and corresponding
  * boost string->date or regex to parse each from an external source
  * Note: while the format names are using a "-" as separator, the
@@ -92,10 +142,7 @@ const std::vector<GncDateFormat> GncDate::c_formats ({
     GncDateFormat { N_("UK date"), boost::gregorian::from_uk_string },
     GncDateFormat { N_("US date"), boost::gregorian::from_us_string },
     GncDateFormat { N_("ISO date"), boost::gregorian::from_string },
-    GncDateFormat {
-        N_("Locale"),
-        ""
-    },
+    GncDateFormat { N_("Locale"), icu_string_to_date },
     GncDateFormat {
         N_("y-m-d"),
         "(?:"                                   // either y-m-d
@@ -619,53 +666,6 @@ GncDateTimeImpl::timestamp()
     return str.substr(0, 8) + str.substr(9, 15);
 }
 
-static icu::Locale
-get_LCTIME_locale()
-{
-    const char* lc_time_locale = setlocale(LC_TIME, nullptr);
-
-    if (lc_time_locale == nullptr)
-        return icu::Locale::getDefault();
-
-    std::string localeStr(lc_time_locale);
-    size_t dotPos = localeStr.find('.');
-    if (dotPos != std::string::npos)
-        localeStr = localeStr.substr(0, dotPos);
-
-    return icu::Locale::createCanonical (localeStr.c_str());
-}
-
-static Date
-use_icu_parser (const std::string str)
-{
-    UErrorCode status = U_ZERO_ERROR;
-    icu::Locale locale = get_LCTIME_locale();
-
-    static std::unique_ptr<icu::DateFormat> formatter(icu::DateFormat::createDateInstance(icu::DateFormat::kDefault, locale));
-    if (formatter == nullptr)
-        throw std::invalid_argument ("Cannot create date formatter.");
-
-    static std::unique_ptr<icu::Calendar> calendar(icu::Calendar::createInstance(locale, status));
-    if (U_FAILURE(status))
-        throw std::invalid_argument("Cannot create calendar instance.");
-    calendar->setLenient (false);
-
-    icu::UnicodeString input = icu::UnicodeString::fromUTF8(str);
-    icu::ParsePosition parsePos;
-
-    UDate date = formatter->parse(input, parsePos);
-    if (parsePos.getErrorIndex() != -1 || parsePos.getIndex() != input.length())
-        throw std::invalid_argument ("Cannot parse string");
-
-    calendar->setTime(date, status);
-    if (U_FAILURE(status))
-        throw std::invalid_argument ("Cannot set calendar time");
-
-    return Date (calendar->get(UCAL_YEAR, status),
-                 calendar->get(UCAL_MONTH, status) + 1,
-                 calendar->get(UCAL_DATE, status));
-}
-
 /* Member function definitions for GncDateImpl.
  */
 GncDateImpl::GncDateImpl(const std::string str, const std::string fmt) :
@@ -682,12 +682,6 @@ GncDateImpl::GncDateImpl(const std::string str, const std::string fmt) :
         return;
     }
 
-    if (iter->m_re == "")
-    {
-        m_greg = use_icu_parser (str);
-        return;
-    }
-
     boost::regex r(iter->m_re);
     boost::smatch what;
     if(!boost::regex_search(str, what, r))  // regex didn't find a match