Improve search logging

This commit is contained in:
ge0rdi
2020-08-31 20:50:40 +02:00
parent 9752afbebc
commit 61d05b49c5
+16 -9
View File
@@ -139,18 +139,25 @@ void CSearchManager::CloseMenu( void )
Lock lock(this,LOCK_DATA); Lock lock(this,LOCK_DATA);
m_LastRequestId++; m_LastRequestId++;
m_LastProgramsRequestId=m_LastRequestId; m_LastProgramsRequestId=m_LastRequestId;
if (g_LogCategories&LOG_SEARCH) if (g_LogCategories & LOG_SEARCH)
{ {
for (std::vector<SearchItem>::const_iterator it=m_ProgramItems.begin();it!=m_ProgramItems.end();++it) for (const auto& item : m_ProgramItems)
{ {
if (it->category==CATEGORY_PROGRAM) if (item.category == CATEGORY_PROGRAM)
LOG_MENU(LOG_SEARCH,L"Program: '%s', %d",it->name,it->rank); LOG_MENU(LOG_SEARCH, L"Program: '%s', %d", item.name, item.rank);
} }
std::sort(m_SettingsItems.begin(),m_SettingsItems.end());
for (std::vector<SearchItem>::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) if (item.category == CATEGORY_SETTING)
LOG_MENU(LOG_SEARCH,L"Setting: '%s', %d",it->name,it->rank); 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) if (m_bProgramsFound)
@@ -675,7 +682,7 @@ void CSearchManager::SearchThread( void )
if (GetWinVersion()>=WIN_VER_WIN8 && searchRequest.bSearchMetroApps) if (GetWinVersion()>=WIN_VER_WIN8 && searchRequest.bSearchMetroApps)
{ {
std::vector<MetroLink> links; std::vector<MetroLink> links;
GetMetroLinks(links,false); GetMetroLinks(links,true);
for (std::vector<MetroLink>::const_iterator it=links.begin();it!=links.end();++it) for (std::vector<MetroLink>::const_iterator it=links.begin();it!=links.end();++it)
{ {
if (GetWinVersion()<WIN_VER_WIN10) if (GetWinVersion()<WIN_VER_WIN10)