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

[price-quotes] Warn only once if the AlphaVantage Key isn't set.

Browse Source 
And check the environment if it's not in preferences.
This commit is contained in:
John Ralls 2022-10-01 17:01:48 -07:00
parent 7eaa0eb292
commit e817091de1
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libgnucash/app-utils/gnc-quotes.cpp
View File

@ -124,6 +124,7 @@ class GncFQQuoteSource final : public GncQuoteSource
bool m_ready; bool m_ready;
std::string m_version; std::string m_version;
StrVec m_sources; StrVec m_sources;
std::string m_api_key;
public: public:
GncFQQuoteSource(); GncFQQuoteSource();
~GncFQQuoteSource() = default; ~GncFQQuoteSource() = default;
@ -145,7 +146,7 @@ GncFQQuoteSource::GncFQQuoteSource() :
c_cmd{bp::search_path("perl")}, c_cmd{bp::search_path("perl")},
c_fq_wrapper{std::string(gnc_path_get_bindir()) + "/finance-quote-wrapper"}, c_fq_wrapper{std::string(gnc_path_get_bindir()) + "/finance-quote-wrapper"},
m_ready{false}, m_ready{false},
m_version{}, m_sources{} m_version{}, m_sources{}, m_api_key{}
{ {
StrVec args{"-w", c_fq_wrapper, "-v"}; StrVec args{"-w", c_fq_wrapper, "-v"};
const std::string empty_string; const std::string empty_string;
@ -175,6 +176,15 @@ m_version{}, m_sources{}
m_ready = true; m_ready = true;
sources.erase(sources.begin()); sources.erase(sources.begin());
m_sources = std::move(sources); m_sources = std::move(sources);
auto av_key = gnc_prefs_get_string ("general.finance-quote", "alphavantage-api-key");
if (!av_key)
av_key = getenv("ALPHAVANTAGE_API_KEY");
if (av_key)
m_api_key = std::string(av_key);
else
PWARN("No Alpha Vantage API key set, currency quotes and other AlphaVantage based quotes won't work.");
} }
QuoteResult QuoteResult
@ -190,10 +200,6 @@ GncFQQuoteSource::run_cmd (const StrVec& args, const std::string& json_string) c
StrVec out_vec, err_vec; StrVec out_vec, err_vec;
int cmd_result; int cmd_result;
auto av_key = gnc_prefs_get_string ("general.finance-quote", "alphavantage-api-key");
if (!av_key)
PWARN("No Alpha Vantage API key set, currency quotes and other AlphaVantage based quotes won't work.");
try try
{ {
std::future<std::vector<char> > out_buf, err_buf; std::future<std::vector<char> > out_buf, err_buf;
@ -204,7 +210,7 @@ GncFQQuoteSource::run_cmd (const StrVec& args, const std::string& json_string) c
bp::std_out > out_buf, bp::std_out > out_buf,
bp::std_err > err_buf, bp::std_err > err_buf,
bp::std_in < input_buf, bp::std_in < input_buf,
bp::env["ALPHAVANTAGE_API_KEY"]= (av_key ? av_key : ""), bp::env["ALPHAVANTAGE_API_KEY"]= (m_api_key.empty() ? m_api_key : ""),
svc); svc);
svc.run(); svc.run();
process.wait(); process.wait();