From f09ba5ffd53bf7d28e0dc516c00a8f69ca7efae9 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 28 Sep 2023 08:29:55 +1000 Subject: Use bindey for databinding instead of hand rolling ui updates --- src/app_console/app_console.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/app_console/app_console.cpp') diff --git a/src/app_console/app_console.cpp b/src/app_console/app_console.cpp index 6573ee49..83406650 100644 --- a/src/app_console/app_console.cpp +++ b/src/app_console/app_console.cpp @@ -187,8 +187,8 @@ int CmdDbTracks(int argc, char** argv) { std::unique_ptr> res( db->GetTracks(20).get()); while (true) { - for (database::Track s : res->values()) { - std::cout << s.tags()[database::Tag::kTitle].value_or("[BLANK]") + for (const auto& s : res->values()) { + std::cout << s->tags()[database::Tag::kTitle].value_or("[BLANK]") << std::endl; } if (res->next_page()) { @@ -256,12 +256,12 @@ int CmdDbIndex(int argc, char** argv) { std::cout << "choice out of range" << std::endl; return -1; } - if (res->values().at(choice).track()) { + if (res->values().at(choice)->track()) { AppConsole::sServices->track_queue().IncludeLast( std::make_shared( AppConsole::sServices->database(), res, 0, res, choice)); } - auto cont = res->values().at(choice).Expand(20); + auto cont = res->values().at(choice)->Expand(20); if (!cont) { std::cout << "more choices than levels" << std::endl; return 0; @@ -270,10 +270,10 @@ int CmdDbIndex(int argc, char** argv) { choice_index++; } - for (database::IndexRecord r : res->values()) { - std::cout << r.text().value_or(""); - if (r.track()) { - std::cout << "\t(id:" << *r.track() << ")"; + for (const auto& r : res->values()) { + std::cout << r->text().value_or(""); + if (r->track()) { + std::cout << "\t(id:" << *r->track() << ")"; } std::cout << std::endl; } @@ -311,8 +311,8 @@ int CmdDbDump(int argc, char** argv) { std::unique_ptr> res(db->GetDump(5).get()); while (true) { - for (const std::pmr::string& s : res->values()) { - std::cout << s << std::endl; + for (const auto& s : res->values()) { + std::cout << *s << std::endl; } if (res->next_page()) { auto continuation = res->next_page().value(); -- cgit v1.2.3