Log Module Info

- Add module version info from mocha/rpxloader
- Improve error logging for librpxloader
- Minor consistency tweaks in error messages

Author: SuperDude88

gui/wiiu/Page.cpp

@@ -1669,24 +1669,26 @@ MetaPage::MetaPage() {
     #ifdef USE_LIBRPXLOADER
         uint32_t version;
         if(const RPXLoaderStatus err = RPXLoader_GetVersion(&version); err != RPX_LOADER_RESULT_SUCCESS) {
-            LOG_TO_DEBUG("Displaying fallback save path, RPXLoader_GetVersion encountered error " + std::to_string(err));
+            LOG_TO_DEBUG("Displaying fallback save path, RPXLoader_GetVersion encountered error "s + RPXLoader_GetStatusStr(err));
             return;
         }
-        
+
+        LOG_TO_DEBUG("Found RPXLoadingModule version: " + std::to_string(version));
+
         if(version < 3) {
             LOG_TO_DEBUG("Displaying fallback save path, librpxloader is outdated.");
             return;
         }
 
         if(const RPXLoaderStatus err = RPXLoader_InitLibrary(); err != RPX_LOADER_RESULT_SUCCESS) {
-            LOG_TO_DEBUG("Displaying fallback save path, RPXLoader_InitLibrary encountered error " + std::to_string(err));
+            LOG_TO_DEBUG("Displaying fallback save path, RPXLoader_InitLibrary encountered error "s + RPXLoader_GetStatusStr(err));
             return;
         }
         rpxLoaderInit = true;
 
         std::array<char, 128> pathBuf{}; // probably bigger than necessary
         if(const RPXLoaderStatus err = RPXLoader_GetPathOfSaveRedirection(pathBuf.data(), pathBuf.size()); err != RPX_LOADER_RESULT_SUCCESS) {
-            LOG_TO_DEBUG("Displaying fallback save path, RPXLoader_GetPathOfSaveRedirection encountered error " + std::to_string(err));
+            LOG_TO_DEBUG("Displaying fallback save path, RPXLoader_GetPathOfSaveRedirection encountered error "s + RPXLoader_GetStatusStr(err));
             return;
         }
 

utility/platform.cpp

@@ -43,14 +43,20 @@ static bool flushVolume(const std::string& vol) {
     return true;
 }
 
-bool initMocha()
-{
+bool initMocha() {
     Utility::platformLog("Starting libmocha...");
 
     if(const MochaUtilsStatus status = Mocha_InitLibrary(); status != MOCHA_RESULT_SUCCESS) {
-        ErrorLog::getInstance().log(std::string("Mocha_InitLibrary() failed, error ") + Mocha_GetStatusStr(status));
+        ErrorLog::getInstance().log(std::string("Mocha_InitLibrary failed, error ") + Mocha_GetStatusStr(status));
+        return false;
+    }
+
+    uint32_t version;
+    if(const MochaUtilsStatus status = Mocha_CheckAPIVersion(&version); status != MOCHA_RESULT_SUCCESS) {
+        LOG_TO_DEBUG(std::string("Mocha_CheckAPIVersion encountered error ") + Mocha_GetStatusStr(status));
         return false;
     }
+    LOG_TO_DEBUG("Found Mocha version: " + std::to_string(version));
 
     Utility::platformLog("Mocha initialized");
     return true;
@@ -85,7 +91,7 @@ void closeMocha() {
     }
 
     if(const MochaUtilsStatus status = Mocha_DeInitLibrary(); status != MOCHA_RESULT_SUCCESS) {
-        ErrorLog::getInstance().log(std::string("Mocha_DeinitLibrary() failed, error ") + Mocha_GetStatusStr(status));
+        ErrorLog::getInstance().log(std::string("Mocha_DeinitLibrary failed, error ") + Mocha_GetStatusStr(status));
     }
 
     return;