From 61d05b49c5398820666eb0b8e4a597f9a0c94e6e Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Mon, 31 Aug 2020 20:50:40 +0200 Subject: [PATCH] Improve search logging --- Src/StartMenu/StartMenuDLL/SearchManager.cpp | 25 +++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/SearchManager.cpp b/Src/StartMenu/StartMenuDLL/SearchManager.cpp index 1296667..e215e8d 100644 --- a/Src/StartMenu/StartMenuDLL/SearchManager.cpp +++ b/Src/StartMenu/StartMenuDLL/SearchManager.cpp @@ -139,18 +139,25 @@ void CSearchManager::CloseMenu( void ) Lock lock(this,LOCK_DATA); m_LastRequestId++; m_LastProgramsRequestId=m_LastRequestId; - if (g_LogCategories&LOG_SEARCH) + if (g_LogCategories & LOG_SEARCH) { - for (std::vector::const_iterator it=m_ProgramItems.begin();it!=m_ProgramItems.end();++it) + for (const auto& item : m_ProgramItems) { - if (it->category==CATEGORY_PROGRAM) - LOG_MENU(LOG_SEARCH,L"Program: '%s', %d",it->name,it->rank); + if (item.category == CATEGORY_PROGRAM) + LOG_MENU(LOG_SEARCH, L"Program: '%s', %d", item.name, item.rank); } - std::sort(m_SettingsItems.begin(),m_SettingsItems.end()); - for (std::vector::const_iterator it=m_SettingsItems.begin();it!=m_SettingsItems.end();++it) + + std::sort(m_SettingsItems.begin(), m_SettingsItems.end()); + + for (const auto& item : m_SettingsItems) { - if (it->category==CATEGORY_SETTING) - LOG_MENU(LOG_SEARCH,L"Setting: '%s', %d",it->name,it->rank); + if (item.category == CATEGORY_SETTING) + LOG_MENU(LOG_SEARCH, L"Setting: '%s', %d", item.name, item.rank); + } + for (const auto& item : m_SettingsItems) + { + if (item.category == CATEGORY_METROSETTING) + LOG_MENU(LOG_SEARCH, L"MetroSetting: '%s', %d", item.name, item.rank); } } if (m_bProgramsFound) @@ -675,7 +682,7 @@ void CSearchManager::SearchThread( void ) if (GetWinVersion()>=WIN_VER_WIN8 && searchRequest.bSearchMetroApps) { std::vector links; - GetMetroLinks(links,false); + GetMetroLinks(links,true); for (std::vector::const_iterator it=links.begin();it!=links.end();++it) { if (GetWinVersion()