From 36c92744b7e0960a25519f20512757c54a10b808 Mon Sep 17 00:00:00 2001
From: rw-r-r-0644 <r.r.qwertyuiop.r.r@gmail.com>
Date: Sat, 2 May 2020 21:50:46 +0200
Subject: [PATCH] GameList: Use MCP_TitleListByAppType to request specific app
 catergories

---
 src/game/GameList.cpp | 49 +++++++++++++++++++++++++++++--------------
 src/game/GameList.h   |  1 +
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/game/GameList.cpp b/src/game/GameList.cpp
index 80754c4..e4fa69a 100644
--- a/src/game/GameList.cpp
+++ b/src/game/GameList.cpp
@@ -77,30 +77,47 @@ int32_t GameList::readGameList() {
     }
 
     std::vector<struct MCPTitleListType> titles(titleCount);
-    uint32_t realTitleCount;
+    uint32_t realTitleCount = 0;
 
-    MCPError err = MCP_TitleList(mcp, &realTitleCount, titles.data(), titles.size() * sizeof(decltype(titles)::value_type));
-    if (err < 0) {
-        MCP_Close(mcp);
-        return 0;
+    static const std::vector<MCPAppType> menuAppTypes {
+        MCP_APP_TYPE_GAME,
+        MCP_APP_TYPE_GAME_WII,
+        MCP_APP_TYPE_SYSTEM_APPS,
+        MCP_APP_TYPE_SYSTEM_SETTINGS,
+        MCP_APP_TYPE_FRIEND_LIST,
+        MCP_APP_TYPE_MIIVERSE,
+        MCP_APP_TYPE_ESHOP,
+        MCP_APP_TYPE_BROWSER,
+        MCP_APP_TYPE_DOWNLOAD_MANAGEMENT,
+        MCP_APP_TYPE_ACCOUNT_APPS,
+    };
+
+    for (auto appType : menuAppTypes) {
+        uint32_t titleCountByType = 0;
+        MCPError err = MCP_TitleListByAppType(mcp, appType, &titleCountByType, titles.data() + realTitleCount,
+                                     (titles.size() - realTitleCount) * sizeof(decltype(titles)::value_type));
+        if (err < 0) {
+            MCP_Close(mcp);
+            return 0;
+        }
+        realTitleCount += titleCountByType;
     }
     if (realTitleCount != titles.size()) {
         titles.resize(realTitleCount);
     }
 
     for (auto title_candidate : titles) {
-        if(true || (title_candidate.titleId & 0xFFFFFFFF00000000L) == 0x0005000000000000L) {
-            gameInfo* newGameInfo = new gameInfo;
-            newGameInfo->titleId = title_candidate.titleId;
-            newGameInfo->gamePath = title_candidate.path;
-            newGameInfo->name = "<unknown>";
-            newGameInfo->imageData = NULL;
-            DCFlushRange(newGameInfo, sizeof(gameInfo));
+        gameInfo* newGameInfo = new gameInfo;
+        newGameInfo->titleId = title_candidate.titleId;
+        newGameInfo->appType = title_candidate.appType;
+        newGameInfo->gamePath = title_candidate.path;
+        newGameInfo->name = "<unknown>";
+        newGameInfo->imageData = NULL;
+        DCFlushRange(newGameInfo, sizeof(gameInfo));
 
-            fullGameList.push_back(newGameInfo);
-            titleAdded(newGameInfo);
-            cnt++;
-        }
+        fullGameList.push_back(newGameInfo);
+        titleAdded(newGameInfo);
+        cnt++;
     }
 
     AsyncExecutor::execute([this] {
diff --git a/src/game/GameList.h b/src/game/GameList.h
index 5304ec1..3a010ef 100644
--- a/src/game/GameList.h
+++ b/src/game/GameList.h
@@ -11,6 +11,7 @@
 
 typedef struct _gameInfo {
     uint64_t titleId;
+    MCPAppType appType;
     std::string name;
     std::string gamePath;
     GuiImageData * imageData;