fix(#5894): switch to yahoo v6 api

moneymanagerex · May 8, 2023 · f57918f · f57918f
1 parent ab00451
commit f57918f
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 61 deletions.
diff --git a/src/constants.cpp b/src/constants.cpp
@@ -168,7 +168,7 @@ const wxString mmex::weblink::Crowdin        = "https://crowdin.com/project/mone
 const wxString mmex::weblink::DefStockUrl = "http://finance.yahoo.com/echarts?s=%s";
 
 // Yahoo API
-const wxString mmex::weblink::YahooQuotes = "https://query1.finance.yahoo.com/v7/finance/quote?symbols=%s&fields=regularMarketPrice,currency,shortName";
+const wxString mmex::weblink::YahooQuotes = "https://query1.finance.yahoo.com/v6/finance/quote?symbols=%s&fields=regularMarketPrice,currency,shortName";
 /*"ValidRanges":["1d","5d","1mo","3mo","6mo","1y","2y","5y","10y","ytd","max"]
    Valid intervals: [1m, 2m, 5m, 15m, 30m, 60m, 90m, 1h, 1d, 5d, 1wk, 1mo, 3mo]*/
 const wxString mmex::weblink::YahooQuotesHistory = "https://query1.finance.yahoo.com/v8/finance/chart/%s?%s&fields=currency";

diff --git a/src/util.cpp b/src/util.cpp
@@ -844,83 +844,99 @@ bool get_yahoo_prices(std::map<wxString, double>& symbols
 
     if (json_doc.HasMember("finance") && json_doc["finance"].IsObject()) {
         Value e = json_doc["finance"].GetObject();
-        if (e.HasMember("error") && e["error"].IsObject()) {
-            Value err = e["error"].GetObject();
-            if (err.HasMember("description") && err["description"].IsString()) {
-                output = wxString::FromUTF8(err["description"].GetString());
-                return false;
+        if (e.HasMember("error")) {
+            if (e["error"].IsObject()) {
+                Value err = e["error"].GetObject();
+                if (err.HasMember("description") && err["description"].IsString()) {
+                    output = wxString::FromUTF8(err["description"].GetString());
+                    return false;
+                }
             }
         }
     }
 
+    /*{"quoteResponse":{"result":[{"currency":"USD","regularMarketPrice":173.57,"shortName":"Apple Inc.","regularMarketTime":1683316804,"symbol":"AAPL"}],"error":null}}*/
 
-    Value r = json_doc["quoteResponse"].GetObject();
-    Value e = r["result"].GetArray();
+    if (json_doc.HasMember("quoteResponse") && json_doc["quoteResponse"].IsObject()) {
+        Value r = json_doc["quoteResponse"].GetObject();
+        if (r.HasMember("result") && r["result"].IsArray()) {
+            Value e = r["result"].GetArray();
 
-    if (e.Empty()) {
-        output = _("Nothing to update");
-        return false;
-    }
+            if (e.Empty()) {
+                output = _("Nothing to update");
+                return false;
+            }
 
-    if (type == yahoo_price_type::FIAT)
-    {
-        for (rapidjson::SizeType i = 0; i < e.Size(); i++)
-        {
-            if (!e[i].IsObject()) continue;
-            Value v = e[i].GetObject();
+            if (type == yahoo_price_type::FIAT)
+            {
+                for (rapidjson::SizeType i = 0; i < e.Size(); i++)
+                {
+                    if (!e[i].IsObject()) continue;
+                    Value v = e[i].GetObject();
+
+                    if (!v.HasMember("symbol") || !v["symbol"].IsString())
+                        continue;
+                    auto currency_symbol = wxString::FromUTF8(v["symbol"].GetString());
+
+                    double price = 0.0;
+                    wxRegEx pattern("^([A-Z]{3})[A-Z]{3}=X$");
+                    if (pattern.Matches(currency_symbol))
+                    {
+                        if (!v.HasMember("regularMarketPrice") || !v["regularMarketPrice"].IsFloat())
+                            continue;
+                        price = v["regularMarketPrice"].GetFloat();
+                        currency_symbol = pattern.GetMatch(currency_symbol, 1);
+                    }
+                    wxRegEx crypto_pattern("^([A-Z]{3,})-[A-Z]{3}$");
+                    if (crypto_pattern.Matches(currency_symbol))
+                    {
+                        if (!v.HasMember("regularMarketPrice") || !v["regularMarketPrice"].IsFloat())
+                            continue;
+                        price = v["regularMarketPrice"].GetFloat();
+                        currency_symbol = crypto_pattern.GetMatch(currency_symbol, 1);
+                    }
 
-            if (!v.HasMember("symbol") || !v["symbol"].IsString())
-                continue;
-            auto currency_symbol = wxString::FromUTF8(v["symbol"].GetString());
+                    if (currency_symbol == base_currency_symbol)
+                        conversion_factor = price;
+                    else
+                        out[currency_symbol] = (price <= 0.0 ? 0.0 : price);
 
-            double price = 0.0;
-            wxRegEx pattern("^([A-Z]{3})[A-Z]{3}=X$");
-            if (pattern.Matches(currency_symbol))
-            {
-                if (!v.HasMember("regularMarketPrice") || !v["regularMarketPrice"].IsFloat())
-                    continue;
-                price = v["regularMarketPrice"].GetFloat();
-                currency_symbol = pattern.GetMatch(currency_symbol, 1);
+                }
             }
-            wxRegEx crypto_pattern("^([A-Z]{3,})-[A-Z]{3}$");
-            if (crypto_pattern.Matches(currency_symbol))
+            else
             {
-                if (!v.HasMember("regularMarketPrice") || !v["regularMarketPrice"].IsFloat())
-                    continue;
-                price = v["regularMarketPrice"].GetFloat();
-                currency_symbol = crypto_pattern.GetMatch(currency_symbol, 1);
-            }
+                for (rapidjson::SizeType i = 0; i < e.Size(); i++)
+                {
+                    if (!e[i].IsObject()) continue;
+                    Value v = e[i].GetObject();
 
-            if (currency_symbol == base_currency_symbol)
-                conversion_factor = price;
-            else
-                out[currency_symbol] = (price <= 0.0 ? 0.0 : price);
+                    if (!v.HasMember("regularMarketPrice") || !v["regularMarketPrice"].IsFloat())
+                        continue;
+                    auto price = v["regularMarketPrice"].GetFloat();
+
+                    if (!v.HasMember("symbol") || !v["symbol"].IsString())
+                        continue;
+                    const auto symbol = wxString::FromUTF8(v["symbol"].GetString());
 
+                    if (!v.HasMember("currency") || !v["currency"].IsString())
+                        continue;
+                    const auto currency = wxString::FromUTF8(v["currency"].GetString());
+                    double k = currency == "GBp" ? 100 : 1;
+
+                    wxLogDebug("item: %u %s %f", i, symbol, price);
+                    out[symbol] = price <= 0 ? 0 : price / k;
+                }
+            }
+        }
+        else {
+            output = _("JSON Parse Error");
+            return false;
         }
     }
     else
     {
-        for (rapidjson::SizeType i = 0; i < e.Size(); i++)
-        {
-            if (!e[i].IsObject()) continue;
-            Value v = e[i].GetObject();
-
-            if (!v.HasMember("regularMarketPrice") || !v["regularMarketPrice"].IsFloat())
-                continue;
-            auto price = v["regularMarketPrice"].GetFloat();
-
-            if (!v.HasMember("symbol") || !v["symbol"].IsString())
-                continue;
-            const auto symbol = wxString::FromUTF8(v["symbol"].GetString());
-
-            if (!v.HasMember("currency") || !v["currency"].IsString())
-                continue;
-            const auto currency = wxString::FromUTF8(v["currency"].GetString());
-            double k = currency == "GBp" ? 100 : 1;
-
-            wxLogDebug("item: %u %s %f", i, symbol, price);
-            out[symbol] = price <= 0 ? 0 : price / k;
-        }
+        output = _("JSON Parse Error");
+        return false;
     }
 
     for (auto& item : out)