Refactoring for WUPS 0.8.0

.github/workflows/ci.yml

@@ -48,7 +48,7 @@ jobs:
     - name: zip artifact
       run: zip -r ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip *.wps
     - name: Create Release
-      uses: "softprops/action-gh-release@v1"
+      uses: "softprops/action-gh-release@v2"
       with:
         tag_name: ${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
         draft: false

.gitignore

@@ -9,3 +9,4 @@ cmake-build-debug/
 .idea/
 *.rpx
 *.txt
+*.zip

Dockerfile

@@ -1,8 +1,8 @@
-FROM ghcr.io/wiiu-env/devkitppc:20231112
+FROM ghcr.io/wiiu-env/devkitppc:20240423
 
-COPY --from=ghcr.io/wiiu-env/libwupsbackend:20230621 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/librpxloader:20230621 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20230719 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/libnotifications:20230621 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20240425 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/libwupsbackend:20240425 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/librpxloader:20240425 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/libnotifications:20240426 /artifacts $DEVKITPRO
 
 WORKDIR project

Makefile

@@ -23,7 +23,6 @@ WUMS_ROOT := $(DEVKITPRO)/wums
 TARGET		:=	wiiload
 BUILD		:=	build
 SOURCES		:=	src \
-                src/fs \
                 src/utils
 DATA		:=	data
 INCLUDES	:=	src

README.md

@@ -17,7 +17,7 @@ Building via `make` only logs errors (via OSReport). To enable logging via the [
 `make DEBUG=1` Enables information and error logging via [LoggingModule](https://github.com/wiiu-env/LoggingModule).  
 `make DEBUG=VERBOSE` Enables verbose information and error logging via [LoggingModule](https://github.com/wiiu-env/LoggingModule).  
 
-If the [LoggingModule](https://github.com/wiiu-env/LoggingModule) is not present, it'll fallback to UDP (Port 4405) and [CafeOS](https://github.com/wiiu-env/USBSerialLoggingModule) logging.
+If the [LoggingModule](https://github.com/wiiu-env/LoggingModule) is not present, it'll fall back to UDP (Port 4405) and [CafeOS](https://github.com/wiiu-env/USBSerialLoggingModule) logging.
 
 ## Building using the Dockerfile
 

src/config.cpp

@@ -0,0 +1,71 @@
+#include "config.h"
+#include "globals.h"
+#include "utils/TcpReceiver.h"
+#include "utils/logger.h"
+#include "utils/utils.h"
+#include <string>
+#include <wups/config/WUPSConfigItemBoolean.h>
+#include <wups/storage.h>
+
+static void gServerEnabledChanged(ConfigItemBoolean *item, bool newValue) {
+    if (std::string_view(WIILOAD_ENABLED_STRING) != item->identifier) {
+        DEBUG_FUNCTION_LINE_WARN("Unexpected identifier in bool callback: %s", item->identifier);
+        return;
+    }
+    DEBUG_FUNCTION_LINE_VERBOSE("New value in gWiiloadServerEnabled: %d", newValue);
+    gWiiloadServerEnabled = newValue;
+
+    gTcpReceiverThread.reset();
+
+    if (gWiiloadServerEnabled) {
+        DEBUG_FUNCTION_LINE("Starting server!");
+        gTcpReceiverThread = make_unique_nothrow<TcpReceiver>(4299);
+        if (gTcpReceiverThread == nullptr) {
+            DEBUG_FUNCTION_LINE_ERR("Failed to create wiiload thread");
+        }
+    } else {
+        DEBUG_FUNCTION_LINE("Wiiload server has been stopped!");
+    }
+    // If the value has changed, we store it in the storage.
+    WUPSStorageError res;
+    if ((res = WUPSStorageAPI::Store(item->identifier, gWiiloadServerEnabled)) != WUPS_STORAGE_ERROR_SUCCESS) {
+        DEBUG_FUNCTION_LINE_ERR("Failed to store gWiiloadServerEnabled: %s (%d)", WUPSStorageAPI_GetStatusStr(res), res);
+    }
+}
+
+static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHandle rootHandle) {
+    try {
+        WUPSConfigCategory root = WUPSConfigCategory(rootHandle);
+
+        root.add(WUPSConfigItemBoolean::Create(WIILOAD_ENABLED_STRING, "Enable Wiiload",
+                                               DEFAULT_WIILOAD_ENABLED_VALUE, gWiiloadServerEnabled,
+                                               &gServerEnabledChanged));
+
+    } catch (std::exception &e) {
+        OSReport("Exception: %s\n", e.what());
+        return WUPSCONFIG_API_CALLBACK_RESULT_ERROR;
+    }
+    return WUPSCONFIG_API_CALLBACK_RESULT_SUCCESS;
+}
+
+static void ConfigMenuClosedCallback() {
+    // Save all changes
+    if (WUPSStorageAPI::SaveStorage() != WUPS_STORAGE_ERROR_SUCCESS) {
+        DEBUG_FUNCTION_LINE_ERR("Failed to close storage");
+    }
+}
+
+void InitConfigAndStorage() {
+    WUPSConfigAPIOptionsV1 configOptions = {.name = "Wiiload Plugin"};
+    if (WUPSConfigAPI_Init(configOptions, ConfigMenuOpenedCallback, ConfigMenuClosedCallback) != WUPSCONFIG_API_RESULT_SUCCESS) {
+        DEBUG_FUNCTION_LINE_ERR("Failed to init config api");
+    }
+
+    if (WUPSStorageAPI::GetOrStoreDefault(WIILOAD_ENABLED_STRING, gWiiloadServerEnabled, DEFAULT_WIILOAD_ENABLED_VALUE) != WUPS_STORAGE_ERROR_SUCCESS) {
+        DEBUG_FUNCTION_LINE_ERR("Failed to get or create item \"%s\"", WIILOAD_ENABLED_STRING);
+    }
+
+    if (WUPSStorageAPI::SaveStorage() != WUPS_STORAGE_ERROR_SUCCESS) {
+        DEBUG_FUNCTION_LINE_ERR("Failed to save storage");
+    }
+}

src/config.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#define WIILOAD_ENABLED_STRING        "enabled"
+#define DEFAULT_WIILOAD_ENABLED_VALUE true
+
+void InitConfigAndStorage();