refactoring

Co-authored-by: n.fedorov <mail@nfedorov.dev>
Co-committed-by: n.fedorov <mail@nfedorov.dev>

.clang-format

@@ -26,3 +26,4 @@ IncludeCategories:
 SpacesBeforeTrailingComments: 2
 Cpp11BracedListStyle: true
 Standard: c++17
+NamespaceIndentation: All

.gitattributes

@@ -1,10 +1,6 @@
 # Normalize line endings
 * text=auto eol=lf
 
-# Vendor: do not count toward language stats
-lib/Plutonium/** linguist-vendored=true
-deps/**          linguist-vendored=true
-
 # Binary assets
 *.png  binary
 *.jpg  binary

.gitea/workflows/build.yml

@@ -0,0 +1,79 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  nro:
+    name: Build NRO
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Build
+        run: |
+          AUTH_URL=$(echo "$GITHUB_SERVER_URL" | sed "s|://|://oauth2:${GITHUB_TOKEN}@|")
+          docker rm -f nxst-build 2>/dev/null || true
+          docker run --name nxst-build devkitpro/devkita64:latest \
+            bash -c "
+              git clone --recurse-submodules '${AUTH_URL}/${GITHUB_REPOSITORY}' /src &&
+              cd /src && git checkout '${GITHUB_SHA}' &&
+              cmake --preset switch &&
+              cmake --build build -j\$(nproc)
+            "
+          docker cp nxst-build:/src/build/NXST.nro ./NXST.nro
+          docker rm nxst-build
+
+      - name: Publish release
+        if: startsWith(github.ref, 'refs/tags/v')
+        env:
+          GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        run: |
+          release_id=$(curl -sf -X POST "${GITHUB_SERVER_URL}/api/v1/repos/${GITHUB_REPOSITORY}/releases" \
+            -H "Authorization: token $GITEA_TOKEN" \
+            -H "Content-Type: application/json" \
+            -d "{\"tag_name\": \"${GITHUB_REF_NAME}\", \"name\": \"${GITHUB_REF_NAME}\"}" \
+            | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
+
+          curl -sf -X POST "${GITHUB_SERVER_URL}/api/v1/repos/${GITHUB_REPOSITORY}/releases/${release_id}/assets?name=NXST.nro" \
+            -H "Authorization: token $GITEA_TOKEN" \
+            -H "Content-Type: application/octet-stream" \
+            --data-binary @./NXST.nro
+
+  format:
+    name: Format check
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        run: |
+          AUTH_URL=$(echo "$GITHUB_SERVER_URL" | sed "s|://|://oauth2:${GITHUB_TOKEN}@|")
+          git clone "${AUTH_URL}/${GITHUB_REPOSITORY}" .
+          git checkout "$GITHUB_SHA"
+
+      - name: Install clang-format
+        run: |
+          wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+          echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-22 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+          sudo apt-get update && sudo apt-get install -y clang-format-22
+          sudo ln -sf /usr/bin/clang-format-22 /usr/local/bin/clang-format
+
+      - name: Check formatting
+        run: |
+          find src include \( -name '*.cpp' -o -name '*.hpp' \) \
+            | xargs clang-format --dry-run --Werror
+
+  layering:
+    name: Layering check
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        run: |
+          AUTH_URL=$(echo "$GITHUB_SERVER_URL" | sed "s|://|://oauth2:${GITHUB_TOKEN}@|")
+          git clone "${AUTH_URL}/${GITHUB_REPOSITORY}" .
+          git checkout "$GITHUB_SHA"
+
+      - name: UI must not include net/sys headers
+        run: |
+          ! grep -rE '^#include\s*[<"](arpa/inet|sys/socket|pthread)' src/ui/

.github/workflows/build.yml

@@ -53,7 +53,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install clang-format
-        run: sudo apt-get install -y clang-format
+        run: |
+          wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+          echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-22 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+          sudo apt-get update && sudo apt-get install -y clang-format-22
+          sudo ln -sf /usr/bin/clang-format-22 /usr/local/bin/clang-format
 
       - name: Check formatting
         run: |

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 .serena
+.idea/
 
 # Prerequisites
 *.d
@@ -49,3 +50,4 @@ CMakeCache.txt
 CMakeFiles/
 cmake_install.cmake
 compile_commands.json
+.cache/

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "lib"]
-	path = lib
-	url = https://github.com/XorTroll/Plutonium.git

CMakeLists.txt

@@ -32,17 +32,10 @@ file(GLOB_RECURSE NXST_SOURCES
     src/ui/*.cpp
 )
 
-file(GLOB_RECURSE PLUTONIUM_SOURCES
+add_executable(NXST ${NXST_SOURCES})
-    lib/Plutonium/source/*.cpp
-)
-
-add_executable(NXST ${NXST_SOURCES} ${PLUTONIUM_SOURCES})
 
 # ── Include paths ─────────────────────────────────────────────────────────────
-target_include_directories(NXST PRIVATE
+target_include_directories(NXST PRIVATE include)
-    include
-    lib/Plutonium/include
-)
 
 # ── pkg-config (uses aarch64-none-elf-pkg-config set by Switch.cmake) ─────────
 find_package(PkgConfig REQUIRED)
@@ -56,13 +49,37 @@ pkg_check_modules(PORTLIBS REQUIRED IMPORTED_TARGET ${NXST_PKG_MODULES})
 
 target_include_directories(NXST PRIVATE ${PORTLIBS_INCLUDE_DIRS})
 
+# ── Plutonium ─────────────────────────────────────────────────────────────────
+include(ExternalProject)
+
+set(PLUTONIUM_SOURCE_DIR ${CMAKE_BINARY_DIR}/plutonium)
+set(LIBPU_A ${PLUTONIUM_SOURCE_DIR}/Plutonium/lib/libpu.a)
+
+ExternalProject_Add(plutonium_ep
+    GIT_REPOSITORY  https://github.com/XorTroll/Plutonium.git
+    GIT_TAG         b56564b70d038c59eef875f2c3cf436859c827f2
+    GIT_PROGRESS    ON
+    SOURCE_DIR      ${PLUTONIUM_SOURCE_DIR}
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND   make -j -C ${PLUTONIUM_SOURCE_DIR}/Plutonium
+    INSTALL_COMMAND ""
+    BUILD_IN_SOURCE 1
+    BUILD_BYPRODUCTS ${LIBPU_A}
+)
+
+add_library(plutonium STATIC IMPORTED GLOBAL)
+add_dependencies(plutonium plutonium_ep)
+set_target_properties(plutonium PROPERTIES
+    IMPORTED_LOCATION ${LIBPU_A}
+)
+target_include_directories(NXST PRIVATE ${PLUTONIUM_SOURCE_DIR}/Plutonium/include)
+
 # ── Link libraries ────────────────────────────────────────────────────────────
 # Order matters for static linking: put most dependent libs first.
-# libpu.a first (contains C wrappers not in Plutonium source).
 # drm_nouveau, harfbuzz, freetype, z appended explicitly after pkg-config output
 # to fix the freetype→harfbuzz static link order (see build notes from libnx update).
 target_link_libraries(NXST PRIVATE
-    ${CMAKE_SOURCE_DIR}/lib/Plutonium/lib/libpu.a
+    plutonium
     PkgConfig::PORTLIBS
     drm_nouveau
     harfbuzz

README.md

@@ -39,8 +39,8 @@ Logs are written to `/switch/NXST/log.log`.
 **Prerequisites:** [devkitPro](https://devkitpro.org/wiki/Getting_Started) with `switch-dev` and `switch-portlibs` packages, plus `cmake ≥ 3.20`.
 
 ```bash
-# Clone with submodules (Plutonium UI)
+# Clone (Plutonium UI fetched automatically by CMake)
-git clone --recurse-submodules https://github.com/your-username/NXST.git
+git clone https://github.com/your-username/NXST.git
 cd NXST
 
 # Configure (once)

deps/asprintf/asprintf.c

@@ -1,37 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "asprintf.h"
-
-int vasprintf(char **strp, const char *fmt, va_list ap) {
-	int size, res;
-
-	va_list cp;
-	va_copy(cp, ap);
-	size = vsnprintf(NULL, 0, fmt, cp);
-	va_end(cp);
-	if (size < 0)
-		return -1;
-
-	*strp = (char *)malloc(size + 1);
-	if (*strp == NULL)
-		return -1;
-
-	res = vsnprintf(*strp, size + 1, fmt, ap);
-	if (res < 0) {
-		free(*strp);
-		return -1;
-	}
-
-	return res;
-}
-
-int asprintf(char **s, const char *fmt, ...) {
-	int ret;
-
-	va_list ap;
-	va_start(ap, fmt);
-	ret = vasprintf(s, fmt, ap);
-	va_end(ap);
-	return ret;
-}

deps/asprintf/asprintf.h

@@ -1,10 +0,0 @@
-#ifndef HAVE_ASPRINTF
-#define HAVE_ASPRINTF 1
-
-#include <stdarg.h>
-
-int vasprintf(char **strp, const char *fmt, va_list ap);
-
-int asprintf(char **s, const char *fmt, ...);
-
-#endif

deps/asprintf/clib.json

@@ -1,9 +0,0 @@
-{
-	"name": "asprintf",
-	"version": "1.0.0",
-	"repo": "Neved4/asprintf",
-	"description": "asprintf, vasprintf - print to allocated string",
-	"license": "MIT",
-	"keywords": ["asprintf", "sprintf", "alloc", "string"],
-	"src": ["asprintf.c", "asprintf.h"]
-}

docs/PROTOCOL.md

@@ -38,7 +38,7 @@ Sender polls in 100 ms slices for up to 3 seconds. Cancel is checked each slice.
 |-----------|-------|
 | Port | `8080` |
 | Direction | sender connects → receiver listens |
-| Buffer size | 65 536 bytes (`proto::BUF_SIZE`) |
+| Buffer size | 65 536 bytes (`proto::kBufSize`) |
 
 **Connection:**
 
@@ -64,14 +64,14 @@ Sender polls in 100 ms slices for up to 3 seconds. Cancel is checked each slice.
 Files are sent sequentially. The stream ends with a sentinel frame:
 
 ```
-filename_len == 0   (proto::EOF_SENTINEL)
+filename_len == 0   (proto::kEofSentinel)
 ```
 
 No `filename` or `file_size` field follows the sentinel.
 
 **Constraints:**
 
-- `filename_len > proto::MAX_FILENAME` (4 096) is treated as a protocol error; the receiver aborts.
+- `filename_len > proto::kMaxFilename` (4 096) is treated as a protocol error; the receiver aborts.
 - Filenames are full paths as produced by `io::backup` (e.g. `/switch/NXST/<title>/<user>/...`).
 - On the receiver, the username path component is rewritten to match the local user's nickname before writing to disk.
 

include/nxst/app/main.hpp

@@ -1,23 +0,0 @@
-#pragma once
-#include <nxst/ui/const.h>
-#include <nxst/domain/account.hpp>
-#include <nxst/domain/title.hpp>
-#include <nxst/domain/util.hpp>
-#include <memory>
-#include <switch.h>
-#include <nxst/infra/sys/logger.hpp>
-
-typedef enum { SORT_ALPHA, SORT_LAST_PLAYED, SORT_PLAY_TIME, SORT_MODES_COUNT } sort_t;
-
-inline float g_currentTime = 0;
-inline bool g_backupScrollEnabled       = 0;
-inline bool g_notificationLedAvailable  = false;
-inline bool g_shouldExitNetworkLoop     = false;
-inline std::string g_selectedCheatKey;
-inline std::vector<std::string> g_selectedCheatCodes;
-inline u32 g_username_dotsize;
-inline sort_t g_sortMode         = SORT_ALPHA;
-inline std::string g_currentFile = "";
-inline bool g_isTransferringFile = false;
-inline const std::string g_emptySave = "New...";
-

include/nxst/app/main_application.hpp

@@ -1,15 +1,16 @@
 #pragma once
 
 #include <pu/Plutonium>
+
 #include <nxst/service/transfer_service.hpp>
-#include <nxst/ui/users_layout.hpp>
 #include <nxst/ui/titles_layout.hpp>
+#include <nxst/ui/users_layout.hpp>
 
 namespace ui {
 
     class MainApplication : public pu::ui::Application {
 
-    public:
+      public:
         using Application::Application;
         PU_SMART_CTOR(MainApplication)
 
@@ -19,4 +20,4 @@ namespace ui {
         TitlesLayout::Ref titles_layout;
         nxst::TransferService transfer;
     };
-}
+}  // namespace ui

include/nxst/domain/account.hpp

@@ -1,59 +1,25 @@
-/*
+// Copyright (C) 2024-2026 NXST contributors
- *   This file is part of Checkpoint
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
-
 #pragma once
-#include <map>
-#include <string.h>
 #include <string>
-#include <switch.h>
 #include <vector>
 
-#define USER_ICON_SIZE 64
+#include <switch.h>
 
+// Hash and comparison support for AccountUid as map/unordered_map key.
 namespace std {
-    template <>
+    template <> struct hash<AccountUid> {
-    struct hash<AccountUid> {
+        size_t operator()(const AccountUid& a) const noexcept {
-        size_t operator()(const AccountUid& a) const { return ((hash<u64>()(a.uid[0]) ^ (hash<u64>()(a.uid[1]) << 1)) >> 1); }
+            return (hash<u64>()(a.uid[0]) ^ (hash<u64>()(a.uid[1]) << 1)) >> 1;
+        }
     };
-}
+}  // namespace std
 
-inline bool operator==(const AccountUid& x, const AccountUid& y)
+inline bool operator==(const AccountUid& x, const AccountUid& y) {
-{
     return x.uid[0] == y.uid[0] && x.uid[1] == y.uid[1];
 }
 
-inline bool operator==(const AccountUid& x, u64 y)
+inline bool operator<(const AccountUid& x, const AccountUid& y) {
-{
+    return x.uid[0] != y.uid[0] ? x.uid[0] < y.uid[0] : x.uid[1] < y.uid[1];
-    return x.uid[0] == y && x.uid[1] == y;
-}
-
-inline bool operator<(const AccountUid& x, const AccountUid& y)
-{
-    if (x.uid[0] != y.uid[0]) return x.uid[0] < y.uid[0];
-    return x.uid[1] < y.uid[1];
 }
 
 struct User {
@@ -61,13 +27,10 @@ struct User {
     std::string name;
 };
 
-namespace Account {
+namespace account {
-    Result init(void);
+    Result init();
-    void exit(void);
+    void exit();
-
+    std::vector<AccountUid> ids();
-    std::vector<AccountUid> ids(void);
-    AccountUid selectAccount(void);
     std::string username(AccountUid id);
     std::string iconPath(AccountUid id);
-}
+}  // namespace account
-

include/nxst/domain/common.hpp

@@ -1,62 +0,0 @@
-/*
- *   This file is part of Checkpoint
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
-
-#pragma once
-#include <algorithm>
-#include <arpa/inet.h>
-#include <codecvt>
-#include <cstdio>
-#include <locale>
-#include <memory>
-#include <netinet/in.h>
-#include <stdarg.h>
-#include <string.h>
-#include <string>
-#include <sys/socket.h>
-#include <time.h>
-#include <unistd.h>
-
-#define ATEXIT(func) atexit((void (*)())func)
-
-namespace DateTime {
-    std::string timeStr(void);
-    std::string dateTimeStr(void);
-    std::string logDateTime(void);
-}
-
-namespace StringUtils {
-    bool containsInvalidChar(const std::string& str);
-    std::string escapeJson(const std::string& s);
-    std::string format(const std::string fmt_str, ...);
-    std::string removeForbiddenCharacters(std::string src);
-    std::string UTF16toUTF8(const std::u16string& src);
-    void ltrim(std::string& s);
-    void rtrim(std::string& s);
-    void trim(std::string& s);
-}
-
-char* getConsoleIP(void);
-

include/nxst/domain/protocol.hpp

@@ -1,17 +1,16 @@
 #pragma once
-#include <cstdint>
 
 namespace proto {
-    constexpr uint16_t TCP_PORT       = 8080;
+    constexpr uint16_t kTcpPort = 8080;
-    constexpr uint16_t MULTICAST_PORT = 8081;
+    constexpr uint16_t kMulticastPort = 8081;
-    constexpr char     MULTICAST_GROUP[] = "239.0.0.1";
+    constexpr char kMulticastGroup[] = "239.0.0.1";
-    constexpr size_t   BUF_SIZE       = 65536;
+    constexpr size_t kBufSize = 65536;
-    constexpr uint32_t MAX_FILENAME   = 4096;
+    constexpr uint32_t kMaxFilename = 4096;
-    constexpr uint32_t EOF_SENTINEL   = 0;
+    constexpr uint32_t kEofSentinel = 0;
 
     // Wire layout per file:
     //   [filename_len : uint32_t LE]   — 0 == end-of-stream
     //   [filename     : filename_len bytes]
     //   [file_size    : uint64_t LE]
     //   [file_data    : file_size bytes]
-}
+}  // namespace proto

include/nxst/domain/result.hpp

@@ -4,82 +4,105 @@
 
 namespace nxst {
 
-template <class T, class E = std::string>
+    template <class T, class E = std::string> class Result {
-class Result {
+        bool ok;
-    bool ok;
+        alignas(T) alignas(E) unsigned char storage[sizeof(T) > sizeof(E) ? sizeof(T) : sizeof(E)];
-    alignas(T) alignas(E) unsigned char storage[sizeof(T) > sizeof(E) ? sizeof(T) : sizeof(E)];
 
-    Result() = default;
+        Result() = default;
 
-public:
+      public:
-    static Result success(T val) {
+        static Result success(T val) {
-        Result res;
+            Result res;
-        res.ok = true;
+            res.ok = true;
-        new (res.storage) T(std::move(val));
+            new (res.storage) T(std::move(val));
-        return res;
+            return res;
-    }
+        }
 
-    static Result failure(E err) {
+        static Result failure(E err) {
-        Result res;
+            Result res;
-        res.ok = false;
+            res.ok = false;
-        new (res.storage) E(std::move(err));
+            new (res.storage) E(std::move(err));
-        return res;
+            return res;
-    }
+        }
 
-    ~Result() {
+        ~Result() {
-        if (ok) reinterpret_cast<T*>(storage)->~T();
+            if (ok)
-        else    reinterpret_cast<E*>(storage)->~E();
+                reinterpret_cast<T*>(storage)->~T();
-    }
+            else
+                reinterpret_cast<E*>(storage)->~E();
+        }
 
-    Result(const Result& other) : ok(other.ok) {
+        Result(const Result& other) : ok(other.ok) {
-        if (ok) new (storage) T(*reinterpret_cast<const T*>(other.storage));
+            if (ok)
-        else    new (storage) E(*reinterpret_cast<const E*>(other.storage));
+                new (storage) T(*reinterpret_cast<const T*>(other.storage));
-    }
+            else
+                new (storage) E(*reinterpret_cast<const E*>(other.storage));
+        }
 
-    Result(Result&& other) : ok(other.ok) {
+        Result(Result&& other) : ok(other.ok) {
-        if (ok) new (storage) T(std::move(*reinterpret_cast<T*>(other.storage)));
+            if (ok)
-        else    new (storage) E(std::move(*reinterpret_cast<E*>(other.storage)));
+                new (storage) T(std::move(*reinterpret_cast<T*>(other.storage)));
-    }
+            else
+                new (storage) E(std::move(*reinterpret_cast<E*>(other.storage)));
+        }
 
-    Result& operator=(const Result&) = delete;
+        Result& operator=(const Result&) = delete;
 
-    bool     isOk()  const noexcept { return ok; }
+        bool isOk() const noexcept {
-    const T& value() const { return *reinterpret_cast<const T*>(storage); }
+            return ok;
-    const E& error() const { return *reinterpret_cast<const E*>(storage); }
+        }
-};
+        const T& value() const {
+            return *reinterpret_cast<const T*>(storage);
+        }
+        const E& error() const {
+            return *reinterpret_cast<const E*>(storage);
+        }
+    };
 
-// Specialisation for Result<void>
+    // Specialisation for Result<void>
-template <class E>
+    template <class E> class Result<void, E> {
-class Result<void, E> {
+        bool ok;
-    bool ok;
+        alignas(E) unsigned char storage[sizeof(E)];
-    alignas(E) unsigned char storage[sizeof(E)];
 
-    Result() = default;
+        Result() = default;
 
-public:
+      public:
-    static Result success() { Result res; res.ok = true; return res; }
+        static Result success() {
+            Result res;
+            res.ok = true;
+            return res;
+        }
 
-    static Result failure(E err) {
+        static Result failure(E err) {
-        Result res;
+            Result res;
-        res.ok = false;
+            res.ok = false;
-        new (res.storage) E(std::move(err));
+            new (res.storage) E(std::move(err));
-        return res;
+            return res;
-    }
+        }
 
-    ~Result() { if (!ok) reinterpret_cast<E*>(storage)->~E(); }
+        ~Result() {
+            if (!ok)
+                reinterpret_cast<E*>(storage)->~E();
+        }
 
-    Result(const Result& other) : ok(other.ok) {
+        Result(const Result& other) : ok(other.ok) {
-        if (!ok) new (storage) E(*reinterpret_cast<const E*>(other.storage));
+            if (!ok)
-    }
+                new (storage) E(*reinterpret_cast<const E*>(other.storage));
+        }
 
-    Result(Result&& other) : ok(other.ok) {
+        Result(Result&& other) : ok(other.ok) {
-        if (!ok) new (storage) E(std::move(*reinterpret_cast<E*>(other.storage)));
+            if (!ok)
-    }
+                new (storage) E(std::move(*reinterpret_cast<E*>(other.storage)));
+        }
 
-    Result& operator=(const Result&) = delete;
+        Result& operator=(const Result&) = delete;
 
-    bool     isOk()  const noexcept { return ok; }
+        bool isOk() const noexcept {
-    const E& error() const { return *reinterpret_cast<const E*>(storage); }
+            return ok;
-};
+        }
+        const E& error() const {
+            return *reinterpret_cast<const E*>(storage);
+        }
+    };
 
-} // namespace nxst
+}  // namespace nxst

include/nxst/domain/title.hpp

@@ -1,88 +1,58 @@
-/*
+// Copyright (C) 2024-2026 NXST contributors
- *   This file is part of Checkpoint
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
-
 #pragma once
-#include <nxst/domain/account.hpp>
-#include <nxst/infra/fs/filesystem.hpp>
-#include <nxst/infra/fs/io.hpp>
-#include <algorithm>
-#include <stdlib.h>
 #include <string>
-#include <switch.h>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
+#include <switch.h>
+
 class Title {
-public:
+  public:
-    void init(u8 saveDataType, u64 titleid, AccountUid userID, const std::string& name, const std::string& author);
+    void init(u8 save_data_type, u64 title_id, AccountUid uid, const std::string& name,
-    ~Title() = default;
+              const std::string& author);
 
-    std::string author(void);
+    std::string author() const;
-    std::pair<std::string, std::string> displayName(void);
+    std::pair<std::string, std::string> displayName() const;
-    u64 id(void);
+    u64 id() const;
-    std::string name(void);
+    std::string name() const;
-    std::string path(void);
+    std::string path() const;
-    u64 playTimeNanoseconds(void);
+    u64 playTimeNanoseconds() const;
-    std::string playTime(void);
+    std::string playTime() const;
-    void playTimeNanoseconds(u64 playTimeNanoseconds);
+    void playTimeNanoseconds(u64 ns);
-    u32 lastPlayedTimestamp(void);
+    u32 lastPlayedTimestamp() const;
-    void lastPlayedTimestamp(u32 lastPlayedTimestamp);
+    void lastPlayedTimestamp(u32 ts);
-    std::string fullPath(size_t index);
+    std::string fullPath(size_t index) const;
-    void refreshDirectories(void);
+    void refreshDirectories();
-    u64 saveId();
+    u64 saveId() const;
     void saveId(u64 id);
-    std::vector<std::string> saves(void);
+    std::vector<std::string> saves() const;
-    u8 saveDataType(void);
+    u8 saveDataType() const;
-    AccountUid userId(void);
+    AccountUid userId() const;
-    std::string userName(void);
+    std::string userName() const;
 
-private:
+  private:
-    u64 mId;
+    u64 m_id{0};
-    u64 mSaveId;
+    u64 m_save_id{0};
-    AccountUid mUserId;
+    AccountUid m_uid{};
-    std::string mUserName;
+    std::string m_user_name;
-    std::string mName;
+    std::string m_name;
-    std::string mSafeName;
+    std::string m_safe_name;
-    std::string mAuthor;
+    std::string m_author;
-    std::string mPath;
+    std::string m_path;
-    std::vector<std::string> mSaves;
+    std::vector<std::string> m_saves;
-    std::vector<std::string> mFullSavePaths;
+    std::vector<std::string> m_full_save_paths;
-    u8 mSaveDataType;
+    u8 m_save_data_type{0};
-    std::pair<std::string, std::string> mDisplayName;
+    std::pair<std::string, std::string> m_display_name;
-    u64 mPlayTimeNanoseconds;
+    u64 m_play_time_ns{0};
-    u32 mLastPlayedTimestamp;
+    u32 m_last_played_ts{0};
 };
 
+bool areTitlesLoaded();
+void loadTitles();
+void sortTitles();
+void rotateSortMode();
 void getTitle(Title& dst, AccountUid uid, size_t i);
 size_t getTitleCount(AccountUid uid);
-void loadTitles(void);
-bool areTitlesLoaded(void);
-void sortTitles(void);
-void rotateSortMode(void);
 void refreshDirectories(u64 id);
-std::unordered_map<std::string, std::string> getCompleteTitleList(void);
+std::unordered_map<std::string, std::string> getCompleteTitleList();
-

include/nxst/domain/transfer_state.hpp

@@ -4,22 +4,22 @@
 #include <string>
 
 struct TransferState {
-    std::atomic<bool>     done{false};
+    std::atomic<bool> done{false};
-    std::atomic<bool>     cancelled{false};
+    std::atomic<bool> cancelled{false};
-    std::atomic<bool>     connection_failed{false};
+    std::atomic<bool> connection_failed{false};
     std::atomic<uint64_t> bytes_done{0};
     std::atomic<uint64_t> bytes_total{0};
 
-    std::string    status;
+    std::string status;
-    std::string    fail_reason;
+    std::string fail_reason;
     mutable std::mutex status_mutex;
 
     void reset() {
-        done              = false;
+        done = false;
-        cancelled         = false;
+        cancelled = false;
         connection_failed = false;
-        bytes_done        = 0;
+        bytes_done = 0;
-        bytes_total       = 0;
+        bytes_total = 0;
         fail_reason.clear();
         std::lock_guard<std::mutex> lock(status_mutex);
         status.clear();

include/nxst/domain/util.hpp

@@ -1,51 +1,22 @@
-/*
+// Copyright (C) 2024-2026 NXST contributors
- *   This file is part of Checkpoint
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
-
 #pragma once
-#include <nxst/domain/account.hpp>
+
-#include <nxst/domain/common.hpp>
-#include <nxst/infra/fs/io.hpp>
 #include <switch.h>
-#include <sys/stat.h>
 
-// debug
+void servicesExit();
-#include <arpa/inet.h>
+Result servicesInit();
-#include <sys/errno.h>
-#include <sys/socket.h>
-
-void servicesExit(void);
-Result servicesInit(void);
-HidsysNotificationLedPattern blinkLedPattern(u8 times);
 void blinkLed(u8 times);
 
-namespace StringUtils {
+namespace string_utils {
+    bool containsInvalidChar(const std::string& str);
+    std::string format(const char* fmt, ...) __attribute__((format(printf, 1, 2)));
+    std::string removeForbiddenCharacters(std::string src);
+    std::string UTF16toUTF8(const std::u16string& src);
+    void ltrim(std::string& s);
+    void rtrim(std::string& s);
+    void trim(std::string& s);
     std::string removeAccents(std::string str);
     std::string removeNotAscii(std::string str);
     std::u16string UTF8toUTF16(const char* src);
-    std::string elide(const std::string& s, size_t maxChars);
+    std::string elide(const std::string& s, size_t max_chars);
-}
+}  // namespace string_utils
-
-

include/nxst/infra/fs/directory.hpp

@@ -1,55 +1,32 @@
-/*
+// Copyright (C) 2024-2026 NXST contributors
- *   This file is part of Checkpoint
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
-
 #pragma once
-#include <dirent.h>
-#include <errno.h>
 #include <string>
-#include <switch.h>
 #include <vector>
 
-struct DirectoryEntry {
+#include <switch.h>
-    std::string name;
-    bool directory;
-};
 
 class Directory {
-public:
+  public:
-    Directory(const std::string& root);
+    explicit Directory(const std::string& path);
-    ~Directory() = default;
 
-    Result error(void);
+    bool good() const {
-    std::string entry(size_t index);
+        return m_good;
-    bool folder(size_t index);
+    }
-    bool good(void);
+    Result error() const {
-    size_t size(void);
+        return m_error;
+    }
+    size_t size() const {
+        return m_entries.size();
+    }
+    std::string entry(size_t i) const;
+    bool folder(size_t i) const;
 
-private:
+  private:
-    std::vector<struct DirectoryEntry> mList;
+    struct Entry {
-    Result mError;
+        std::string name;
-    bool mGood;
+        bool is_dir;
+    };
+    std::vector<Entry> m_entries;
+    Result m_error{0};
+    bool m_good{false};
 };
-

include/nxst/infra/fs/filesystem.hpp

@@ -1,36 +1,9 @@
-/*
+// Copyright (C) 2024-2026 NXST contributors
- *   This file is part of Checkpoint
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
-
 #pragma once
-#include <nxst/domain/account.hpp>
 #include <switch.h>
 
-namespace FileSystem {
+namespace file_system {
-    Result mount(FsFileSystem* fileSystem, u64 titleID, AccountUid userID);
+    Result mount(FsFileSystem* fs, u64 title_id, AccountUid uid);
     int mount(FsFileSystem fs);
-    void unmount(void);
+    void unmount();
-}
+}  // namespace file_system
-

include/nxst/infra/fs/handles.hpp

@@ -1,37 +1,71 @@
 #pragma once
 #include <cstdio>
+
 #include <switch.h>
 
 namespace nxst {
 
-// RAII wrapper for FsFileSystem — auto-closes on destruction.
+    // RAII wrapper for FsFileSystem — auto-closes on destruction.
-struct FsFileSystemHandle {
+    struct FsFileSystemHandle {
-    FsFileSystem fs{};
+        FsFileSystem fs{};
-    bool valid{false};
+        bool valid{false};
 
-    FsFileSystemHandle() = default;
+        FsFileSystemHandle() = default;
-    ~FsFileSystemHandle() { if (valid) fsFsClose(&fs); } // NOLINT(modernize-use-equals-default)
+        ~FsFileSystemHandle() {
+            if (valid)
+                fsFsClose(&fs);
+        }  // NOLINT(modernize-use-equals-default)
 
-    FsFileSystemHandle(const FsFileSystemHandle&)            = delete;
+        FsFileSystemHandle(const FsFileSystemHandle&) = delete;
-    FsFileSystemHandle& operator=(const FsFileSystemHandle&) = delete;
+        FsFileSystemHandle& operator=(const FsFileSystemHandle&) = delete;
 
-    FsFileSystem* get() { return &fs; }
+        FsFileSystem* get() {
+            return &fs;
+        }
 
-    void release() { valid = false; }  // transfer ownership to devfs
+        void release() {
-};
+            valid = false;
+        }  // transfer ownership to devfs
+    };
 
-// RAII wrapper for FILE* — auto-fclose on destruction.
+    // RAII wrapper for FILE* — auto-fclose on destruction.
-struct FileHandle {
+    struct FileHandle {
-    FILE* ptr{nullptr};
+        FILE* ptr{nullptr};
 
-    explicit FileHandle(FILE* file) : ptr(file) {}
+        explicit FileHandle(FILE* file) : ptr(file) {}
-    ~FileHandle() { if (ptr != nullptr) fclose(ptr); } // NOLINT(modernize-use-equals-default)
+        ~FileHandle() {
+            if (ptr != nullptr)
+                fclose(ptr);
+        }  // NOLINT(modernize-use-equals-default)
 
-    FileHandle(const FileHandle&)            = delete;
+        FileHandle(const FileHandle&) = delete;
-    FileHandle& operator=(const FileHandle&) = delete;
+        FileHandle& operator=(const FileHandle&) = delete;
 
-    explicit operator bool() const { return ptr != nullptr; }
+        explicit operator bool() const {
-    FILE* get() const { return ptr; }
+            return ptr != nullptr;
-};
+        }
+        FILE* get() const {
+            return ptr;
+        }
+    };
 
-} // namespace nxst
+    // RAII wrapper for AccountProfile — auto-closes on destruction.
+    struct AccountProfileHandle {
+        AccountProfile profile{};
+        bool valid{false};
+
+        AccountProfileHandle() = default;
+        ~AccountProfileHandle() {
+            if (valid)
+                accountProfileClose(&profile);
+        }  // NOLINT(modernize-use-equals-default)
+
+        AccountProfileHandle(const AccountProfileHandle&) = delete;
+        AccountProfileHandle& operator=(const AccountProfileHandle&) = delete;
+
+        AccountProfile* get() {
+            return &profile;
+        }
+    };
+
+}  // namespace nxst

include/nxst/infra/fs/io.hpp

@@ -1,51 +1,19 @@
-/*
+// Copyright (C) 2024-2026 NXST contributors
- *   This file is part of Checkpoint
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
-
 #pragma once
-#include <nxst/domain/account.hpp>
+#include <string>
-#include <nxst/domain/result.hpp>
-#include <nxst/infra/fs/directory.hpp>
-#include <nxst/domain/title.hpp>
-#include <nxst/domain/util.hpp>
-#include <dirent.h>
-#include <switch.h>
-#include <sys/stat.h>
-#include <unistd.h>
 
-#define BUFFER_SIZE 0x80000
+#include <switch.h>
+
+#include <nxst/domain/result.hpp>
 
 namespace io {
     nxst::Result<std::string> backup(size_t index, AccountUid uid);
-    nxst::Result<std::string> restore(size_t index, AccountUid uid, size_t cellIndex, const std::string& nameFromCell);
+    nxst::Result<std::string> restore(size_t index, AccountUid uid, const std::string& title_name);
 
-    Result copyDirectory(const std::string& srcPath, const std::string& dstPath);
+    Result copyDirectory(const std::string& src, const std::string& dst);
-    void   copyFile(const std::string& srcPath, const std::string& dstPath);
+    void copyFile(const std::string& src, const std::string& dst);
     Result createDirectory(const std::string& path);
     Result deleteFolderRecursively(const std::string& path);
-    bool   directoryExists(const std::string& path);
+    bool directoryExists(const std::string& path);
-    bool   fileExists(const std::string& path);
+    bool fileExists(const std::string& path);
-}
+}  // namespace io
-

include/nxst/infra/net/socket.hpp

@@ -6,13 +6,24 @@ struct Socket {
 
     Socket() = default;
     explicit Socket(int fd) : fd(fd) {}
-    ~Socket() { if (fd >= 0) close(fd); }
+    ~Socket() {
+        if (fd >= 0)
+            close(fd);
+    }
 
-    Socket(const Socket&)            = delete;
+    Socket(const Socket&) = delete;
     Socket& operator=(const Socket&) = delete;
-    Socket(Socket&& o) : fd(o.fd) { o.fd = -1; }
+    Socket(Socket&& o) : fd(o.fd) {
+        o.fd = -1;
+    }
 
-    operator int()   const { return fd; }
+    operator int() const {
-    bool valid()     const { return fd >= 0; }
+        return fd;
-    void release()         { fd = -1; }
+    }
+    bool valid() const {
+        return fd >= 0;
+    }
+    void release() {
+        fd = -1;
+    }
 };

include/nxst/infra/net/transfer_receiver.hpp

@@ -1 +0,0 @@
-#pragma once

include/nxst/infra/net/transfer_sender.hpp

@@ -1 +0,0 @@
-#pragma once

include/nxst/infra/sys/logger.hpp

@@ -1,55 +1,14 @@
 #pragma once
 
-#include <cstring>
-#include <string>
-
 // New API — use these going forward.
 namespace nxst::log {
 
-enum class Level { Debug, Info, Warn, Error };
+    enum class Level { Debug, Info, Warn, Error };
 
-void write(Level level, const char* fmt, ...) __attribute__((format(printf, 2, 3)));
+    void write(Level level, const char* fmt, ...) __attribute__((format(printf, 2, 3)));
-void debug(const char* fmt, ...)             __attribute__((format(printf, 1, 2)));
+    void debug(const char* fmt, ...) __attribute__((format(printf, 1, 2)));
-void info (const char* fmt, ...)             __attribute__((format(printf, 1, 2)));
+    void info(const char* fmt, ...) __attribute__((format(printf, 1, 2)));
-void warn (const char* fmt, ...)             __attribute__((format(printf, 1, 2)));
+    void warn(const char* fmt, ...) __attribute__((format(printf, 1, 2)));
-void error(const char* fmt, ...)             __attribute__((format(printf, 1, 2)));
+    void error(const char* fmt, ...) __attribute__((format(printf, 1, 2)));
 
-// No-op: writes are immediate. Kept for source compatibility during migration.
+}  // namespace nxst::log
-inline void flush() {}
-
-} // namespace nxst::log
-
-// Backward-compat shim — existing Logger::getInstance().log(...) call sites compile
-// unchanged. Format args are dropped (same behavior as broken original). Migrate
-// call sites to nxst::log::* in Phase 3.
-struct Logger {
-    static Logger& getInstance()
-    {
-        static Logger instance;
-        return instance;
-    }
-
-    // clang-tidy naming suppressed: these must match existing call sites during migration.
-    static constexpr const char* INFO  = "[INFO]";   // NOLINT(readability-identifier-naming)
-    static constexpr const char* DEBUG = "[DEBUG]";  // NOLINT(readability-identifier-naming)
-    static constexpr const char* ERROR = "[ERROR]";  // NOLINT(readability-identifier-naming)
-    static constexpr const char* WARN  = "[WARN]";   // NOLINT(readability-identifier-naming)
-
-    static void flush() { nxst::log::flush(); }
-
-    // Args intentionally dropped — format string still logged for visibility.
-    template <typename... Args>
-    void log(const std::string& level, const std::string& fmt, Args&&... /*args*/)
-    {
-        if (level == ERROR)      nxst::log::error("%s", fmt.c_str());
-        else if (level == WARN)  nxst::log::warn("%s", fmt.c_str());
-        else if (level == DEBUG) nxst::log::debug("%s", fmt.c_str());
-        else                     nxst::log::info("%s", fmt.c_str());
-    }
-
-    Logger()  = default;
-    ~Logger() = default;
-
-    Logger(const Logger&)            = delete;  // NOLINT(modernize-use-equals-delete)
-    Logger& operator=(const Logger&) = delete;  // NOLINT(modernize-use-equals-delete)
-};

include/nxst/service/transfer_service.hpp

@@ -2,75 +2,112 @@
 #include <atomic>
 #include <pthread.h>
 #include <string>
+
 #include <switch.h>
+
 #include <nxst/domain/transfer_state.hpp>
 
 namespace nxst {
 
-class TransferService {
+    class TransferService {
-public:
+      public:
-    int  startSend(size_t title_index, AccountUid uid);
+        int startSend(size_t title_index, AccountUid uid);
-    void cancelSend();
+        void cancelSend();
 
-    bool        isSendDone()             const { return sender_state.done.load(); }
+        bool isSendDone() const {
-    bool        isSendCancelled()        const { return sender_state.cancelled.load(); }
+            return sender_state.done.load();
-    bool        isSendConnectionFailed() const { return sender_state.connection_failed.load(); }
+        }
-    bool        isSendProgressKnown()    const { return sender_state.bytes_total.load() > 0; }
+        bool isSendCancelled() const {
-    bool        isSendWorkersIdle()      const { return !sender_active.load(); }
+            return sender_state.cancelled.load();
-    double      sendProgress()           const { return sender_state.progress(); }
+        }
-    std::string sendStatusText()         const { return sender_state.getStatus(); }
+        bool isSendConnectionFailed() const {
-    std::string sendFailReason()         const { return sender_state.fail_reason; }
+            return sender_state.connection_failed.load();
+        }
+        bool isSendProgressKnown() const {
+            return sender_state.bytes_total.load() > 0;
+        }
+        bool isSendWorkersIdle() const {
+            return !sender_active.load();
+        }
+        double sendProgress() const {
+            return sender_state.progress();
+        }
+        std::string sendStatusText() const {
+            return sender_state.getStatus();
+        }
+        std::string sendFailReason() const {
+            return sender_state.fail_reason;
+        }
 
-    int  startReceive(size_t title_index, AccountUid uid, std::string title_name);
+        int startReceive(size_t title_index, AccountUid uid, std::string title_name);
-    void cancelReceive();
+        void cancelReceive();
 
-    bool        isReceiveDone()        const { return receiver_state.done.load(); }
+        bool isReceiveDone() const {
-    bool        isReceiveCancelled()   const { return receiver_state.cancelled.load(); }
+            return receiver_state.done.load();
-    bool        isReceiveWorkersIdle() const {
+        }
-        return !receiver_accept_active.load() && !receiver_broadcast_active.load();
+        bool isReceiveCancelled() const {
-    }
+            return receiver_state.cancelled.load();
-    double      receiveProgress()      const { return receiver_state.progress(); }
+        }
-    std::string receiveStatusText()    const { return receiver_state.getStatus(); }
+        bool isReceiveWorkersIdle() const {
-    bool        restoreSucceeded()     const { return restore_ok; }
+            return !receiver_accept_active.load() && !receiver_broadcast_active.load();
-    std::string restoreError()         const { return restore_error; }
+        }
+        double receiveProgress() const {
+            return receiver_state.progress();
+        }
+        std::string receiveStatusText() const {
+            return receiver_state.getStatus();
+        }
+        bool restoreSucceeded() const {
+            return restore_ok;
+        }
+        std::string restoreError() const {
+            return restore_error;
+        }
 
-private:
+      private:
-    // Sender
+        // Sender
-    TransferState     sender_state;
+        TransferState sender_state;
-    std::atomic<int>  sender_udp_sock{-1};
+        std::atomic<int> sender_udp_sock{-1};
-    std::atomic<int>  sender_tcp_sock{-1};
+        std::atomic<int> sender_tcp_sock{-1};
-    std::atomic<bool> sender_active{false};
+        std::atomic<bool> sender_active{false};
 
-    // Receiver
+        // Receiver
-    TransferState     receiver_state;
+        TransferState receiver_state;
-    std::atomic<int>  receiver_client_sock{-1};
+        std::atomic<int> receiver_client_sock{-1};
-    std::atomic<int>  receiver_listen_sock{-1};
+        std::atomic<int> receiver_listen_sock{-1};
-    std::atomic<int>  receiver_bcast_sock{-1};
+        std::atomic<int> receiver_bcast_sock{-1};
-    std::atomic<bool> receiver_accept_active{false};
+        std::atomic<bool> receiver_accept_active{false};
-    std::atomic<bool> receiver_broadcast_active{false};
+        std::atomic<bool> receiver_broadcast_active{false};
-    pthread_t         receiver_bcast_thread{};
+        pthread_t receiver_bcast_thread{};
 
-    // Stored at startReceive, read after network transfer completes
+        // Stored at startReceive, read after network transfer completes
-    size_t      restore_title_index{0};
+        size_t restore_title_index{0};
-    AccountUid  restore_uid{};
+        AccountUid restore_uid{};
-    std::string restore_title_name;
+        std::string restore_title_name;
-    bool        restore_ok{false};
+        bool restore_ok{false};
-    std::string restore_error;
+        std::string restore_error;
 
-    // Sender thread
+        // Sender thread
-    struct SenderArgs { TransferService* svc; size_t title_index; AccountUid uid; };
+        struct SenderArgs {
-    static void* senderEntry(void* arg);
+            TransferService* svc;
-    void         runSender(size_t title_index, AccountUid uid);
+            size_t title_index;
-    void         failSend(const std::string& reason);
+            AccountUid uid;
-    int          findServer(char* out_ip);
+        };
+        static void* senderEntry(void* arg);
+        void runSender(size_t title_index, AccountUid uid);
+        void failSend(const std::string& reason);
+        int findServer(char* out_ip);
 
-    // Receiver threads
+        // Receiver threads
-    struct AcceptArgs { TransferService* svc; int server_fd; };
+        struct AcceptArgs {
-    static void* broadcastEntry(void* arg);
+            TransferService* svc;
-    static void* acceptEntry(void* arg);
+            int server_fd;
-    void         runBroadcast();
+        };
-    void         runAccept(int server_fd);
+        static void* broadcastEntry(void* arg);
-    std::string  replaceUsername(const std::string& file_path) const;
+        static void* acceptEntry(void* arg);
-};
+        void runBroadcast();
+        void runAccept(int server_fd);
+        std::string replaceUsername(const std::string& file_path) const;
+    };
 
-} // namespace nxst
+}  // namespace nxst

include/nxst/ui/card.hpp

@@ -1,18 +0,0 @@
-#pragma once
-#include <pu/Plutonium>
-#include <nxst/ui/theme.hpp>
-
-namespace ui {
-
-    class Card {
-    public:
-        pu::ui::elm::Rectangle::Ref bg;
-
-        Card(pu::ui::Layout* parent, int x, int y, int w, int h,
-             pu::ui::Color color = theme::color::BgSurface,
-             int rad = theme::radius::lg) {
-            bg = pu::ui::elm::Rectangle::New(x, y, w, h, color, rad);
-            parent->Add(bg);
-        }
-    };
-}

include/nxst/ui/const.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <nxst/ui/theme.hpp>
-
-#define COLOR(hex) pu::ui::Color::FromHex(hex)
-#define BACKGROUND_COLOR theme::color::BgBase

include/nxst/ui/header_bar.hpp

@@ -1,13 +1,13 @@
 #pragma once
 #include <pu/Plutonium>
-#include <nxst/ui/theme.hpp>
+
-#include <nxst/ui/ui_context.hpp>
 #include <nxst/domain/account.hpp>
+#include <nxst/ui/theme.hpp>
 
 namespace ui {
 
     class HeaderBar {
-    private:
+      private:
         pu::ui::elm::Rectangle::Ref bg;
         pu::ui::elm::Rectangle::Ref divider;
         pu::ui::elm::TextBlock::Ref appName;
@@ -16,14 +16,12 @@ namespace ui {
         pu::ui::elm::Image::Ref avatar;
         pu::ui::elm::TextBlock::Ref userName;
 
-    public:
+      public:
         HeaderBar(pu::ui::Layout* parent, const std::string& sub = "Save Transfer") {
             using namespace theme;
 
-            bg = pu::ui::elm::Rectangle::New(
+            bg = pu::ui::elm::Rectangle::New(0, 0, layout::ScreenW, layout::HeaderH, color::BgSurface);
-                0, 0, layout::ScreenW, layout::HeaderH, color::BgSurface);
+            divider = pu::ui::elm::Rectangle::New(0, layout::HeaderH - 1, layout::ScreenW, 1, color::Divider);
-            divider = pu::ui::elm::Rectangle::New(
-                0, layout::HeaderH - 1, layout::ScreenW, 1, color::Divider);
 
             appName = pu::ui::elm::TextBlock::New(space::lg, 8, "NXST");
             appName->SetFont(type::font(type::Title));
@@ -35,9 +33,7 @@ namespace ui {
 
             const int chipW = 280;
             const int chipX = layout::ScreenW - chipW - space::lg;
-            chipBg = pu::ui::elm::Rectangle::New(
+            chipBg = pu::ui::elm::Rectangle::New(chipX, 16, chipW, 40, color::BgSurface2, radius::pill);
-                chipX, 16, chipW, 40,
-                color::BgSurface2, radius::pill);
             chipBg->SetVisible(false);
 
             avatar = pu::ui::elm::Image::New(chipX + 4, 20, "");
@@ -65,7 +61,7 @@ namespace ui {
             userName->SetVisible(show);
             if (show) {
                 userName->SetText(name);
-                std::string path = Account::iconPath(*uid);
+                std::string path = account::iconPath(*uid);
                 if (!path.empty()) {
                     avatar->SetImage(path);
                     avatar->SetWidth(32);
@@ -83,4 +79,4 @@ namespace ui {
             subtitle->SetText(text);
         }
     };
-}
+}  // namespace ui

include/nxst/ui/hint_bar.hpp

@@ -1,8 +1,10 @@
 #pragma once
-#include <pu/Plutonium>
-#include <nxst/ui/theme.hpp>
-#include <vector>
 #include <string>
+#include <vector>
+
+#include <pu/Plutonium>
+
+#include <nxst/ui/theme.hpp>
 
 namespace ui {
 
@@ -12,28 +14,27 @@ namespace ui {
     };
 
     class HintBar {
-    private:
+      private:
         pu::ui::Layout* parent;
         pu::ui::elm::Rectangle::Ref bg;
         pu::ui::elm::Rectangle::Ref divider;
         std::vector<pu::ui::elm::TextBlock::Ref> labels;
 
-    public:
+      public:
         HintBar(pu::ui::Layout* p) : parent(p) {
             using namespace theme;
-            bg = pu::ui::elm::Rectangle::New(
+            bg = pu::ui::elm::Rectangle::New(0, layout::ScreenH - layout::HintH, layout::ScreenW,
-                0, layout::ScreenH - layout::HintH,
+                                             layout::HintH, color::BgSurface);
-                layout::ScreenW, layout::HintH, color::BgSurface);
+            divider = pu::ui::elm::Rectangle::New(0, layout::ScreenH - layout::HintH, layout::ScreenW, 1,
-            divider = pu::ui::elm::Rectangle::New(
+                                                  color::Divider);
-                0, layout::ScreenH - layout::HintH,
-                layout::ScreenW, 1, color::Divider);
             parent->Add(bg);
             parent->Add(divider);
         }
 
         void SetHints(const std::vector<Hint>& hints) {
             using namespace theme;
-            for (auto& l : labels) l->SetVisible(false);
+            for (auto& l : labels)
+                l->SetVisible(false);
             labels.clear();
 
             int x = layout::ScreenW - space::lg;
@@ -52,4 +53,4 @@ namespace ui {
             }
         }
     };
-}
+}  // namespace ui

include/nxst/ui/theme.hpp

@@ -1,8 +1,9 @@
 #pragma once
 
-#include <pu/Plutonium>
 #include <string>
 
+#include <pu/Plutonium>
+
 namespace theme {
     using pu::ui::Color;
 
@@ -26,7 +27,7 @@ namespace theme {
 
         constexpr Color Divider{0x2A, 0x33, 0x42, 0xFF};
         constexpr Color FocusRing{0xE2, 0x4B, 0x55, 0xFF};
-    }
+    }  // namespace color
 
     namespace space {
         constexpr int xs = 4;
@@ -35,14 +36,14 @@ namespace theme {
         constexpr int lg = 24;
         constexpr int xl = 32;
         constexpr int xxl = 48;
-    }
+    }  // namespace space
 
     namespace radius {
         constexpr int sm = 6;
         constexpr int md = 12;
         constexpr int lg = 20;
         constexpr int pill = 9999;
-    }
+    }  // namespace radius
 
     namespace type {
         constexpr int Display = 38;
@@ -54,7 +55,7 @@ namespace theme {
         inline std::string font(int size) {
             return "DefaultFont@" + std::to_string(size);
         }
-    }
+    }  // namespace type
 
     namespace layout {
         constexpr int ScreenW = 1280;
@@ -63,16 +64,16 @@ namespace theme {
         constexpr int HintH = 56;
         constexpr int ContentTop = HeaderH;
         constexpr int ContentH = ScreenH - HeaderH - HintH;
-    }
+    }  // namespace layout
 
     namespace motion {
         constexpr int FadeFrames = 20;
         constexpr int SlideFrames = 14;
         constexpr int SpinnerFrames = 72;
-    }
+    }  // namespace motion
 
     namespace font {
         constexpr const char* Default = "Inter";
         constexpr const char* Medium = "InterMedium";
-    }
+    }  // namespace font
-}
+}  // namespace theme

include/nxst/ui/titles_layout.hpp

@@ -1,11 +1,12 @@
 #pragma once
-#include <pu/Plutonium>
+#include <memory>
-#include <nxst/ui/const.h>
-#include <nxst/domain/title.hpp>
-#include <nxst/domain/account.hpp>
 #include <unordered_map>
 #include <vector>
-#include <memory>
+
+#include <pu/Plutonium>
+
+#include <nxst/domain/account.hpp>
+#include <nxst/domain/title.hpp>
 #include <nxst/ui/header_bar.hpp>
 #include <nxst/ui/hint_bar.hpp>
 
@@ -15,8 +16,7 @@ namespace ui {
     enum class TitlesAction { Transfer, Receive };
 
     class TitlesLayout : public pu::ui::Layout {
-    private:
+      private:
-
         pu::ui::elm::Menu::Ref titlesMenu;
         std::unordered_map<AccountUid, std::vector<pu::ui::elm::MenuItem::Ref>> menuCache;
         bool m_inputLocked = false;
@@ -45,15 +45,18 @@ namespace ui {
         void runTransfer(int index, Title& title);
         void runReceive(int index, Title& title);
 
-    public:
+      public:
-
         TitlesLayout();
         void InitTitles(AccountUid uid);
-        void LockInput()   { m_inputLocked = true; }
+        void LockInput() {
-        void UnlockInput() { m_inputLocked = false; }
+            m_inputLocked = true;
+        }
+        void UnlockInput() {
+            m_inputLocked = false;
+        }
 
         void onInput(u64 Down, u64 Up, u64 Held, pu::ui::TouchPoint Pos);
 
         PU_SMART_CTOR(TitlesLayout)
     };
-}
+}  // namespace ui

include/nxst/ui/transfer_overlay.hpp

@@ -1,12 +1,13 @@
 #pragma once
 #include <pu/Plutonium>
-#include <nxst/ui/theme.hpp>
+
 #include <nxst/domain/util.hpp>
+#include <nxst/ui/theme.hpp>
 
 namespace ui {
 
     class TransferOverlay : public pu::ui::Overlay {
-    private:
+      private:
         pu::ui::elm::Rectangle::Ref card;
         pu::ui::elm::TextBlock::Ref titleText;
         pu::ui::elm::TextBlock::Ref statusText;
@@ -20,24 +21,18 @@ namespace ui {
         static constexpr int CardX = (theme::layout::ScreenW - CardW) / 2;
         static constexpr int CardY = (theme::layout::ScreenH - CardH) / 2;
 
-    public:
+      public:
-        TransferOverlay(const std::string &title)
+        TransferOverlay(const std::string& title)
-            : Overlay(0, 0, theme::layout::ScreenW, theme::layout::ScreenH, theme::color::Scrim)
+            : Overlay(0, 0, theme::layout::ScreenW, theme::layout::ScreenH, theme::color::Scrim) {
-        {
             using namespace theme;
 
-            card = pu::ui::elm::Rectangle::New(
+            card = pu::ui::elm::Rectangle::New(CardX, CardY, CardW, CardH, color::BgSurface, radius::lg);
-                CardX, CardY, CardW, CardH, color::BgSurface, radius::lg);
 
-            titleText = pu::ui::elm::TextBlock::New(
+            titleText = pu::ui::elm::TextBlock::New(CardX + space::lg, CardY + space::lg, title);
-                CardX + space::lg, CardY + space::lg, title);
             titleText->SetFont(type::font(type::Title));
             titleText->SetColor(color::TextPrimary);
 
-            statusText = pu::ui::elm::TextBlock::New(
+            statusText = pu::ui::elm::TextBlock::New(CardX + space::lg, CardY + space::lg + 56, "");
-                CardX + space::lg,
-                CardY + space::lg + 56,
-                "");
             statusText->SetFont(type::font(type::Body));
             statusText->SetColor(color::TextSecondary);
 
@@ -45,24 +40,19 @@ namespace ui {
             int barY = CardY + space::lg + 56 + 56;
             int barW = CardW - 2 * space::lg;
 
-            progressTrack = pu::ui::elm::Rectangle::New(
+            progressTrack = pu::ui::elm::Rectangle::New(barX, barY, barW, 8, color::Divider, radius::sm);
-                barX, barY, barW, 8, color::Divider, radius::sm);
 
-            progressBar = pu::ui::elm::ProgressBar::New(
+            progressBar = pu::ui::elm::ProgressBar::New(barX, barY, barW, 8, 100.0);
-                barX, barY, barW, 8, 100.0);
             progressBar->SetProgressColor(color::Primary);
             progressBar->SetBackgroundColor(color::Divider);
 
-            indeterminateText = pu::ui::elm::TextBlock::New(
+            indeterminateText = pu::ui::elm::TextBlock::New(barX, barY - 4, "Preparing transfer...");
-                barX, barY - 4, "Preparing transfer...");
             indeterminateText->SetFont(type::font(type::Body));
             indeterminateText->SetColor(color::TextMuted);
             indeterminateText->SetVisible(false);
 
-            hintText = pu::ui::elm::TextBlock::New(
+            hintText =
-                CardX + space::lg,
+                pu::ui::elm::TextBlock::New(CardX + space::lg, CardY + CardH - space::lg - 18, "B to cancel");
-                CardY + CardH - space::lg - 18,
-                "B to cancel");
             hintText->SetFont(type::font(type::Caption));
             hintText->SetColor(color::TextMuted);
 
@@ -76,8 +66,8 @@ namespace ui {
         }
         PU_SMART_CTOR(TransferOverlay)
 
-        void SetStatus(const std::string &status) {
+        void SetStatus(const std::string& status) {
-            statusText->SetText(StringUtils::elide(status, 56));
+            statusText->SetText(string_utils::elide(status, 56));
         }
 
         void SetProgress(double val) {
@@ -91,4 +81,4 @@ namespace ui {
         }
     };
 
-}
+}  // namespace ui

include/nxst/ui/ui_context.hpp

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include <optional>
-#include <switch.h>
-#include <nxst/domain/account.hpp>
-
-namespace ui {
-    struct UiContext {
-        std::optional<AccountUid> selectedUser;
-        std::string selectedUserName;
-    };
-}

include/nxst/ui/users_layout.hpp

@@ -1,22 +1,21 @@
+#include <memory>
+
 #include <pu/Plutonium>
-#include <nxst/ui/const.h>
+
 #include <nxst/ui/header_bar.hpp>
 #include <nxst/ui/hint_bar.hpp>
-#include <memory>
 
 namespace ui {
 
     class UsersLayout : public pu::ui::Layout {
-    private:
+      private:
-
         pu::ui::elm::Menu::Ref usersMenu;
         pu::ui::elm::Rectangle::Ref loadingBg;
         pu::ui::elm::TextBlock::Ref loadingText;
         std::unique_ptr<HeaderBar> header;
         std::unique_ptr<HintBar> hints;
 
-    public:
+      public:
-
         UsersLayout();
 
         void onInput(u64 Down, u64 Up, u64 Held, pu::ui::TouchPoint Pos);
@@ -24,6 +23,5 @@ namespace ui {
         int32_t GetCurrentIndex();
 
         PU_SMART_CTOR(UsersLayout)
-
     };
-}
+}  // namespace ui

src/app/main.cpp

@@ -1,9 +1,11 @@
-#include <nxst/app/main_application.hpp>
-#include <nxst/domain/util.hpp>
-#include <nxst/app/main.hpp>
 #include <unistd.h>
 
-namespace ui { extern MainApplication* mainApp; }
+#include <nxst/app/main_application.hpp>
+#include <nxst/domain/util.hpp>
+
+namespace ui {
+    extern MainApplication* mainApp;
+}
 
 static int nxlink_sock = -1;
 
@@ -25,9 +27,9 @@ extern "C" void userAppExit() {
     if (ui::mainApp) {
         ui::mainApp->transfer.cancelReceive();
         ui::mainApp->transfer.cancelSend();
-        for (int i = 0; i < 150 &&
+        for (int i = 0; i < 150 && (!ui::mainApp->transfer.isReceiveWorkersIdle() ||
-             (!ui::mainApp->transfer.isReceiveWorkersIdle() ||
+                                    !ui::mainApp->transfer.isSendWorkersIdle());
-              !ui::mainApp->transfer.isSendWorkersIdle()); i++) {
+             i++) {
             usleep(10000);
         }
     }
@@ -57,8 +59,8 @@ int main() {
 
     // First create our renderer, where one can customize SDL or other stuff's
     // initialization.
-    auto renderer_opts = pu::ui::render::RendererInitOptions(
+    auto renderer_opts =
-        SDL_INIT_EVERYTHING, pu::ui::render::RendererHardwareFlags);
+        pu::ui::render::RendererInitOptions(SDL_INIT_EVERYTHING, pu::ui::render::RendererHardwareFlags);
     renderer_opts.UseImage(pu::ui::render::IMGAllFlags);
     renderer_opts.UseAudio(pu::ui::render::MixerAllFlags);
     renderer_opts.UseTTF();
@@ -68,7 +70,7 @@ int main() {
     renderer_opts.SetExtraDefaultFontSize(theme::type::Title);
     renderer_opts.SetExtraDefaultFontSize(theme::type::Display);
 
-  auto renderer = pu::ui::render::Renderer::New(renderer_opts);
+    auto renderer = pu::ui::render::Renderer::New(renderer_opts);
 
     // Create our main application from the renderer
     auto main = ui::MainApplication::New(renderer);
@@ -78,5 +80,5 @@ int main() {
     main->Show();
 
     servicesExit();
-  return 0;
+    return 0;
 }

src/app/main_application.cpp

@@ -1,21 +1,20 @@
-#include <string>
 #include <switch.h>
-#include <switch/services/hid.h>
+
-#include <vector>
 #include <nxst/app/main_application.hpp>
 
 namespace ui {
-    MainApplication *mainApp;
+    MainApplication* mainApp;
 
     void MainApplication::OnLoad() {
         mainApp = this;
         this->users_layout = UsersLayout::New();
         this->titles_layout = TitlesLayout::New();
-        this->users_layout->SetOnInput(
+        this->users_layout->SetOnInput(std::bind(&UsersLayout::onInput, this->users_layout,
-                std::bind(&UsersLayout::onInput, this->users_layout, std::placeholders::_1, std::placeholders::_2,
+                                                 std::placeholders::_1, std::placeholders::_2,
-                          std::placeholders::_3, std::placeholders::_4));
+                                                 std::placeholders::_3, std::placeholders::_4));
-        this->titles_layout->SetOnInput(std::bind(&TitlesLayout::onInput, this->titles_layout, std::placeholders::_1, std::placeholders::_2,
+        this->titles_layout->SetOnInput(std::bind(&TitlesLayout::onInput, this->titles_layout,
-                                        std::placeholders::_3, std::placeholders::_4));
+                                                  std::placeholders::_1, std::placeholders::_2,
+                                                  std::placeholders::_3, std::placeholders::_4));
         this->LoadLayout(this->users_layout);
     }
-}
+}  // namespace ui

src/domain/account.cpp

@@ -1,141 +1,95 @@
-/*
+// Copyright (C) 2024-2026 NXST contributors
- *   This file is part of Checkpoint
+#include <cstdio>
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
+#include <cstring>
- *
+#include <map>
- *   This program is free software: you can redistribute it and/or modify
+#include <sys/stat.h>
- *   it under the terms of the GNU General Public License as published by
+#include <vector>
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
 
 #include <nxst/domain/account.hpp>
-#include <sys/stat.h>
+#include <nxst/infra/fs/handles.hpp>
-#include <cstdio>
 
-static std::map<AccountUid, User> mUsers;
+static std::map<AccountUid, User> s_users;
 
-Result Account::init(void)
+Result account::init() {
-{
     Result res = accountInitialize(AccountServiceType_Application);
-    if (R_FAILED(res)) return res;
+    if (R_FAILED(res))
+        return res;
 
     AccountUid uids[8];
     s32 count = 0;
     accountListAllUsers(uids, 8, &count);
-    for (s32 i = 0; i < count; i++) {
+    for (s32 i = 0; i < count; ++i) {
-        Account::username(uids[i]);  // populates mUsers as side effect
+        username(uids[i]);  // populate cache
     }
     return 0;
 }
 
-void Account::exit(void)
+void account::exit() {
-{
     accountExit();
 }
 
-std::vector<AccountUid> Account::ids(void)
+std::vector<AccountUid> account::ids() {
-{
+    std::vector<AccountUid> result;
-    std::vector<AccountUid> v;
+    result.reserve(s_users.size());
-    for (auto& value : mUsers) {
+    for (const auto& pair : s_users) {
-        v.push_back(value.second.id);
+        result.push_back(pair.second.id);
     }
-    return v;
+    return result;
 }
 
-static User getUser(AccountUid id)
+static User fetchUser(AccountUid id) {
-{
     User user{id, ""};
-    AccountProfile profile;
+    nxst::AccountProfileHandle profile;
-    AccountProfileBase profilebase;
+    AccountProfileBase base{};
-    memset(&profilebase, 0, sizeof(profilebase));
 
-    if (R_SUCCEEDED(accountGetProfile(&profile, id))) {
+    if (R_SUCCEEDED(accountGetProfile(profile.get(), id))) {
-        if (R_SUCCEEDED(accountProfileGet(&profile, NULL, &profilebase))) {
+        profile.valid = true;
-            user.name = std::string(profilebase.nickname);
+        if (R_SUCCEEDED(accountProfileGet(profile.get(), nullptr, &base))) {
+            user.name = std::string(base.nickname);
         }
-        accountProfileClose(&profile);
     }
     return user;
 }
 
-std::string Account::username(AccountUid id)
+std::string account::username(AccountUid id) {
-{
+    auto it = s_users.find(id);
-    std::map<AccountUid, User>::const_iterator got = mUsers.find(id);
+    if (it == s_users.end()) {
-    if (got == mUsers.end()) {
+        User user = fetchUser(id);
-        User user = getUser(id);
+        s_users.emplace(id, user);
-        mUsers.insert({id, user});
         return user.name;
     }
-
+    return it->second.name;
-    return got->second.name;
 }
 
-std::string Account::iconPath(AccountUid id)
+std::string account::iconPath(AccountUid id) {
-{
     char path[128];
-    snprintf(path, sizeof(path), "sdmc:/switch/NXST/cache/%016lX%016lX.jpg",
+    snprintf(path, sizeof(path), "sdmc:/switch/NXST/cache/%016lX%016lX.jpg", id.uid[0], id.uid[1]);
-             id.uid[0], id.uid[1]);
 
     struct stat st;
-    if (stat(path, &st) == 0 && st.st_size > 0) return std::string(path);
+    if (stat(path, &st) == 0 && st.st_size > 0)
+        return std::string(path);
 
     mkdir("sdmc:/switch", 0755);
     mkdir("sdmc:/switch/NXST", 0755);
     mkdir("sdmc:/switch/NXST/cache", 0755);
 
-    AccountProfile profile;
+    nxst::AccountProfileHandle profile;
-    if (R_FAILED(accountGetProfile(&profile, id))) return "";
+    if (R_FAILED(accountGetProfile(profile.get(), id)))
-
-    u32 imgSize = 0;
-    if (R_FAILED(accountProfileGetImageSize(&profile, &imgSize)) || imgSize == 0) {
-        accountProfileClose(&profile);
         return "";
-    }
+    profile.valid = true;
 
-    std::vector<u8> buf(imgSize);
+    u32 img_size = 0;
-    u32 outSize = 0;
+    if (R_FAILED(accountProfileGetImageSize(profile.get(), &img_size)) || img_size == 0)
-    Result r = accountProfileLoadImage(&profile, buf.data(), imgSize, &outSize);
+        return "";
-    accountProfileClose(&profile);
-    if (R_FAILED(r) || outSize == 0) return "";
 
-    FILE* f = fopen(path, "wb");
+    std::vector<u8> buf(img_size);
-    if (!f) return "";
+    u32 out_size = 0;
-    fwrite(buf.data(), 1, outSize, f);
+    if (R_FAILED(accountProfileLoadImage(profile.get(), buf.data(), img_size, &out_size)) || out_size == 0)
-    fclose(f);
+        return "";
+
+    nxst::FileHandle f(fopen(path, "wb"));
+    if (!f)
+        return "";
+    fwrite(buf.data(), 1, out_size, f.get());
     return std::string(path);
 }
-
-AccountUid Account::selectAccount(void)
-{
-    LibAppletArgs args;
-    libappletArgsCreate(&args, 0x10000);
-    u8 st_in[0xA0]  = {0};
-    u8 st_out[0x18] = {0};
-    size_t repsz;
-
-    Result res = libappletLaunch(AppletId_LibraryAppletPlayerSelect, &args, st_in, 0xA0, st_out, 0x18, &repsz);
-    if (R_SUCCEEDED(res)) {
-        u64 lres       = *(u64*)st_out;
-        AccountUid uid = *(AccountUid*)&st_out[8];
-        if (lres == 0)
-            return uid;
-    }
-
-    return AccountUid{};
-}

src/domain/common.cpp

@@ -1,124 +0,0 @@
-/*
- *   This file is part of Checkpoint
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
-
-#include <nxst/domain/common.hpp>
-
-std::string DateTime::timeStr(void)
-{
-    time_t unixTime;
-    struct tm timeStruct;
-    time(&unixTime);
-    localtime_r(&unixTime, &timeStruct);
-    return StringUtils::format("%02i:%02i:%02i", timeStruct.tm_hour, timeStruct.tm_min, timeStruct.tm_sec);
-}
-
-std::string DateTime::dateTimeStr(void)
-{
-    time_t unixTime;
-    struct tm timeStruct;
-    time(&unixTime);
-    localtime_r(&unixTime, &timeStruct);
-    return StringUtils::format("%04i%02i%02i-%02i%02i%02i", timeStruct.tm_year + 1900, timeStruct.tm_mon + 1, timeStruct.tm_mday, timeStruct.tm_hour,
-        timeStruct.tm_min, timeStruct.tm_sec);
-}
-
-std::string DateTime::logDateTime(void)
-{
-    time_t unixTime;
-    struct tm timeStruct;
-    time(&unixTime);
-    localtime_r(&unixTime, &timeStruct);
-    return StringUtils::format("%04i-%02i-%02i %02i:%02i:%02i", timeStruct.tm_year + 1900, timeStruct.tm_mon + 1, timeStruct.tm_mday,
-        timeStruct.tm_hour, timeStruct.tm_min, timeStruct.tm_sec);
-}
-
-std::string StringUtils::UTF16toUTF8(const std::u16string& src)
-{
-    static std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;
-    std::string dst = convert.to_bytes(src);
-    return dst;
-}
-
-std::string StringUtils::removeForbiddenCharacters(std::string src)
-{
-    static const std::string illegalChars = ".,!\\/:?*\"<>|";
-    for (size_t i = 0, sz = src.length(); i < sz; i++) {
-        if (illegalChars.find(src[i]) != std::string::npos) {
-            src[i] = ' ';
-        }
-    }
-
-    size_t i;
-    for (i = src.length() - 1; i > 0 && src[i] == ' '; i--)
-        ;
-    src.erase(i + 1, src.length() - i);
-
-    return src;
-}
-
-std::string StringUtils::format(const std::string fmt_str, ...)
-{
-    va_list ap;
-    char* fp = NULL;
-    va_start(ap, fmt_str);
-    vasprintf(&fp, fmt_str.c_str(), ap);
-    va_end(ap);
-    std::unique_ptr<char[]> formatted(fp);
-    return std::string(formatted.get());
-}
-
-bool StringUtils::containsInvalidChar(const std::string& str)
-{
-    for (size_t i = 0, sz = str.length(); i < sz; i++) {
-        if (!isascii(str[i])) {
-            return true;
-        }
-    }
-    return false;
-}
-
-void StringUtils::ltrim(std::string& s)
-{
-    s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](int ch) { return !std::isspace(ch); }));
-}
-
-void StringUtils::rtrim(std::string& s)
-{
-    s.erase(std::find_if(s.rbegin(), s.rend(), [](int ch) { return !std::isspace(ch); }).base(), s.end());
-}
-
-void StringUtils::trim(std::string& s)
-{
-    ltrim(s);
-    rtrim(s);
-}
-
-char* getConsoleIP(void)
-{
-    struct in_addr in;
-    in.s_addr = gethostid();
-    return inet_ntoa(in);
-}

src/domain/title.cpp

@@ -1,322 +1,242 @@
-/*
+// Copyright (C) 2024-2026 NXST contributors
- *   This file is part of Checkpoint
+#include <algorithm>
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
+#include <cstring>
- *
+#include <vector>
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
 
+#include "nxst/domain/account.hpp"
 #include <nxst/domain/title.hpp>
-#include <nxst/app/main.hpp>
+#include <nxst/domain/util.hpp>
+#include <nxst/infra/fs/directory.hpp>
+#include <nxst/infra/sys/logger.hpp>
+
+using sort_t = enum { SortAlpha, SortLastPlayed, SortPlayTime, SortModesCount };
+static constexpr const char* kEmptySave = "New...";
+static sort_t s_sort_mode = SortAlpha;
 
 static std::unordered_map<AccountUid, std::vector<Title>> titles;
-static bool s_titlesLoaded = false;
+static bool s_titles_loaded = false;
 
-bool areTitlesLoaded(void)
+void Title::init(u8 save_data_type, u64 title_id, AccountUid uid, const std::string& name,
-{
+                 const std::string& author) {
-    return s_titlesLoaded;
+    m_id = title_id;
-}
+    m_uid = uid;
+    m_save_data_type = save_data_type;
+    m_user_name = account::username(uid);
+    m_author = author;
+    m_name = name;
+    m_safe_name = string_utils::containsInvalidChar(name) ? string_utils::format("0x%016llX", m_id)
+                                                          : string_utils::removeForbiddenCharacters(name);
+    m_path = "sdmc:/switch/NXST/saves/" + string_utils::format("0x%016llX", m_id) + " " + m_safe_name;
 
-void Title::init(u8 saveDataType, u64 id, AccountUid userID, const std::string& name, const std::string& author)
+    std::string aname = string_utils::removeAccents(m_name);
-{
+    m_display_name = {aname, ""};
-    mId           = id;
-    mUserId       = userID;
-    mSaveDataType = saveDataType;
-    mUserName     = Account::username(userID);
-    mAuthor       = author;
-    mName         = name;
-    mSafeName     = StringUtils::containsInvalidChar(name) ? StringUtils::format("0x%016llX", mId) : StringUtils::removeForbiddenCharacters(name);
-    mPath         = "sdmc:/switch/NXST/saves/" + StringUtils::format("0x%016llX", mId) + " " + mSafeName;
 
-    std::string aname = StringUtils::removeAccents(mName);
+    size_t colon = aname.rfind(':');
-    size_t pos        = aname.rfind(":");
+    if (colon != std::string::npos) {
-    mDisplayName      = std::make_pair(aname, "");
+        std::string head = aname.substr(0, colon);
-    if (pos != std::string::npos) {
+        std::string tail = aname.substr(colon + 1);
-        std::string name1 = aname.substr(0, pos);
+        string_utils::trim(head);
-        std::string name2 = aname.substr(pos + 1);
+        string_utils::trim(tail);
-        StringUtils::trim(name1);
+        m_display_name = {head, tail};
-        StringUtils::trim(name2);
+    } else {
-        mDisplayName.first  = name1;
+        size_t open = aname.rfind('(');
-        mDisplayName.second = name2;
+        size_t close = aname.rfind(')');
-    }
+        if (open != std::string::npos && close != std::string::npos && close > open) {
-    else {
+            std::string head = aname.substr(0, open);
-        // check for parenthesis
+            std::string paren = aname.substr(open + 1, close - open - 1);
-        size_t pos1 = aname.rfind("(");
+            string_utils::trim(head);
-        size_t pos2 = aname.rfind(")");
+            string_utils::trim(paren);
-        if (pos1 != std::string::npos && pos2 != std::string::npos) {
+            m_display_name = {head, paren};
-            std::string name1 = aname.substr(0, pos1);
-            std::string name2 = aname.substr(pos1 + 1, pos2 - 1 - pos1);
-            StringUtils::trim(name1);
-            StringUtils::trim(name2);
-            mDisplayName.first  = name1;
-            mDisplayName.second = name2;
         }
     }
 
     refreshDirectories();
 }
 
-u8 Title::saveDataType(void)
+u8 Title::saveDataType() const {
-{
+    return m_save_data_type;
-    return mSaveDataType;
+}
+u64 Title::id() const {
+    return m_id;
+}
+u64 Title::saveId() const {
+    return m_save_id;
+}
+void Title::saveId(u64 id) {
+    m_save_id = id;
+}
+AccountUid Title::userId() const {
+    return m_uid;
+}
+std::string Title::userName() const {
+    return m_user_name;
+}
+std::string Title::author() const {
+    return m_author;
+}
+std::string Title::name() const {
+    return m_name;
+}
+std::pair<std::string, std::string> Title::displayName() const {
+    return m_display_name;
+}
+std::string Title::path() const {
+    return m_path;
+}
+std::string Title::fullPath(size_t index) const {
+    return m_full_save_paths.at(index);
+}
+std::vector<std::string> Title::saves() const {
+    return m_saves;
+}
+u64 Title::playTimeNanoseconds() const {
+    return m_play_time_ns;
+}
+void Title::playTimeNanoseconds(u64 ns) {
+    m_play_time_ns = ns;
+}
+u32 Title::lastPlayedTimestamp() const {
+    return m_last_played_ts;
+}
+void Title::lastPlayedTimestamp(u32 ts) {
+    m_last_played_ts = ts;
 }
 
-u64 Title::id(void)
+std::string Title::playTime() const {
-{
+    const u64 minutes = m_play_time_ns / 60000000000ULL;
-    return mId;
+    return string_utils::format("%d", minutes / 60) + ":" + string_utils::format("%02d", minutes % 60) +
+           " hours";
 }
 
-u64 Title::saveId(void)
+void Title::refreshDirectories() {
-{
+    m_saves.clear();
-    return mSaveId;
+    m_full_save_paths.clear();
-}
 
-void Title::saveId(u64 saveId)
+    Directory savelist(m_path);
-{
-    mSaveId = saveId;
-}
-
-AccountUid Title::userId(void)
-{
-    return mUserId;
-}
-
-std::string Title::userName(void)
-{
-    return mUserName;
-}
-
-std::string Title::author(void)
-{
-    return mAuthor;
-}
-
-std::string Title::name(void)
-{
-    return mName;
-}
-
-std::pair<std::string, std::string> Title::displayName(void)
-{
-    return mDisplayName;
-}
-
-std::string Title::path(void)
-{
-    return mPath;
-}
-
-std::string Title::fullPath(size_t index)
-{
-    return mFullSavePaths.at(index);
-}
-
-std::vector<std::string> Title::saves()
-{
-    return mSaves;
-}
-
-u64 Title::playTimeNanoseconds(void)
-{
-    return mPlayTimeNanoseconds;
-}
-
-std::string Title::playTime(void)
-{
-    const u64 playTimeMinutes = mPlayTimeNanoseconds / 60000000000;
-    return StringUtils::format("%d", playTimeMinutes / 60) + ":" + StringUtils::format("%02d", playTimeMinutes % 60) + " hours";
-}
-
-void Title::playTimeNanoseconds(u64 playTimeNanoseconds)
-{
-    mPlayTimeNanoseconds = playTimeNanoseconds;
-}
-
-u32 Title::lastPlayedTimestamp(void)
-{
-    return mLastPlayedTimestamp;
-}
-
-void Title::lastPlayedTimestamp(u32 lastPlayedTimestamp)
-{
-    mLastPlayedTimestamp = lastPlayedTimestamp;
-}
-
-void Title::refreshDirectories(void)
-{
-    mSaves.clear();
-    mFullSavePaths.clear();
-
-    Directory savelist(mPath);
     if (savelist.good()) {
-        for (size_t i = 0, sz = savelist.size(); i < sz; i++) {
+        for (size_t i = 0; i < savelist.size(); ++i) {
             if (savelist.folder(i)) {
-                mSaves.push_back(savelist.entry(i));
+                m_saves.push_back(savelist.entry(i));
-                mFullSavePaths.push_back(mPath + "/" + savelist.entry(i));
+                m_full_save_paths.push_back(m_path + "/" + savelist.entry(i));
             }
         }
-
+        std::sort(m_saves.rbegin(), m_saves.rend());
-        std::sort(mSaves.rbegin(), mSaves.rend());
+        std::sort(m_full_save_paths.rbegin(), m_full_save_paths.rend());
-        std::sort(mFullSavePaths.rbegin(), mFullSavePaths.rend());
+        m_saves.insert(m_saves.begin(), kEmptySave);
-        mSaves.insert(mSaves.begin(), g_emptySave);
+        m_full_save_paths.insert(m_full_save_paths.begin(), kEmptySave);
-        mFullSavePaths.insert(mFullSavePaths.begin(), g_emptySave);
+    } else {
-    }
+        nxst::log::error("Could not read save directory for title %s", m_name.c_str());
-    else {
-        Logger::getInstance().log(Logger::ERROR, "Couldn't retrieve the extdata directory list for the title " + name());
     }
 }
 
-void loadTitles(void)
+bool areTitlesLoaded() {
-{
+    return s_titles_loaded;
-    if (s_titlesLoaded) return;
+}
-    s_titlesLoaded = true;
 
+void loadTitles() {
+    if (s_titles_loaded)
+        return;
+    s_titles_loaded = true;
     titles.clear();
 
     FsSaveDataInfoReader reader;
-    FsSaveDataInfo info;
-    s64 total_entries = 0;
-    size_t outsize    = 0;
-
-    NacpLanguageEntry* nle          = NULL;
-    NsApplicationControlData* nsacd = (NsApplicationControlData*)malloc(sizeof(NsApplicationControlData));
-    if (nsacd == NULL) {
-        return;
-    }
-    memset(nsacd, 0, sizeof(NsApplicationControlData));
-
     Result res = fsOpenSaveDataInfoReader(&reader, FsSaveDataSpaceId_User);
-    if (R_FAILED(res)) {
+    if (R_FAILED(res))
-        free(nsacd);
         return;
-    }
 
-    while (1) {
+    std::vector<u8> nacp_buf(sizeof(NsApplicationControlData), 0);
-        res = fsSaveDataInfoReaderRead(&reader, &info, 1, &total_entries);
+    auto* nsacd = reinterpret_cast<NsApplicationControlData*>(nacp_buf.data());
-        if (R_FAILED(res) || total_entries == 0) {
+
+    FsSaveDataInfo info{};
+    s64 count = 0;
+    while (true) {
+        res = fsSaveDataInfoReaderRead(&reader, &info, 1, &count);
+        if (R_FAILED(res) || count == 0)
             break;
+        if (info.save_data_type != FsSaveDataType_Account)
+            continue;
+
+        u64 tid = info.application_id;
+        AccountUid uid = info.uid;
+        size_t outsize = 0;
+        NacpLanguageEntry* nle = nullptr;
+
+        memset(nsacd, 0, sizeof(NsApplicationControlData));
+        res = nsGetApplicationControlData(NsApplicationControlSource_Storage, tid, nsacd,
+                                          sizeof(NsApplicationControlData), &outsize);
+        if (R_FAILED(res) || outsize < sizeof(nsacd->nacp))
+            continue;
+        if (R_FAILED(nacpGetLanguageEntry(&nsacd->nacp, &nle)) || !nle)
+            continue;
+
+        Title title;
+        title.init(info.save_data_type, tid, uid, std::string(nle->name), std::string(nle->author));
+        title.saveId(info.save_data_id);
+
+        PdmPlayStatistics stats{};
+        if (R_SUCCEEDED(pdmqryQueryPlayStatisticsByApplicationIdAndUserAccountId(tid, uid, false, &stats))) {
+            title.playTimeNanoseconds(stats.playtime);
+            title.lastPlayedTimestamp(stats.last_timestamp_user);
         }
 
-        if (info.save_data_type == FsSaveDataType_Account) {
+        auto it = titles.find(uid);
-            u64 tid        = info.application_id;
+        if (it != titles.end()) {
-            u64 sid        = info.save_data_id;
+            it->second.push_back(title);
-            AccountUid uid = info.uid;
+        } else {
-            // if (mFilterIds.find(tid) == mFilterIds.end()) {
+            titles.emplace(uid, std::vector<Title>{title});
-                res = nsGetApplicationControlData(NsApplicationControlSource_Storage, tid, nsacd, sizeof(NsApplicationControlData), &outsize);
-                if (R_SUCCEEDED(res) && !(outsize < sizeof(nsacd->nacp))) {
-                    res = nacpGetLanguageEntry(&nsacd->nacp, &nle);
-                    if (R_SUCCEEDED(res) && nle != NULL) {
-                        Title title;
-                        title.init(info.save_data_type, tid, uid, std::string(nle->name), std::string(nle->author));
-                        title.saveId(sid);
-
-                        // load play statistics
-                        PdmPlayStatistics stats;
-                        res = pdmqryQueryPlayStatisticsByApplicationIdAndUserAccountId(tid, uid, false, &stats);
-                        if (R_SUCCEEDED(res)) {
-                            title.playTimeNanoseconds(stats.playtime);
-                            title.lastPlayedTimestamp(stats.last_timestamp_user);
-                        }
-
-                        // loadIcon(tid, nsacd, outsize - sizeof(nsacd->nacp));
-
-                        // check if the vector is already created
-                        std::unordered_map<AccountUid, std::vector<Title>>::iterator it = titles.find(uid);
-                        if (it != titles.end()) {
-                            // found
-                            it->second.push_back(title);
-                        }
-                        else {
-                            // not found, insert into map
-                            std::vector<Title> v;
-                            v.push_back(title);
-                            titles.emplace(uid, v);
-                        }
-                    }
-                }
-                nle = NULL;
-            // }
         }
     }
 
-    free(nsacd);
     fsSaveDataInfoReaderClose(&reader);
-
     sortTitles();
 }
 
-void sortTitles(void)
+void sortTitles() {
-{
+    for (auto& pair : titles) {
-    for (auto& vect : titles) {
+        std::sort(pair.second.begin(), pair.second.end(), [](const Title& l, const Title& r) {
-        std::sort(vect.second.begin(), vect.second.end(), [](Title& l, Title& r) {
+            switch (s_sort_mode) {
-            switch (g_sortMode) {
+            case SortLastPlayed:
-                case SORT_LAST_PLAYED:
+                return l.lastPlayedTimestamp() > r.lastPlayedTimestamp();
-                    return l.lastPlayedTimestamp() > r.lastPlayedTimestamp();
+            case SortPlayTime:
-                case SORT_PLAY_TIME:
+                return l.playTimeNanoseconds() > r.playTimeNanoseconds();
-                    return l.playTimeNanoseconds() > r.playTimeNanoseconds();
+            case SortAlpha:
-                case SORT_ALPHA:
+            default:
-                default:
+                return l.name() < r.name();
-                    return l.name() < r.name();
             }
         });
     }
 }
 
-void rotateSortMode(void)
+void rotateSortMode() {
-{
+    s_sort_mode = static_cast<sort_t>((s_sort_mode + 1) % SortModesCount);
-    g_sortMode = static_cast<sort_t>((g_sortMode + 1) % SORT_MODES_COUNT);
     sortTitles();
 }
 
-void getTitle(Title& dst, AccountUid uid, size_t i)
+void getTitle(Title& dst, AccountUid uid, size_t i) {
-{
+    auto it = titles.find(uid);
-    std::unordered_map<AccountUid, std::vector<Title>>::iterator it = titles.find(uid);
+    if (it != titles.end() && i < it->second.size())
-    if (it != titles.end() && i < getTitleCount(uid)) {
+        dst = it->second[i];
-        dst = it->second.at(i);
-    }
 }
 
-size_t getTitleCount(AccountUid uid)
+size_t getTitleCount(AccountUid uid) {
-{
+    auto it = titles.find(uid);
-    std::unordered_map<AccountUid, std::vector<Title>>::iterator it = titles.find(uid);
     return it != titles.end() ? it->second.size() : 0;
 }
 
-void refreshDirectories(u64 id)
+void refreshDirectories(u64 id) {
-{
     for (auto& pair : titles) {
-        for (size_t i = 0; i < pair.second.size(); i++) {
+        for (auto& title : pair.second) {
-            if (pair.second.at(i).id() == id) {
+            if (title.id() == id)
-                pair.second.at(i).refreshDirectories();
+                title.refreshDirectories();
-            }
         }
     }
 }
 
-std::unordered_map<std::string, std::string> getCompleteTitleList(void)
+std::unordered_map<std::string, std::string> getCompleteTitleList() {
-{
     std::unordered_map<std::string, std::string> map;
     for (const auto& pair : titles) {
-        for (auto value : pair.second) {
+        for (const auto& title : pair.second) {
-            map.insert({StringUtils::format("0x%016llX", value.id()), value.name()});
+            map.emplace(string_utils::format("0x%016llX", title.id()), title.name());
         }
     }
     return map;

src/domain/util.cpp

@@ -1,165 +1,250 @@
-/*
+// Copyright (C) 2024-2026 NXST contributors
- *   This file is part of Checkpoint
+#include <algorithm>
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
+#include <cctype>
- *
+#include <cstdarg>
- *   This program is free software: you can redistribute it and/or modify
+#include <cstdio>
- *   it under the terms of the GNU General Public License as published by
+#include <string>
- *   the Free Software Foundation, either version 3 of the License, or
+#include <unordered_map>
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
 
+#include <nxst/domain/account.hpp>
 #include <nxst/domain/util.hpp>
+#include <nxst/infra/fs/io.hpp>
 #include <nxst/infra/sys/logger.hpp>
-#include <nxst/app/main_application.hpp>
-#include <nxst/app/main.hpp>
 
-void servicesExit(void)
+static bool s_notification_led_available = false;
-{
+
-    Logger::getInstance().flush();
+void servicesExit() {
-    Account::exit();
+    account::exit();
     plExit();
     romfsExit();
 }
 
-Result servicesInit(void)
+Result servicesInit() {
-{
     io::createDirectory("sdmc:/switch");
     io::createDirectory("sdmc:/switch/NXST");
     io::createDirectory("sdmc:/switch/NXST/saves");
 
     if (appletGetAppletType() != AppletType_Application) {
-        Logger::getInstance().log(Logger::WARN, "Please do not run NXST in applet mode.");
+        nxst::log::warn("Please do not run NXST in applet mode.");
     }
 
     Result res = 0;
-
     romfsInit();
-
     padConfigureInput(1, HidNpadStyleSet_NpadStandard);
     hidInitializeTouchScreen();
 
     if (R_FAILED(res = plInitialize(PlServiceType_User))) {
-        Logger::getInstance().log(Logger::ERROR, "plInitialize failed. Result code 0x%08lX.", res);
+        nxst::log::error("plInitialize failed. Result code 0x%08X.", res);
         return res;
     }
-
+    if (R_FAILED(res = account::init())) {
-    if (R_FAILED(res = Account::init())) {
+        nxst::log::error("account::init failed. Result code 0x%08X.", res);
-        Logger::getInstance().log(Logger::ERROR, "Account::init failed. Result code 0x%08lX.", res);
         return res;
     }
-
     if (R_FAILED(res = nsInitialize())) {
-        Logger::getInstance().log(Logger::ERROR, "nsInitialize failed. Result code 0x{:08X}.", res);
+        nxst::log::error("nsInitialize failed. Result code 0x%08X.", res);
         return res;
     }
-
+    if (R_SUCCEEDED(hidsysInitialize())) {
-    if (R_SUCCEEDED(res = hidsysInitialize())) {
+        s_notification_led_available = true;
-        g_notificationLedAvailable = true;
+    } else {
-    }
+        nxst::log::info("Notification LED not available.");
-    else {
-        Logger::getInstance().log(Logger::INFO, "Notification led not available. Result code 0x{:08X}.", res);
     }
 
-
+    nxst::log::info("NXST loading completed.");
-    Logger::getInstance().log(Logger::INFO, "NXST loading completed!");
-
     return 0;
 }
 
-std::u16string StringUtils::UTF8toUTF16(const char* src)
+bool string_utils::containsInvalidChar(const std::string& str) {
-{
+    for (unsigned char c : str) {
-    char16_t tmp[256] = {0};
+        if (!isascii(c))
-    utf8_to_utf16((uint16_t*)tmp, (uint8_t*)src, 256);
+            return true;
-    return std::u16string(tmp);
+    }
+    return false;
 }
 
-// https://stackoverflow.com/questions/14094621/change-all-accented-letters-to-normal-letters-in-c
+std::string string_utils::format(const char* fmt, ...) {
-std::string StringUtils::removeAccents(std::string str)
+    va_list a1, a2;
-{
+    va_start(a1, fmt);
-    std::u16string src = UTF8toUTF16(str.c_str());
+    va_copy(a2, a1);
-    const std::u16string illegal = UTF8toUTF16("ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüūýþÿ");
+    int n = vsnprintf(nullptr, 0, fmt, a1);
-    const std::u16string fixed = UTF8toUTF16("AAAAAAECEEEEIIIIDNOOOOOx0UUUUYPsaaaaaaeceeeeiiiiOnooooo/0uuuuuypy");
+    va_end(a1);
+    if (n < 0) {
+        va_end(a2);
+        return {};
+    }
+    std::string buf(static_cast<size_t>(n), '\0');
+    vsnprintf(buf.data(), static_cast<size_t>(n) + 1, fmt, a2);
+    va_end(a2);
+    return buf;
+}
 
-    for (size_t i = 0, sz = src.length(); i < sz; i++) {
+std::string string_utils::removeForbiddenCharacters(std::string src) {
-        size_t index = illegal.find(src[i]);
+    static constexpr std::string_view kForbidden = ".,!\\/:?*\"<>|";
-        if (index != std::string::npos) {
+    for (char& c : src) {
-            src[i] = fixed[index];
+        if (kForbidden.find(c) != std::string_view::npos)
+            c = ' ';
+    }
+    auto last = src.find_last_not_of(' ');
+    if (last != std::string::npos)
+        src.erase(last + 1);
+    return src;
+}
+
+static size_t encodeUtf8(char* out, char32_t cp) {
+    if (cp < 0x80) {
+        out[0] = static_cast<char>(cp);
+        return 1;
+    }
+    if (cp < 0x800) {
+        out[0] = static_cast<char>(0xC0 | (cp >> 6));
+        out[1] = static_cast<char>(0x80 | (cp & 0x3F));
+        return 2;
+    }
+    if (cp < 0x10000) {
+        out[0] = static_cast<char>(0xE0 | (cp >> 12));
+        out[1] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
+        out[2] = static_cast<char>(0x80 | (cp & 0x3F));
+        return 3;
+    }
+    out[0] = static_cast<char>(0xF0 | (cp >> 18));
+    out[1] = static_cast<char>(0x80 | ((cp >> 12) & 0x3F));
+    out[2] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
+    out[3] = static_cast<char>(0x80 | (cp & 0x3F));
+    return 4;
+}
+
+std::string string_utils::UTF16toUTF8(const std::u16string& src) {
+    std::string result;
+    result.reserve(src.size() * 2);
+    for (size_t i = 0; i < src.size(); ++i) {
+        char32_t cp = src[i];
+        if (cp >= 0xD800 && cp <= 0xDBFF && i + 1 < src.size()) {
+            cp = 0x10000 + ((cp - 0xD800) << 10) + (src[++i] - 0xDC00);
+        }
+        char buf[4];
+        result.append(buf, encodeUtf8(buf, cp));
+    }
+    return result;
+}
+
+void string_utils::ltrim(std::string& s) {
+    s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char c) {
+                return !std::isspace(c);
+            }));
+}
+
+void string_utils::rtrim(std::string& s) {
+    s.erase(std::find_if(s.rbegin(), s.rend(),
+                         [](unsigned char c) {
+                             return !std::isspace(c);
+                         })
+                .base(),
+            s.end());
+}
+
+void string_utils::trim(std::string& s) {
+    ltrim(s);
+    rtrim(s);
+}
+
+// Decodes a UTF-8 string to UTF-16, handling surrogate pairs for codepoints > U+FFFF.
+std::u16string string_utils::UTF8toUTF16(const char* src) {
+    std::u16string result;
+    while (*src != '\0') {
+        char32_t cp = 0;
+        unsigned char c = static_cast<unsigned char>(*src);
+        if (c < 0x80) {
+            cp = c;
+            ++src;
+        } else if (c < 0xE0) {
+            cp = static_cast<char32_t>(c & 0x1F) << 6 | (src[1] & 0x3F);
+            src += 2;
+        } else if (c < 0xF0) {
+            cp = static_cast<char32_t>(c & 0x0F) << 12 | static_cast<char32_t>(src[1] & 0x3F) << 6 |
+                 (src[2] & 0x3F);
+            src += 3;
+        } else {
+            cp = static_cast<char32_t>(c & 0x07) << 18 | static_cast<char32_t>(src[1] & 0x3F) << 12 |
+                 static_cast<char32_t>(src[2] & 0x3F) << 6 | (src[3] & 0x3F);
+            src += 4;
+        }
+        if (cp < 0x10000) {
+            result += static_cast<char16_t>(cp);
+        } else {
+            cp -= 0x10000;
+            result += static_cast<char16_t>(0xD800 | (cp >> 10));
+            result += static_cast<char16_t>(0xDC00 | (cp & 0x3FF));
         }
     }
-
+    return result;
-    return UTF16toUTF8(src);
 }
 
-std::string StringUtils::removeNotAscii(std::string str)
+// Replaces Latin characters with diacritics with their ASCII base equivalents.
-{
+std::string string_utils::removeAccents(std::string str) {
-    for (size_t i = 0, sz = str.length(); i < sz; i++) {
+    static const std::unordered_map<char16_t, char16_t> kMap = {
-        if (!isascii(str[i])) {
+        {u'À', u'A'}, {u'Á', u'A'}, {u'Â', u'A'}, {u'Ã', u'A'}, {u'Ä', u'A'}, {u'Å', u'A'}, {u'Æ', u'E'},
-            str[i] = ' ';
+        {u'Ç', u'C'}, {u'È', u'E'}, {u'É', u'E'}, {u'Ê', u'E'}, {u'Ë', u'E'}, {u'Ì', u'I'}, {u'Í', u'I'},
-        }
+        {u'Î', u'I'}, {u'Ï', u'I'}, {u'Ð', u'D'}, {u'Ñ', u'N'}, {u'Ò', u'O'}, {u'Ó', u'O'}, {u'Ô', u'O'},
+        {u'Õ', u'O'}, {u'Ö', u'O'}, {u'Ø', u'O'}, {u'Ù', u'U'}, {u'Ú', u'U'}, {u'Û', u'U'}, {u'Ü', u'U'},
+        {u'Ý', u'Y'}, {u'ß', u's'}, {u'à', u'a'}, {u'á', u'a'}, {u'â', u'a'}, {u'ã', u'a'}, {u'ä', u'a'},
+        {u'å', u'a'}, {u'æ', u'e'}, {u'ç', u'c'}, {u'è', u'e'}, {u'é', u'e'}, {u'ê', u'e'}, {u'ë', u'e'},
+        {u'ì', u'i'}, {u'í', u'i'}, {u'î', u'i'}, {u'ï', u'i'}, {u'ñ', u'n'}, {u'ò', u'o'}, {u'ó', u'o'},
+        {u'ô', u'o'}, {u'õ', u'o'}, {u'ö', u'o'}, {u'ø', u'o'}, {u'ù', u'u'}, {u'ú', u'u'}, {u'û', u'u'},
+        {u'ü', u'u'}, {u'ū', u'u'}, {u'ý', u'y'}, {u'ÿ', u'y'},
+    };
+    std::u16string wide = UTF8toUTF16(str.c_str());
+    for (char16_t& ch : wide) {
+        auto it = kMap.find(ch);
+        if (it != kMap.end())
+            ch = it->second;
+    }
+    return string_utils::UTF16toUTF8(wide);
+}
+
+std::string string_utils::removeNotAscii(std::string str) {
+    for (char& c : str) {
+        if (!isascii(static_cast<unsigned char>(c)))
+            c = ' ';
     }
     return str;
 }
 
-std::string StringUtils::elide(const std::string& s, size_t maxChars)
+std::string string_utils::elide(const std::string& s, size_t max_chars) {
-{
+    if (s.size() <= max_chars || max_chars < 6)
-    if (s.size() <= maxChars || maxChars < 6) return s;
+        return s;
-    constexpr const char* dots = "...";
+    size_t budget = max_chars - 3;
-    size_t budget = maxChars - 3;
     size_t head = (budget + 1) / 2;
     size_t tail = budget - head;
-    return s.substr(0, head) + dots + s.substr(s.size() - tail);
+    return s.substr(0, head) + "..." + s.substr(s.size() - tail);
 }
 
-HidsysNotificationLedPattern blinkLedPattern(u8 times)
+static HidsysNotificationLedPattern makeLedPattern(u8 times) {
-{
+    HidsysNotificationLedPattern p{};
-    HidsysNotificationLedPattern pattern;
+    p.baseMiniCycleDuration = 0x1;
-    memset(&pattern, 0, sizeof(pattern));
+    p.totalMiniCycles = 0x2;
-
+    p.totalFullCycles = times;
-    pattern.baseMiniCycleDuration = 0x1;   // 12.5ms.
+    p.startIntensity = 0x0;
-    pattern.totalMiniCycles       = 0x2;   // 2 mini cycles.
+    p.miniCycles[0] = {0xF, 0xF, 0x0};
-    pattern.totalFullCycles       = times; // Repeat n times.
+    p.miniCycles[1] = {0x0, 0xF, 0x0};
-    pattern.startIntensity        = 0x0;   // 0%.
+    return p;
-
-    pattern.miniCycles[0].ledIntensity      = 0xF; // 100%.
-    pattern.miniCycles[0].transitionSteps   = 0xF; // 15 steps. Total 187.5ms.
-    pattern.miniCycles[0].finalStepDuration = 0x0; // Forced 12.5ms.
-    pattern.miniCycles[1].ledIntensity      = 0x0; // 0%.
-    pattern.miniCycles[1].transitionSteps   = 0xF; // 15 steps. Total 187.5ms.
-    pattern.miniCycles[1].finalStepDuration = 0x0; // Forced 12.5ms.
-
-    return pattern;
 }
 
-void blinkLed(u8 times)
+void blinkLed(u8 times) {
-{
+    if (!s_notification_led_available)
-    if (g_notificationLedAvailable) {
+        return;
-        PadState pad;
+
-        padInitializeDefault(&pad);
+    PadState pad;
-        s32 n;
+    padInitializeDefault(&pad);
-        HidsysUniquePadId uniquePadIds[2]    = {0};
+    s32 n = 0;
-        HidsysNotificationLedPattern pattern = blinkLedPattern(times);
+    HidsysUniquePadId pads[2]{};
-        memset(uniquePadIds, 0, sizeof(uniquePadIds));
+    HidsysNotificationLedPattern pattern = makeLedPattern(times);
-        Result res = hidsysGetUniquePadsFromNpad(padIsHandheld(&pad) ? HidNpadIdType_Handheld : HidNpadIdType_No1, uniquePadIds, 2, &n);
+
-        if (R_SUCCEEDED(res)) {
+    Result res = hidsysGetUniquePadsFromNpad(padIsHandheld(&pad) ? HidNpadIdType_Handheld : HidNpadIdType_No1,
-            for (s32 i = 0; i < n; i++) {
+                                             pads, 2, &n);
-                hidsysSetNotificationLedPattern(&pattern, uniquePadIds[i]);
+    if (R_SUCCEEDED(res)) {
-            }
+        for (s32 i = 0; i < n; ++i) {
+            hidsysSetNotificationLedPattern(&pattern, pads[i]);
         }
     }
 }

src/infra/fs/directory.cpp

@@ -1,76 +1,27 @@
-/*
+// Copyright (C) 2024-2026 NXST contributors
- *   This file is part of Checkpoint
+#include <cerrno>
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
+#include <dirent.h>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
 
 #include <nxst/infra/fs/directory.hpp>
 
-Directory::Directory(const std::string& root)
+Directory::Directory(const std::string& path) {
-{
+    DIR* d = opendir(path.c_str());
-    mGood  = false;
+    if (!d) {
-    mError = 0;
+        m_error = static_cast<Result>(errno);
-    mList.clear();
+        return;
-
+    }
-    DIR* dir = opendir(root.c_str());
     struct dirent* ent;
-
+    while ((ent = readdir(d)) != nullptr) {
-    if (dir == NULL) {
+        m_entries.push_back({ent->d_name, ent->d_type == DT_DIR});
-        mError = (Result)errno;
-    }
-    else {
-        while ((ent = readdir(dir))) {
-            std::string name         = std::string(ent->d_name);
-            bool directory           = ent->d_type == DT_DIR;
-            struct DirectoryEntry de = {name, directory};
-            mList.push_back(de);
-        }
-        closedir(dir);
-        mGood = true;
     }
+    closedir(d);
+    m_good = true;
 }
 
-Result Directory::error(void)
+std::string Directory::entry(size_t i) const {
-{
+    return i < m_entries.size() ? m_entries[i].name : "";
-    return mError;
 }
 
-bool Directory::good(void)
+bool Directory::folder(size_t i) const {
-{
+    return i < m_entries.size() && m_entries[i].is_dir;
-    return mGood;
 }
-
-std::string Directory::entry(size_t index)
-{
-    return index < mList.size() ? mList.at(index).name : "";
-}
-
-bool Directory::folder(size_t index)
-{
-    return index < mList.size() ? mList.at(index).directory : false;
-}
-
-size_t Directory::size(void)
-{
-    return mList.size();
-}

src/infra/fs/filesystem.cpp

@@ -1,42 +1,14 @@
-/*
+// Copyright (C) 2024-2026 NXST contributors
- *   This file is part of Checkpoint
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
-
 #include <nxst/infra/fs/filesystem.hpp>
 
-Result FileSystem::mount(FsFileSystem* fileSystem, u64 titleID, AccountUid userID)
+Result file_system::mount(FsFileSystem* fs, u64 title_id, AccountUid uid) {
-{
+    return fsOpen_SaveData(fs, title_id, uid);
-    return fsOpen_SaveData(fileSystem, titleID, userID);
 }
 
-int FileSystem::mount(FsFileSystem fs)
+int file_system::mount(FsFileSystem fs) {
-{
     return fsdevMountDevice("save", fs);
 }
 
-void FileSystem::unmount(void)
+void file_system::unmount() {
-{
     fsdevUnmountDevice("save");
-}
+}

src/infra/fs/io.cpp

@@ -1,57 +1,36 @@
-/*
+// Copyright (C) 2024-2026 NXST contributors
- *   This file is part of Checkpoint
+#include <cstdio>
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
+#include <sys/stat.h>
- *
+#include <unistd.h>
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
-
-#include <nxst/infra/fs/io.hpp>
-#include <nxst/infra/fs/handles.hpp>
-#include <nxst/app/main.hpp>
-#include <nxst/infra/sys/logger.hpp>
 #include <vector>
 
-bool io::fileExists(const std::string& path)
+#include <nxst/domain/account.hpp>
-{
+#include <nxst/domain/title.hpp>
+#include <nxst/domain/util.hpp>
+#include <nxst/infra/fs/directory.hpp>
+#include <nxst/infra/fs/filesystem.hpp>
+#include <nxst/infra/fs/handles.hpp>
+#include <nxst/infra/fs/io.hpp>
+#include <nxst/infra/sys/logger.hpp>
+
+static constexpr size_t kBufSize = 0x80000;
+
+bool io::fileExists(const std::string& path) {
     struct stat buffer;
     return (stat(path.c_str(), &buffer) == 0);
 }
 
-void io::copyFile(const std::string& srcPath, const std::string& dstPath)
+void io::copyFile(const std::string& srcPath, const std::string& dstPath) {
-{
-    g_isTransferringFile = true;
-
     nxst::FileHandle src(fopen(srcPath.c_str(), "rb"));
     if (!src) {
         nxst::log::error("Failed to open source file %s during copy with errno %d. Skipping...",
                          srcPath.c_str(), errno);
-        g_isTransferringFile = false;
         return;
     }
     nxst::FileHandle dst(fopen(dstPath.c_str(), "wb"));
     if (!dst) {
         nxst::log::error("Failed to open destination file %s during copy with errno %d. Skipping...",
                          dstPath.c_str(), errno);
-        g_isTransferringFile = false;
         return;
     }
 
@@ -59,35 +38,33 @@ void io::copyFile(const std::string& srcPath, const std::string& dstPath)
     u64 sz = (u64)ftell(src.get());
     rewind(src.get());
 
-    std::vector<u8> buf(BUFFER_SIZE);
+    std::vector<u8> buf(kBufSize);
     u64 offset = 0;
 
-    size_t slashpos = srcPath.rfind('/');
-    g_currentFile   = srcPath.substr(slashpos + 1, srcPath.length() - slashpos - 1);
-
     while (offset < sz) {
-        u32 count = (u32)fread(buf.data(), 1, BUFFER_SIZE, src.get());
+        u32 count = (u32)fread(buf.data(), 1, kBufSize, src.get());
         if (count == 0) {
             nxst::log::error("fread returned 0 for %s at offset %llu/%llu (errno %d). Aborting.",
-                             srcPath.c_str(), (unsigned long long)offset,
+                             srcPath.c_str(), (unsigned long long)offset, (unsigned long long)sz, errno);
-                             (unsigned long long)sz, errno);
+            break;
+        }
+        size_t written = fwrite(buf.data(), 1, count, dst.get());
+        if (written != count) {
+            nxst::log::error("fwrite incomplete for %s (%zu/%u bytes). Aborting.", dstPath.c_str(), written,
+                             count);
             break;
         }
-        fwrite(buf.data(), 1, count, dst.get());
         offset += count;
     }
 
     if (dstPath.rfind("save:/", 0) == 0) {
         fsdevCommitDevice("save");
     }
-
-    g_isTransferringFile = false;
 }
 
-Result io::copyDirectory(const std::string& srcPath, const std::string& dstPath)
+Result io::copyDirectory(const std::string& srcPath, const std::string& dstPath) {
-{
     Result res = 0;
-    bool quit  = false;
+    bool quit = false;
     Directory items(srcPath);
 
     if (!items.good()) {
@@ -99,131 +76,133 @@ Result io::copyDirectory(const std::string& srcPath, const std::string& dstPath)
         std::string newdst = dstPath + items.entry(i);
 
         if (items.folder(i)) {
-            res = io::createDirectory(newdst);
+            res = createDirectory(newdst);
             if (R_SUCCEEDED(res)) {
                 newsrc += "/";
                 newdst += "/";
-                res = io::copyDirectory(newsrc, newdst);
+                res = copyDirectory(newsrc, newdst);
-            }
+            } else {
-            else {
                 quit = true;
             }
-        }
+        } else {
-        else {
+            copyFile(newsrc, newdst);
-            io::copyFile(newsrc, newdst);
         }
     }
 
+    return res;
+}
+
+Result io::createDirectory(const std::string& path) {
+    if (mkdir(path.c_str(), 0777) != 0 && errno != EEXIST) {
+        nxst::log::error("mkdir failed for %s (errno %d).", path.c_str(), errno);
+        return 1;
+    }
     return 0;
 }
 
-Result io::createDirectory(const std::string& path)
+bool io::directoryExists(const std::string& path) {
-{
-    mkdir(path.c_str(), 0777);
-    return 0;
-}
-
-bool io::directoryExists(const std::string& path)
-{
     struct stat sb;
     return (stat(path.c_str(), &sb) == 0 && S_ISDIR(sb.st_mode));
 }
 
-Result io::deleteFolderRecursively(const std::string& path)
+Result io::deleteFolderRecursively(const std::string& path) {
-{
     Directory dir(path);
     if (!dir.good()) {
         return dir.error();
     }
 
+    Result res = 0;
     for (size_t i = 0, sz = dir.size(); i < sz; i++) {
         if (dir.folder(i)) {
-            std::string newpath = path + "/" + dir.entry(i) + "/";
+            std::string sub = path + "/" + dir.entry(i);
-            deleteFolderRecursively(newpath);
+            Result sub_res = deleteFolderRecursively(sub + "/");
-            newpath = path + dir.entry(i);
+            if (R_FAILED(sub_res))
-            rmdir(newpath.c_str());
+                res = sub_res;
-        }
+            rmdir(sub.c_str());
-        else {
+        } else {
-            std::string newpath = path + dir.entry(i);
+            std::remove((path + dir.entry(i)).c_str());
-            std::remove(newpath.c_str());
         }
     }
 
     rmdir(path.c_str());
-    return 0;
+    return res;
 }
 
-nxst::Result<std::string> io::backup(size_t index, AccountUid uid)
+nxst::Result<std::string> io::backup(size_t index, AccountUid uid) {
-{
     Title title;
     getTitle(title, uid, index);
 
-    nxst::log::info("Started backup of %s. Title id: 0x%016lX; User id: 0x%lX%lX.",
+    nxst::log::info("Started backup of %s. Title id: 0x%016lX; User id: 0x%lX%lX.", title.name().c_str(),
-                    title.name().c_str(), title.id(),
+                    title.id(), title.userId().uid[1], title.userId().uid[0]);
-                    title.userId().uid[1], title.userId().uid[0]);
 
-    nxst::FsFileSystemHandle fsHandle;
+    nxst::FsFileSystemHandle fs_handle;
-    Result res = FileSystem::mount(fsHandle.get(), title.id(), title.userId());
+    Result res = file_system::mount(fs_handle.get(), title.id(), title.userId());
     if (R_FAILED(res)) {
-        nxst::log::error("Failed to mount filesystem during backup with result 0x%08lX. "
+        nxst::log::error("Failed to mount filesystem during backup with result 0x%08X. "
                          "Title id: 0x%016lX; User id: 0x%lX%lX.",
                          res, title.id(), title.userId().uid[1], title.userId().uid[0]);
         return nxst::Result<std::string>::failure("Failed to mount save.");
     }
-    fsHandle.valid = true;
+    fs_handle.valid = true;
 
-    if (FileSystem::mount(*fsHandle.get()) == -1) {
+    if (file_system::mount(*fs_handle.get()) == -1) {
         nxst::log::error("Failed to mount devfs during backup. Title id: 0x%016lX; User id: 0x%lX%lX.",
                          title.id(), title.userId().uid[1], title.userId().uid[0]);
-        FileSystem::unmount();
+        file_system::unmount();
         return nxst::Result<std::string>::failure("Failed to mount save.");
     }
-    fsHandle.release();  // devfs now owns the kernel handle
+    fs_handle.release();  // devfs now owns the kernel handle
 
-    std::string suggestion = StringUtils::removeNotAscii(StringUtils::removeAccents(Account::username(title.userId())));
+    std::string suggestion =
+        string_utils::removeNotAscii(string_utils::removeAccents(account::username(title.userId())));
 
     io::createDirectory(title.path());
     std::string dst_path = title.path() + "/" + suggestion;
     std::string tmp_path = dst_path + ".tmp";
 
     if (io::directoryExists(tmp_path)) {
-        io::deleteFolderRecursively(tmp_path + "/");
+        if (R_FAILED(io::deleteFolderRecursively(tmp_path + "/")))
+            nxst::log::warn("Failed to clean up stale tmp dir %s.", tmp_path.c_str());
     }
-    io::createDirectory(tmp_path);
+    res = io::createDirectory(tmp_path);
-    res = io::copyDirectory("save:/", tmp_path + "/");
     if (R_FAILED(res)) {
-        FileSystem::unmount();
+        file_system::unmount();
+        nxst::log::error("Failed to create tmp dir %s.", tmp_path.c_str());
+        return nxst::Result<std::string>::failure("Failed to create tmp directory.");
+    }
+    res = copyDirectory("save:/", tmp_path + "/");
+    if (R_FAILED(res)) {
+        file_system::unmount();
         io::deleteFolderRecursively(tmp_path + "/");
-        nxst::log::error("Failed to copy directory to %s with result 0x%08lX.", tmp_path.c_str(), res);
+        nxst::log::error("Failed to copy directory to %s with result 0x%08X.", tmp_path.c_str(), res);
         return nxst::Result<std::string>::failure("Failed to backup save.");
     }
 
     if (io::directoryExists(dst_path)) {
-        io::deleteFolderRecursively(dst_path + "/");
+        if (R_FAILED(io::deleteFolderRecursively(dst_path + "/")))
+            nxst::log::warn("Failed to remove old backup at %s.", dst_path.c_str());
     }
     if (rename(tmp_path.c_str(), dst_path.c_str()) != 0) {
-        FileSystem::unmount();
+        file_system::unmount();
         nxst::log::error("Failed to rename temp backup to %s.", dst_path.c_str());
         return nxst::Result<std::string>::failure("Failed to finalise backup.");
     }
 
     refreshDirectories(title.id());
-    FileSystem::unmount();
+    file_system::unmount();
 
     nxst::log::info("Backup succeeded.");
     return nxst::Result<std::string>::success(dst_path);
 }
 
 // Creates the save data filesystem for a title if it doesn't exist yet.
-static void createSaveIfNeeded(u64 title_id, AccountUid uid)
+static void createSaveIfNeeded(u64 title_id, AccountUid uid) {
-{
     std::vector<u8> nsacd_buf(sizeof(NsApplicationControlData), 0);
     auto* nsacd = reinterpret_cast<NsApplicationControlData*>(nsacd_buf.data());
 
     size_t outsize = 0;
-    if (!R_SUCCEEDED(nsGetApplicationControlData(NsApplicationControlSource_Storage,
+    if (!R_SUCCEEDED(nsGetApplicationControlData(NsApplicationControlSource_Storage, title_id, nsacd,
-                                                  title_id, nsacd,
+                                                 sizeof(NsApplicationControlData), &outsize))) {
-                                                  sizeof(NsApplicationControlData), &outsize))) {
         return;
     }
 
@@ -231,100 +210,110 @@ static void createSaveIfNeeded(u64 title_id, AccountUid uid)
 
     FsSaveDataAttribute attr = {};
     attr.application_id = title_id;
-    attr.uid            = uid;
+    attr.uid = uid;
     attr.save_data_type = FsSaveDataType_Account;
     attr.save_data_rank = FsSaveDataRank_Primary;
 
     FsSaveDataCreationInfo create_info = {};
-    create_info.save_data_size    = (s64)nsacd->nacp.user_account_save_data_size;
+    create_info.save_data_size = (s64)nsacd->nacp.user_account_save_data_size;
-    create_info.journal_size      = (s64)nsacd->nacp.user_account_save_data_journal_size;
+    create_info.journal_size = (s64)nsacd->nacp.user_account_save_data_journal_size;
-    create_info.available_size    = 0x4000;
+    create_info.available_size = 0x4000;
-    create_info.owner_id          = nsacd->nacp.save_data_owner_id;
+    create_info.owner_id = nsacd->nacp.save_data_owner_id;
     create_info.save_data_space_id = FsSaveDataSpaceId_User;
 
     fsCreateSaveDataFileSystem(&attr, &create_info, &meta);
 }
 
-nxst::Result<std::string> io::restore(size_t index, AccountUid uid, size_t cellIndex, const std::string& nameFromCell)
+static nxst::Result<void> clearSaveRoot(const std::string& dst_path) {
-{
+    Directory save_root(dst_path);
-    (void)cellIndex;
+    for (size_t i = 0, sz = save_root.size(); i < sz; i++) {
+        if (save_root.folder(i)) {
+            io::deleteFolderRecursively(dst_path + save_root.entry(i) + "/");
+            rmdir((dst_path + save_root.entry(i)).c_str());
+        } else {
+            std::remove((dst_path + save_root.entry(i)).c_str());
+        }
+    }
 
+    Result res = fsdevCommitDevice("save");
+    if (R_FAILED(res)) {
+        nxst::log::error("Failed to commit save after clearing with result 0x%08X.", res);
+        return nxst::Result<void>::failure("Failed to commit save after delete.");
+    }
+    return nxst::Result<void>::success();
+}
+
+static nxst::Result<void> extractAndCommit(const std::string& src_path, const std::string& dst_path) {
+    Result res = io::copyDirectory(src_path, dst_path);
+    if (R_FAILED(res)) {
+        nxst::log::error("Failed to copy %s to save:/ with result 0x%08X.", src_path.c_str(), res);
+        return nxst::Result<void>::failure("Failed to restore save.");
+    }
+
+    res = fsdevCommitDevice("save");
+    if (R_FAILED(res)) {
+        nxst::log::error("Failed to commit save with result 0x%08X.", res);
+        return nxst::Result<void>::failure("Failed to commit to save device.");
+    }
+    return nxst::Result<void>::success();
+}
+
+nxst::Result<std::string> io::restore(size_t index, AccountUid uid, const std::string& title_name) {
     Title title;
     getTitle(title, uid, index);
 
-    nxst::log::info("Started restore of %s. Title id: 0x%016lX; User id: 0x%lX%lX.",
+    nxst::log::info("Started restore of %s. Title id: 0x%016lX; User id: 0x%lX%lX.", title.name().c_str(),
-                    title.name().c_str(), title.id(),
+                    title.id(), title.userId().uid[1], title.userId().uid[0]);
-                    title.userId().uid[1], title.userId().uid[0]);
 
     createSaveIfNeeded(title.id(), uid);
 
-    nxst::FsFileSystemHandle fsHandle;
+    nxst::FsFileSystemHandle fs_handle;
-    Result res = FileSystem::mount(fsHandle.get(), title.id(), uid);
+    Result res = file_system::mount(fs_handle.get(), title.id(), uid);
     if (R_FAILED(res)) {
-        nxst::log::error("Failed to mount filesystem during restore with result 0x%08lX. "
+        nxst::log::error("Failed to mount filesystem during restore with result 0x%08X. "
                          "Title id: 0x%016lX; User id: 0x%lX%lX.",
                          res, title.id(), uid.uid[1], uid.uid[0]);
         return nxst::Result<std::string>::failure("Failed to mount save.");
     }
-    fsHandle.valid = true;
+    fs_handle.valid = true;
 
-    if (FileSystem::mount(*fsHandle.get()) == -1) {
+    if (file_system::mount(*fs_handle.get()) == -1) {
         nxst::log::error("Failed to mount devfs during restore. Title id: 0x%016lX; User id: 0x%lX%lX.",
                          title.id(), uid.uid[1], uid.uid[0]);
-        FileSystem::unmount();
+        file_system::unmount();
         return nxst::Result<std::string>::failure("Failed to mount save.");
     }
-    fsHandle.release();  // devfs now owns the kernel handle
+    fs_handle.release();  // devfs now owns the kernel handle
 
-    std::string suggestion = StringUtils::removeNotAscii(StringUtils::removeAccents(Account::username(uid)));
+    std::string suggestion =
+        string_utils::removeNotAscii(string_utils::removeAccents(account::username(uid)));
     std::string src_path = title.path() + "/" + suggestion + "/";
     const std::string dst_path = "save:/";
 
     {
         Directory src_check(src_path);
         if (!src_check.good() || src_check.size() == 0) {
-            FileSystem::unmount();
+            file_system::unmount();
             nxst::log::error("Restore source is empty or missing: %s", src_path.c_str());
             return nxst::Result<std::string>::failure("Restore source is empty or missing.");
         }
     }
 
-    {
+    auto clear_res = clearSaveRoot(dst_path);
-        Directory save_root(dst_path);
+    if (!clear_res.isOk()) {
-        for (size_t i = 0, sz = save_root.size(); i < sz; i++) {
+        file_system::unmount();
-            if (save_root.folder(i)) {
+        return nxst::Result<std::string>::failure(clear_res.error());
-                io::deleteFolderRecursively(dst_path + save_root.entry(i) + "/");
-                rmdir((dst_path + save_root.entry(i)).c_str());
-            } else {
-                std::remove((dst_path + save_root.entry(i)).c_str());
-            }
-        }
     }
 
-    res = fsdevCommitDevice("save");
+    auto extract_res = extractAndCommit(src_path, dst_path);
-    if (R_FAILED(res)) {
+    if (!extract_res.isOk()) {
-        FileSystem::unmount();
+        file_system::unmount();
-        nxst::log::error("Failed to commit save after clearing with result 0x%08lX.", res);
+        return nxst::Result<std::string>::failure(extract_res.error());
-        return nxst::Result<std::string>::failure("Failed to commit save after delete.");
-    }
-
-    res = io::copyDirectory(src_path, dst_path);
-    if (R_FAILED(res)) {
-        FileSystem::unmount();
-        nxst::log::error("Failed to copy %s to save:/ with result 0x%08lX.", src_path.c_str(), res);
-        return nxst::Result<std::string>::failure("Failed to restore save.");
-    }
-
-    res = fsdevCommitDevice("save");
-    if (R_FAILED(res)) {
-        FileSystem::unmount();
-        nxst::log::error("Failed to commit save with result 0x%08lX.", res);
-        return nxst::Result<std::string>::failure("Failed to commit to save device.");
     }
 
     blinkLed(4);
-    FileSystem::unmount();
+    file_system::unmount();
 
     nxst::log::info("Restore succeeded.");
-    return nxst::Result<std::string>::success(nameFromCell + "\nhas been restored successfully.");
+    return nxst::Result<std::string>::success(title_name + "\nhas been restored successfully.");
 }

src/infra/net/transfer_receiver.cpp

@@ -1 +0,0 @@
-// Logic moved to src/service/transfer_service.cpp

src/infra/net/transfer_sender.cpp

@@ -1 +0,0 @@
-// Logic moved to src/service/transfer_service.cpp

src/infra/sys/logger.cpp

@@ -1,64 +1,90 @@
-#include <nxst/infra/sys/logger.hpp>
-
 #include <cstdarg>
 #include <cstdio>
 #include <ctime>
 #include <mutex>
 
+#include <nxst/infra/sys/logger.hpp>
+
 namespace {
 
-std::mutex g_log_mutex;
+    std::mutex g_log_mutex;
 
 #if defined(__SWITCH__)
-constexpr const char* kLogPath = "/switch/NXST/log.log";
+    constexpr const char* kLogPath = "/switch/NXST/log.log";
 #else
-constexpr const char* kLogPath = "nxst.log";
+    constexpr const char* kLogPath = "nxst.log";
 #endif
 
-void writeEntry(const char* tag, const char* fmt, va_list args)
+    void writeEntry(const char* tag, const char* fmt, va_list args) {
-{
+        char msg[2048];
-    char msg[2048];
+        vsnprintf(msg, sizeof(msg), fmt, args);
-    vsnprintf(msg, sizeof(msg), fmt, args);
 
-    time_t now = time(nullptr);
+        time_t now = time(nullptr);
-    struct tm tm_buf;
+        struct tm tm_buf;
-    localtime_r(&now, &tm_buf);
+        localtime_r(&now, &tm_buf);
-    char time_str[16];
+        char time_str[16];
-    strftime(time_str, sizeof(time_str), "%H:%M:%S", &tm_buf);
+        strftime(time_str, sizeof(time_str), "%H:%M:%S", &tm_buf);
 
-    std::lock_guard<std::mutex> lock(g_log_mutex);
+        std::lock_guard<std::mutex> lock(g_log_mutex);
 
-    fprintf(stderr, "[%s]%s %s\n", time_str, tag, msg);
+        fprintf(stderr, "[%s]%s %s\n", time_str, tag, msg);
 
-    FILE* log_file = fopen(kLogPath, "a");
+        FILE* log_file = fopen(kLogPath, "a");
-    if (log_file != nullptr) {
+        if (log_file != nullptr) {
-        fprintf(log_file, "[%s]%s %s\n", time_str, tag, msg);
+            fprintf(log_file, "[%s]%s %s\n", time_str, tag, msg);
-        fclose(log_file);
+            fclose(log_file);
+        }
     }
-}
 
-} // namespace
+}  // namespace
 
 namespace nxst::log {
 
-void write(Level level, const char* fmt, ...)
+    void write(Level level, const char* fmt, ...) {
-{
+        const char* tag = "[INFO] ";
-    const char* tag = "[INFO] ";
+        switch (level) {
-    switch (level) {
+        case Level::Debug:
-        case Level::Debug: tag = "[DEBUG]"; break;
+            tag = "[DEBUG]";
-        case Level::Info:  tag = "[INFO] "; break;
+            break;
-        case Level::Warn:  tag = "[WARN] "; break;
+        case Level::Info:
-        case Level::Error: tag = "[ERROR]"; break;
+            tag = "[INFO] ";
+            break;
+        case Level::Warn:
+            tag = "[WARN] ";
+            break;
+        case Level::Error:
+            tag = "[ERROR]";
+            break;
+        }
+        va_list args;
+        va_start(args, fmt);
+        writeEntry(tag, fmt, args);
+        va_end(args);
     }
-    va_list args;
-    va_start(args, fmt);
-    writeEntry(tag, fmt, args);
-    va_end(args);
-}
 
-void debug(const char* fmt, ...) { va_list args; va_start(args, fmt); writeEntry("[DEBUG]", fmt, args); va_end(args); }
+    void debug(const char* fmt, ...) {
-void info (const char* fmt, ...) { va_list args; va_start(args, fmt); writeEntry("[INFO] ", fmt, args); va_end(args); }
+        va_list args;
-void warn (const char* fmt, ...) { va_list args; va_start(args, fmt); writeEntry("[WARN] ", fmt, args); va_end(args); }
+        va_start(args, fmt);
-void error(const char* fmt, ...) { va_list args; va_start(args, fmt); writeEntry("[ERROR]", fmt, args); va_end(args); }
+        writeEntry("[DEBUG]", fmt, args);
+        va_end(args);
+    }
+    void info(const char* fmt, ...) {
+        va_list args;
+        va_start(args, fmt);
+        writeEntry("[INFO] ", fmt, args);
+        va_end(args);
+    }
+    void warn(const char* fmt, ...) {
+        va_list args;
+        va_start(args, fmt);
+        writeEntry("[WARN] ", fmt, args);
+        va_end(args);
+    }
+    void error(const char* fmt, ...) {
+        va_list args;
+        va_start(args, fmt);
+        writeEntry("[ERROR]", fmt, args);
+        va_end(args);
+    }
 
-} // namespace nxst::log
+}  // namespace nxst::log

src/service/transfer_service.cpp

@@ -1,5 +1,3 @@
-#include <nxst/service/transfer_service.hpp>
-
 #include <arpa/inet.h>
 #include <chrono>
 #include <cstring>
@@ -12,11 +10,14 @@
 #include <unistd.h>
 #include <vector>
 
+#include <nxst/service/transfer_service.hpp>
+
 #ifdef __SWITCH__
 #include <switch.h>
-#include <nxst/infra/fs/io.hpp>
+
-#include <nxst/domain/util.hpp>
 #include <nxst/domain/account.hpp>
+#include <nxst/domain/util.hpp>
+#include <nxst/infra/fs/io.hpp>
 #endif
 
 #include <nxst/domain/protocol.hpp>
@@ -26,458 +27,514 @@ namespace fs = std::filesystem;
 
 namespace nxst {
 
-// ─── File-transfer helpers ────────────────────────────────────────────────────
+    // ─── File-transfer helpers ────────────────────────────────────────────────────
 
-static bool sendAll(int sock, const void* buf, size_t len) {
+    static bool sendAll(int sock, const void* buf, size_t len) {
-    size_t sent = 0;
+        size_t sent = 0;
-    while (sent < len) {
+        while (sent < len) {
-        ssize_t n = send(sock, static_cast<const char*>(buf) + sent, len - sent, 0);
+            ssize_t n = send(sock, static_cast<const char*>(buf) + sent, len - sent, 0);
-        if (n <= 0) return false;
+            if (n <= 0)
-        sent += n;
+                return false;
-    }
+            sent += n;
-    return true;
-}
-
-static bool recvAll(int sock, void* buf, size_t len) {
-    size_t got = 0;
-    while (got < len) {
-        ssize_t n = read(sock, static_cast<char*>(buf) + got, len - got);
-        if (n <= 0) return false;
-        got += n;
-    }
-    return true;
-}
-
-static bool sendFile(int sock, const fs::path& filepath, TransferState& state) {
-    std::ifstream infile(filepath, std::ios::binary | std::ios::ate);
-    if (!infile.is_open()) return false;
-
-    uint32_t filename_len = (uint32_t)filepath.string().size();
-    uint64_t file_size    = (uint64_t)infile.tellg();
-    infile.seekg(0, std::ios::beg);
-
-    if (!sendAll(sock, &filename_len, sizeof(filename_len))) return false;
-    if (!sendAll(sock, filepath.c_str(), filename_len))      return false;
-    if (!sendAll(sock, &file_size, sizeof(file_size)))       return false;
-
-    std::vector<char> buffer(proto::BUF_SIZE);
-    uint64_t remaining = file_size;
-    while (remaining > 0) {
-        size_t to_read = (size_t)std::min(remaining, (uint64_t)proto::BUF_SIZE);
-        infile.read(buffer.data(), (std::streamsize)to_read);
-        std::streamsize count = infile.gcount();
-        if (count <= 0) break;
-        if (!sendAll(sock, buffer.data(), (size_t)count)) return false;
-        state.bytes_done.fetch_add((uint64_t)count);
-        remaining -= (uint64_t)count;
-    }
-    return true;
-}
-
-static void mkdirs(const std::string& path) {
-    for (size_t i = 1; i < path.size(); i++) {
-        if (path[i] == '/') {
-            std::string component = path.substr(0, i);
-            mkdir(component.c_str(), 0777);
         }
-    }
+        return true;
-    mkdir(path.c_str(), 0777);
-}
-
-static void receiveFile(int sock, const std::string& rel_path, uint64_t file_size,
-                        TransferState& state) {
-    size_t last_slash = rel_path.rfind('/');
-    if (last_slash != std::string::npos) {
-        std::string dir = rel_path.substr(0, last_slash);
-        if (!dir.empty()) mkdirs(dir);
     }
 
-    FILE* outfile = fopen(rel_path.c_str(), "wb");
+    static bool recvAll(int sock, void* buf, size_t len) {
-    if (!outfile) {
+        size_t got = 0;
-        std::vector<char> drain(proto::BUF_SIZE);
+        while (got < len) {
+            ssize_t n = read(sock, static_cast<char*>(buf) + got, len - got);
+            if (n <= 0)
+                return false;
+            got += n;
+        }
+        return true;
+    }
+
+    static bool sendFile(int sock, const fs::path& filepath, TransferState& state) {
+        std::ifstream infile(filepath, std::ios::binary | std::ios::ate);
+        if (!infile.is_open())
+            return false;
+
+        uint32_t filename_len = (uint32_t)filepath.string().size();
+        uint64_t file_size = (uint64_t)infile.tellg();
+        infile.seekg(0, std::ios::beg);
+
+        if (!sendAll(sock, &filename_len, sizeof(filename_len)))
+            return false;
+        if (!sendAll(sock, filepath.c_str(), filename_len))
+            return false;
+        if (!sendAll(sock, &file_size, sizeof(file_size)))
+            return false;
+
+        std::vector<char> buffer(proto::kBufSize);
         uint64_t remaining = file_size;
         while (remaining > 0) {
-            size_t to_read = (size_t)std::min(remaining, (uint64_t)proto::BUF_SIZE);
+            size_t to_read = (size_t)std::min(remaining, (uint64_t)proto::kBufSize);
-            ssize_t n = read(sock, drain.data(), to_read);
+            infile.read(buffer.data(), (std::streamsize)to_read);
-            if (n <= 0) break;
+            std::streamsize count = infile.gcount();
-            remaining -= (uint64_t)n;
+            if (count <= 0)
+                break;
+            if (!sendAll(sock, buffer.data(), (size_t)count))
+                return false;
+            state.bytes_done.fetch_add((uint64_t)count);
+            remaining -= (uint64_t)count;
         }
-        return;
+        return true;
     }
 
-    state.bytes_total.store(file_size);
+    static void mkdirs(const std::string& path) {
-    state.bytes_done.store(0);
+        for (size_t i = 1; i < path.size(); i++) {
-
+            if (path[i] == '/') {
-    std::vector<char> buffer(proto::BUF_SIZE);
+                std::string component = path.substr(0, i);
-    uint64_t total = 0;
+                mkdir(component.c_str(), 0777);
-    while (total < file_size) {
+            }
-        size_t to_read = (size_t)std::min(file_size - total, (uint64_t)proto::BUF_SIZE);
+        }
-        ssize_t n = read(sock, buffer.data(), to_read);
+        mkdir(path.c_str(), 0777);
-        if (n <= 0) break;
-        fwrite(buffer.data(), 1, (size_t)n, outfile);
-        total += (uint64_t)n;
-        state.bytes_done.store(total);
-    }
-    fclose(outfile);
-}
-
-// ─── Sender ──────────────────────────────────────────────────────────────────
-
-void TransferService::failSend(const std::string& reason) {
-    sender_state.fail_reason = reason;
-    sender_state.connection_failed.store(true);
-    sender_state.done.store(true);
-}
-
-int TransferService::findServer(char* out_ip) {
-    int udp_fd = socket(AF_INET, SOCK_DGRAM, 0);
-    if (udp_fd < 0) return -1;
-    sender_udp_sock.store(udp_fd);
-
-    auto releaseUdp = [&]() {
-        int owned = sender_udp_sock.exchange(-1);
-        if (owned == udp_fd) close(udp_fd);
-    };
-
-    sockaddr_in addr{};
-    addr.sin_family      = AF_INET;
-    addr.sin_port        = htons(proto::MULTICAST_PORT);
-    addr.sin_addr.s_addr = inet_addr(proto::MULTICAST_GROUP);
-
-    if (sendto(udp_fd, "DISCOVER_SERVER", 15, 0, (sockaddr*)&addr, sizeof(addr)) < 0) {
-        releaseUdp();
-        return -1;
     }
 
-    // Poll in 100ms slices so cancel races within 100ms
+    static void receiveFile(int sock, const std::string& rel_path, uint64_t file_size, TransferState& state) {
-    auto deadline = std::chrono::steady_clock::now() + std::chrono::seconds(3);
+        size_t last_slash = rel_path.rfind('/');
-    while (std::chrono::steady_clock::now() < deadline) {
+        if (last_slash != std::string::npos) {
-        if (sender_state.cancelled.load()) { releaseUdp(); return -1; }
+            std::string dir = rel_path.substr(0, last_slash);
-        struct timeval tv{0, 100000};
+            if (!dir.empty())
-        fd_set fds;
+                mkdirs(dir);
-        FD_ZERO(&fds);
+        }
-        FD_SET(udp_fd, &fds);
+
-        if (select(udp_fd + 1, &fds, nullptr, nullptr, &tv) > 0) {
+        FILE* outfile = fopen(rel_path.c_str(), "wb");
-            sockaddr_in from{};
+        if (!outfile) {
-            socklen_t   fromlen = sizeof(from);
+            std::vector<char> drain(proto::kBufSize);
-            char        buf[256];
+            uint64_t remaining = file_size;
-            ssize_t     n = recvfrom(udp_fd, buf, sizeof(buf) - 1, 0, (sockaddr*)&from, &fromlen);
+            while (remaining > 0) {
-            if (n > 0) {
+                size_t to_read = (size_t)std::min(remaining, (uint64_t)proto::kBufSize);
-                buf[n] = '\0';
+                ssize_t n = read(sock, drain.data(), to_read);
-                if (strcmp(buf, "SERVER_HERE") == 0) {
+                if (n <= 0)
-                    inet_ntop(AF_INET, &from.sin_addr, out_ip, INET_ADDRSTRLEN);
+                    break;
-                    releaseUdp();
+                remaining -= (uint64_t)n;
-                    return 0;
+            }
+            return;
+        }
+
+        state.bytes_total.store(file_size);
+        state.bytes_done.store(0);
+
+        std::vector<char> buffer(proto::kBufSize);
+        uint64_t total = 0;
+        while (total < file_size) {
+            size_t to_read = (size_t)std::min(file_size - total, (uint64_t)proto::kBufSize);
+            ssize_t n = read(sock, buffer.data(), to_read);
+            if (n <= 0)
+                break;
+            fwrite(buffer.data(), 1, (size_t)n, outfile);
+            total += (uint64_t)n;
+            state.bytes_done.store(total);
+        }
+        fclose(outfile);
+    }
+
+    // ─── Sender ──────────────────────────────────────────────────────────────────
+
+    void TransferService::failSend(const std::string& reason) {
+        sender_state.fail_reason = reason;
+        sender_state.connection_failed.store(true);
+        sender_state.done.store(true);
+    }
+
+    int TransferService::findServer(char* out_ip) {
+        int udp_fd = socket(AF_INET, SOCK_DGRAM, 0);
+        if (udp_fd < 0)
+            return -1;
+        sender_udp_sock.store(udp_fd);
+
+        auto releaseUdp = [&]() {
+            int owned = sender_udp_sock.exchange(-1);
+            if (owned == udp_fd)
+                close(udp_fd);
+        };
+
+        sockaddr_in addr{};
+        addr.sin_family = AF_INET;
+        addr.sin_port = htons(proto::kMulticastPort);
+        addr.sin_addr.s_addr = inet_addr(proto::kMulticastGroup);
+
+        if (sendto(udp_fd, "DISCOVER_SERVER", 15, 0, (sockaddr*)&addr, sizeof(addr)) < 0) {
+            releaseUdp();
+            return -1;
+        }
+
+        // Poll in 100ms slices so cancel races within 100ms
+        auto deadline = std::chrono::steady_clock::now() + std::chrono::seconds(3);
+        while (std::chrono::steady_clock::now() < deadline) {
+            if (sender_state.cancelled.load()) {
+                releaseUdp();
+                return -1;
+            }
+            struct timeval tv{0, 100000};
+            fd_set fds;
+            FD_ZERO(&fds);
+            FD_SET(udp_fd, &fds);
+            if (select(udp_fd + 1, &fds, nullptr, nullptr, &tv) > 0) {
+                sockaddr_in from{};
+                socklen_t fromlen = sizeof(from);
+                char buf[256];
+                ssize_t n = recvfrom(udp_fd, buf, sizeof(buf) - 1, 0, (sockaddr*)&from, &fromlen);
+                if (n > 0) {
+                    buf[n] = '\0';
+                    if (strcmp(buf, "SERVER_HERE") == 0) {
+                        inet_ntop(AF_INET, &from.sin_addr, out_ip, INET_ADDRSTRLEN);
+                        releaseUdp();
+                        return 0;
+                    }
                 }
             }
         }
-    }
+        releaseUdp();
-    releaseUdp();
-    return -1;
-}
-
-void* TransferService::senderEntry(void* arg) {
-    auto* a = static_cast<SenderArgs*>(arg);
-    TransferService* svc = a->svc;
-    size_t           idx = a->title_index;
-    AccountUid       uid = a->uid;
-    delete a;
-    svc->runSender(idx, uid);
-    return nullptr;
-}
-
-void TransferService::runSender(size_t title_index, AccountUid uid) {
-    sender_active.store(true);
-
-    auto finish = [this]() {
-        sender_state.done.store(true);
-        sender_active.store(false);
-    };
-
-    char server_ip[INET_ADDRSTRLEN];
-    if (findServer(server_ip) != 0) {
-        if (!sender_state.cancelled.load())
-            failSend("No receiver found.\nMake sure the other Switch is in Receive mode.");
-        return finish();
-    }
-    if (sender_state.cancelled.load()) return finish();
-
-    sender_state.setStatus("Creating backup...");
-#ifdef __SWITCH__
-    auto backup_result = io::backup(title_index, uid);
-    if (!backup_result.isOk()) {
-        failSend("Failed to create backup:\n" + backup_result.error());
-        return finish();
-    }
-    fs::path directory = backup_result.value();
-#else
-    fs::path directory = ".";
-    (void)title_index; (void)uid;
-#endif
-
-    if (sender_state.cancelled.load()) return finish();
-
-    sender_state.setStatus("Connecting...");
-    int tcp_fd = socket(AF_INET, SOCK_STREAM, 0);
-    if (tcp_fd < 0) { failSend("Failed to open socket."); return finish(); }
-    sender_tcp_sock.store(tcp_fd);
-
-    auto releaseTcp = [&]() {
-        int owned = sender_tcp_sock.exchange(-1);
-        if (owned == tcp_fd) close(tcp_fd);
-    };
-
-    sockaddr_in serv{};
-    serv.sin_family = AF_INET;
-    serv.sin_port   = htons(proto::TCP_PORT);
-    if (inet_pton(AF_INET, server_ip, &serv.sin_addr) <= 0 ||
-        connect(tcp_fd, (sockaddr*)&serv, sizeof(serv)) < 0) {
-        if (!sender_state.cancelled.load())
-            failSend("Failed to connect to receiver.");
-        releaseTcp();
-        return finish();
-    }
-
-    uint64_t total = 0;
-    for (const auto& entry : fs::recursive_directory_iterator(directory))
-        if (fs::is_regular_file(entry.path()))
-            total += fs::file_size(entry.path());
-    sender_state.bytes_total.store(total);
-
-    for (const auto& entry : fs::recursive_directory_iterator(directory)) {
-        if (sender_state.cancelled.load()) break;
-        const fs::path& p = entry.path();
-        if (fs::is_regular_file(p)) {
-            sender_state.setStatus(p.filename().string());
-            if (!sendFile(tcp_fd, p, sender_state)) break;
-        }
-    }
-
-    uint32_t sentinel = proto::EOF_SENTINEL;
-    sendAll(tcp_fd, &sentinel, sizeof(sentinel));
-
-    releaseTcp();
-    sender_state.setStatus("");
-    return finish();
-}
-
-int TransferService::startSend(size_t title_index, AccountUid uid) {
-    sender_state.reset();
-    sender_state.setStatus("Searching for receiver...");
-
-    auto* arg = new SenderArgs{this, title_index, uid};
-    pthread_t thread;
-    if (pthread_create(&thread, nullptr, senderEntry, arg) != 0) {
-        delete arg;
         return -1;
     }
-    pthread_detach(thread);
-    return 0;
-}
 
-void TransferService::cancelSend() {
+    void* TransferService::senderEntry(void* arg) {
-    sender_state.cancelled.store(true);
+        auto* a = static_cast<SenderArgs*>(arg);
-    int udp = sender_udp_sock.exchange(-1);
+        TransferService* svc = a->svc;
-    if (udp >= 0) { shutdown(udp, SHUT_RDWR); close(udp); }
+        size_t idx = a->title_index;
-    int tcp = sender_tcp_sock.exchange(-1);
+        AccountUid uid = a->uid;
-    if (tcp >= 0) { shutdown(tcp, SHUT_RDWR); close(tcp); }
+        delete a;
-}
+        svc->runSender(idx, uid);
+        return nullptr;
+    }
 
-// ─── Receiver ────────────────────────────────────────────────────────────────
+    void TransferService::runSender(size_t title_index, AccountUid uid) {
+        sender_active.store(true);
 
-std::string TransferService::replaceUsername(const std::string& file_path) const {
+        auto finish = [this]() {
+            sender_state.done.store(true);
+            sender_active.store(false);
+        };
+
+        char server_ip[INET_ADDRSTRLEN];
+        if (findServer(server_ip) != 0) {
+            if (!sender_state.cancelled.load())
+                failSend("No receiver found.\nMake sure the other Switch is in Receive mode.");
+            return finish();
+        }
+        if (sender_state.cancelled.load())
+            return finish();
+
+        sender_state.setStatus("Creating backup...");
 #ifdef __SWITCH__
-    std::string username = StringUtils::removeNotAscii(
+        auto backup_result = io::backup(title_index, uid);
-        StringUtils::removeAccents(Account::username(restore_uid)));
+        if (!backup_result.isOk()) {
-    size_t last_slash = file_path.rfind('/');
+            failSend("Failed to create backup:\n" + backup_result.error());
-    if (last_slash == std::string::npos) return file_path;
+            return finish();
-    size_t prev_slash = file_path.rfind('/', last_slash - 1);
+        }
-    if (prev_slash == std::string::npos)
+        fs::path directory = backup_result.value();
-        return username + file_path.substr(last_slash);
-    return file_path.substr(0, prev_slash + 1) + username + file_path.substr(last_slash);
 #else
-    return file_path;
+        fs::path directory = ".";
+        (void)title_index;
+        (void)uid;
 #endif
-}
 
-void* TransferService::broadcastEntry(void* arg) {
+        if (sender_state.cancelled.load())
-    static_cast<TransferService*>(arg)->runBroadcast();
+            return finish();
-    return nullptr;
-}
 
-void TransferService::runBroadcast() {
+        sender_state.setStatus("Connecting...");
-    receiver_broadcast_active.store(true);
+        int tcp_fd = socket(AF_INET, SOCK_STREAM, 0);
-    pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, nullptr);
+        if (tcp_fd < 0) {
-    pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, nullptr);
+            failSend("Failed to open socket.");
-
+            return finish();
-    int udp = socket(AF_INET, SOCK_DGRAM, 0);
-    if (udp < 0) { receiver_broadcast_active.store(false); return; }
-    receiver_bcast_sock.store(udp);
-
-    auto releaseUdp = [&]() {
-        int owned = receiver_bcast_sock.exchange(-1);
-        if (owned == udp) close(udp);
-    };
-
-    struct timeval tv{0, 20000};  // 20ms poll so cancel/exit wins race with socketExit
-    setsockopt(udp, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
-
-    sockaddr_in addr{};
-    addr.sin_family      = AF_INET;
-    addr.sin_addr.s_addr = htonl(INADDR_ANY);
-    addr.sin_port        = htons(proto::MULTICAST_PORT);
-
-    if (bind(udp, (sockaddr*)&addr, sizeof(addr)) < 0) {
-        releaseUdp();
-        receiver_broadcast_active.store(false);
-        return;
-    }
-
-    ip_mreq group{};
-    group.imr_multiaddr.s_addr = inet_addr(proto::MULTICAST_GROUP);
-    group.imr_interface.s_addr = htonl(INADDR_ANY);
-    if (setsockopt(udp, IPPROTO_IP, IP_ADD_MEMBERSHIP, &group, sizeof(group)) < 0) {
-        releaseUdp();
-        receiver_broadcast_active.store(false);
-        return;
-    }
-
-    char buf[256];
-    sockaddr_in from{};
-    socklen_t fromlen = sizeof(from);
-    while (true) {
-        ssize_t n = recvfrom(udp, buf, sizeof(buf) - 1, 0, (sockaddr*)&from, &fromlen);
-        if (n < 0) {
-            if (receiver_state.cancelled.load()) break;
-            continue;
         }
-        buf[n] = '\0';
+        sender_tcp_sock.store(tcp_fd);
-        if (strcmp(buf, "DISCOVER_SERVER") == 0) {
+
-            sendto(udp, "SERVER_HERE", 11, 0, (sockaddr*)&from, fromlen);
+        auto releaseTcp = [&]() {
-            break;
+            int owned = sender_tcp_sock.exchange(-1);
+            if (owned == tcp_fd)
+                close(tcp_fd);
+        };
+
+        sockaddr_in serv{};
+        serv.sin_family = AF_INET;
+        serv.sin_port = htons(proto::kTcpPort);
+        if (inet_pton(AF_INET, server_ip, &serv.sin_addr) <= 0 ||
+            connect(tcp_fd, (sockaddr*)&serv, sizeof(serv)) < 0) {
+            if (!sender_state.cancelled.load())
+                failSend("Failed to connect to receiver.");
+            releaseTcp();
+            return finish();
+        }
+
+        uint64_t total = 0;
+        for (const auto& entry : fs::recursive_directory_iterator(directory))
+            if (fs::is_regular_file(entry.path()))
+                total += fs::file_size(entry.path());
+        sender_state.bytes_total.store(total);
+
+        for (const auto& entry : fs::recursive_directory_iterator(directory)) {
+            if (sender_state.cancelled.load())
+                break;
+            const fs::path& p = entry.path();
+            if (fs::is_regular_file(p)) {
+                sender_state.setStatus(p.filename().string());
+                if (!sendFile(tcp_fd, p, sender_state))
+                    break;
+            }
+        }
+
+        uint32_t sentinel = proto::kEofSentinel;
+        sendAll(tcp_fd, &sentinel, sizeof(sentinel));
+
+        releaseTcp();
+        sender_state.setStatus("");
+        return finish();
+    }
+
+    int TransferService::startSend(size_t title_index, AccountUid uid) {
+        sender_state.reset();
+        sender_state.setStatus("Searching for receiver...");
+
+        auto* arg = new SenderArgs{this, title_index, uid};
+        pthread_t thread;
+        if (pthread_create(&thread, nullptr, senderEntry, arg) != 0) {
+            delete arg;
+            return -1;
+        }
+        pthread_detach(thread);
+        return 0;
+    }
+
+    void TransferService::cancelSend() {
+        sender_state.cancelled.store(true);
+        int udp = sender_udp_sock.exchange(-1);
+        if (udp >= 0) {
+            shutdown(udp, SHUT_RDWR);
+            close(udp);
+        }
+        int tcp = sender_tcp_sock.exchange(-1);
+        if (tcp >= 0) {
+            shutdown(tcp, SHUT_RDWR);
+            close(tcp);
         }
     }
 
-    releaseUdp();
+    // ─── Receiver ────────────────────────────────────────────────────────────────
-    receiver_broadcast_active.store(false);
-}
 
-void* TransferService::acceptEntry(void* arg) {
+    std::string TransferService::replaceUsername(const std::string& file_path) const {
-    auto* a = static_cast<AcceptArgs*>(arg);
+#ifdef __SWITCH__
-    TransferService* svc = a->svc;
+        std::string username =
-    int server_fd        = a->server_fd;
+            string_utils::removeNotAscii(string_utils::removeAccents(account::username(restore_uid)));
-    delete a;
+        size_t last_slash = file_path.rfind('/');
-    svc->runAccept(server_fd);
+        if (last_slash == std::string::npos)
-    return nullptr;
+            return file_path;
-}
+        size_t prev_slash = file_path.rfind('/', last_slash - 1);
+        if (prev_slash == std::string::npos)
+            return username + file_path.substr(last_slash);
+        return file_path.substr(0, prev_slash + 1) + username + file_path.substr(last_slash);
+#else
+        return file_path;
+#endif
+    }
 
-void TransferService::runAccept(int server_fd) {
+    void* TransferService::broadcastEntry(void* arg) {
-    receiver_accept_active.store(true);
+        static_cast<TransferService*>(arg)->runBroadcast();
-    receiver_listen_sock.store(server_fd);
+        return nullptr;
+    }
 
-    sockaddr_in client_addr{};
+    void TransferService::runBroadcast() {
-    socklen_t client_len = sizeof(client_addr);
+        receiver_broadcast_active.store(true);
-    int client_sock = accept(server_fd, (sockaddr*)&client_addr, &client_len);
+        pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, nullptr);
+        pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, nullptr);
 
-    int owned_listen = receiver_listen_sock.exchange(-1);
+        int udp = socket(AF_INET, SOCK_DGRAM, 0);
-    if (owned_listen == server_fd) close(server_fd);
+        if (udp < 0) {
+            receiver_broadcast_active.store(false);
+            return;
+        }
+        receiver_bcast_sock.store(udp);
 
-    if (client_sock >= 0) {
+        auto releaseUdp = [&]() {
-        receiver_client_sock.store(client_sock);
+            int owned = receiver_bcast_sock.exchange(-1);
+            if (owned == udp)
+                close(udp);
+        };
 
+        struct timeval tv{0, 20000};  // 20ms poll so cancel/exit wins race with socketExit
+        setsockopt(udp, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+
+        sockaddr_in addr{};
+        addr.sin_family = AF_INET;
+        addr.sin_addr.s_addr = htonl(INADDR_ANY);
+        addr.sin_port = htons(proto::kMulticastPort);
+
+        if (bind(udp, (sockaddr*)&addr, sizeof(addr)) < 0) {
+            releaseUdp();
+            receiver_broadcast_active.store(false);
+            return;
+        }
+
+        ip_mreq group{};
+        group.imr_multiaddr.s_addr = inet_addr(proto::kMulticastGroup);
+        group.imr_interface.s_addr = htonl(INADDR_ANY);
+        if (setsockopt(udp, IPPROTO_IP, IP_ADD_MEMBERSHIP, &group, sizeof(group)) < 0) {
+            releaseUdp();
+            receiver_broadcast_active.store(false);
+            return;
+        }
+
+        char buf[256];
+        sockaddr_in from{};
+        socklen_t fromlen = sizeof(from);
         while (true) {
-            uint32_t filename_len = 0;
+            ssize_t n = recvfrom(udp, buf, sizeof(buf) - 1, 0, (sockaddr*)&from, &fromlen);
-            if (!recvAll(client_sock, &filename_len, sizeof(filename_len))) break;
+            if (n < 0) {
-            if (filename_len == proto::EOF_SENTINEL) break;
+                if (receiver_state.cancelled.load())
-            if (filename_len > proto::MAX_FILENAME) break;
+                    break;
+                continue;
+            }
+            buf[n] = '\0';
+            if (strcmp(buf, "DISCOVER_SERVER") == 0) {
+                sendto(udp, "SERVER_HERE", 11, 0, (sockaddr*)&from, fromlen);
+                break;
+            }
+        }
 
-            std::vector<char> filename_buf(filename_len + 1, '\0');
+        releaseUdp();
-            if (!recvAll(client_sock, filename_buf.data(), filename_len)) break;
+        receiver_broadcast_active.store(false);
-            std::string filename_str(filename_buf.data(), filename_len);
+    }
-            filename_str = replaceUsername(filename_str);
 
-            {
+    void* TransferService::acceptEntry(void* arg) {
-                size_t sl = filename_str.rfind('/');
+        auto* a = static_cast<AcceptArgs*>(arg);
-                receiver_state.setStatus(
+        TransferService* svc = a->svc;
-                    sl != std::string::npos ? filename_str.substr(sl + 1) : filename_str);
+        int server_fd = a->server_fd;
+        delete a;
+        svc->runAccept(server_fd);
+        return nullptr;
+    }
+
+    void TransferService::runAccept(int server_fd) {
+        receiver_accept_active.store(true);
+        receiver_listen_sock.store(server_fd);
+
+        sockaddr_in client_addr{};
+        socklen_t client_len = sizeof(client_addr);
+        int client_sock = accept(server_fd, (sockaddr*)&client_addr, &client_len);
+
+        int owned_listen = receiver_listen_sock.exchange(-1);
+        if (owned_listen == server_fd)
+            close(server_fd);
+
+        if (client_sock >= 0) {
+            receiver_client_sock.store(client_sock);
+
+            while (true) {
+                uint32_t filename_len = 0;
+                if (!recvAll(client_sock, &filename_len, sizeof(filename_len)))
+                    break;
+                if (filename_len == proto::kEofSentinel)
+                    break;
+                if (filename_len > proto::kMaxFilename)
+                    break;
+
+                std::vector<char> filename_buf(filename_len + 1, '\0');
+                if (!recvAll(client_sock, filename_buf.data(), filename_len))
+                    break;
+                std::string filename_str(filename_buf.data(), filename_len);
+                filename_str = replaceUsername(filename_str);
+
+                {
+                    size_t sl = filename_str.rfind('/');
+                    receiver_state.setStatus(sl != std::string::npos ? filename_str.substr(sl + 1)
+                                                                     : filename_str);
+                }
+
+                uint64_t file_size = 0;
+                if (!recvAll(client_sock, &file_size, sizeof(file_size)))
+                    break;
+                receiveFile(client_sock, filename_str, file_size, receiver_state);
             }
 
-            uint64_t file_size = 0;
+            int owned = receiver_client_sock.exchange(-1);
-            if (!recvAll(client_sock, &file_size, sizeof(file_size))) break;
+            if (owned == client_sock)
-            receiveFile(client_sock, filename_str, file_size, receiver_state);
+                close(client_sock);
-        }
 
-        int owned = receiver_client_sock.exchange(-1);
+            if (!receiver_state.cancelled.load()) {
-        if (owned == client_sock) close(client_sock);
-
-        if (!receiver_state.cancelled.load()) {
 #ifdef __SWITCH__
-            receiver_state.setStatus("Restoring...");
+                receiver_state.setStatus("Restoring...");
-            auto result = io::restore(restore_title_index, restore_uid, 0, restore_title_name);
+                auto result = io::restore(restore_title_index, restore_uid, restore_title_name);
-            restore_ok    = result.isOk();
+                restore_ok = result.isOk();
-            restore_error = result.isOk() ? "" : result.error();
+                restore_error = result.isOk() ? "" : result.error();
 #else
-            restore_ok = true;
+                restore_ok = true;
 #endif
+            }
         }
+
+        receiver_state.done.store(true);
+        receiver_accept_active.store(false);
     }
 
-    receiver_state.done.store(true);
+    int TransferService::startReceive(size_t title_index, AccountUid uid, std::string title_name) {
-    receiver_accept_active.store(false);
+        receiver_state.reset();
-}
+        receiver_state.setStatus("Waiting for connection...");
+        restore_title_index = title_index;
+        restore_uid = uid;
+        restore_title_name = std::move(title_name);
+        restore_ok = false;
+        restore_error.clear();
 
-int TransferService::startReceive(size_t title_index, AccountUid uid, std::string title_name) {
+        pthread_t bcast_thread;
-    receiver_state.reset();
+        if (pthread_create(&bcast_thread, nullptr, broadcastEntry, this) != 0)
-    receiver_state.setStatus("Waiting for connection...");
+            return 1;
-    restore_title_index = title_index;
+        receiver_bcast_thread = bcast_thread;
-    restore_uid         = uid;
+        pthread_detach(bcast_thread);
-    restore_title_name  = std::move(title_name);
-    restore_ok          = false;
-    restore_error.clear();
 
-    pthread_t bcast_thread;
+        Socket server(socket(AF_INET, SOCK_STREAM, 0));
-    if (pthread_create(&bcast_thread, nullptr, broadcastEntry, this) != 0) return 1;
+        if (!server.valid()) {
-    receiver_bcast_thread = bcast_thread;
+            cancelReceive();
-    pthread_detach(bcast_thread);
+            return 1;
+        }
 
-    Socket server(socket(AF_INET, SOCK_STREAM, 0));
+        int yes = 1;
-    if (!server.valid()) { cancelReceive(); return 1; }
+        setsockopt(server, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
 
-    int yes = 1;
+        sockaddr_in addr{};
-    setsockopt(server, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+        addr.sin_family = AF_INET;
+        addr.sin_addr.s_addr = INADDR_ANY;
+        addr.sin_port = htons(proto::kTcpPort);
 
-    sockaddr_in addr{};
+        if (bind(server, (sockaddr*)&addr, sizeof(addr)) < 0 || listen(server, 3) < 0) {
-    addr.sin_family      = AF_INET;
+            cancelReceive();
-    addr.sin_addr.s_addr = INADDR_ANY;
+            return 1;
-    addr.sin_port        = htons(proto::TCP_PORT);
+        }
 
-    if (bind(server, (sockaddr*)&addr, sizeof(addr)) < 0 ||
+        auto* acc_args = new AcceptArgs{this, server.fd};
-        listen(server, 3) < 0) {
+        pthread_t accept_thread;
-        cancelReceive();
+        if (pthread_create(&accept_thread, nullptr, acceptEntry, acc_args) != 0) {
-        return 1;
+            delete acc_args;
+            cancelReceive();
+            return 1;
+        }
+        pthread_detach(accept_thread);
+        server.release();
+        return 0;
     }
 
-    auto* acc_args = new AcceptArgs{this, server.fd};
+    void TransferService::cancelReceive() {
-    pthread_t accept_thread;
+        receiver_state.cancelled.store(true);
-    if (pthread_create(&accept_thread, nullptr, acceptEntry, acc_args) != 0) {
+        int sock = receiver_client_sock.exchange(-1);
-        delete acc_args;
+        if (sock >= 0) {
-        cancelReceive();
+            shutdown(sock, SHUT_RDWR);
-        return 1;
+            close(sock);
+        }
+        int lsock = receiver_listen_sock.exchange(-1);
+        if (lsock >= 0) {
+            shutdown(lsock, SHUT_RDWR);
+            close(lsock);
+        }
+        int bsock = receiver_bcast_sock.exchange(-1);
+        if (bsock >= 0) {
+            shutdown(bsock, SHUT_RDWR);
+            close(bsock);
+        }
+        if (receiver_broadcast_active.load())
+            pthread_cancel(receiver_bcast_thread);
     }
-    pthread_detach(accept_thread);
-    server.release();
-    return 0;
-}
 
-void TransferService::cancelReceive() {
+}  // namespace nxst
-    receiver_state.cancelled.store(true);
-    int sock = receiver_client_sock.exchange(-1);
-    if (sock >= 0) { shutdown(sock, SHUT_RDWR); close(sock); }
-    int lsock = receiver_listen_sock.exchange(-1);
-    if (lsock >= 0) { shutdown(lsock, SHUT_RDWR); close(lsock); }
-    int bsock = receiver_bcast_sock.exchange(-1);
-    if (bsock >= 0) { shutdown(bsock, SHUT_RDWR); close(bsock); }
-    if (receiver_broadcast_active.load()) pthread_cancel(receiver_bcast_thread);
-}
-
-} // namespace nxst

src/ui/titles_layout.cpp

@@ -1,10 +1,9 @@
 #include <nxst/app/main_application.hpp>
 #include <nxst/domain/util.hpp>
 #include <nxst/ui/transfer_overlay.hpp>
-#include <nxst/ui/const.h>
 
 namespace ui {
-    extern MainApplication *mainApp;
+    extern MainApplication* mainApp;
 
     namespace {
         constexpr int ListX = theme::space::lg;
@@ -15,76 +14,71 @@ namespace ui {
         constexpr int ContentH = theme::layout::ContentH - 2 * theme::space::md;
         constexpr int BtnH = 56;
         constexpr int BtnW = PanelW - 2 * theme::space::lg;
-    }
+    }  // namespace
 
-    TitlesLayout::TitlesLayout() : Layout::Layout() {
+    TitlesLayout::TitlesLayout() {
         using namespace theme;
 
-        this->titlesMenu = pu::ui::elm::Menu::New(
+        this->titlesMenu =
-            ListX, ContentY, ListW,
+            pu::ui::elm::Menu::New(ListX, ContentY, ListW, color::BgBase, color::BgSurface2, 88, 6);
-            color::BgBase, color::BgSurface2,
-            88, 6);
         this->titlesMenu->SetScrollbarColor(color::Primary);
         this->titlesMenu->SetItemsFocusColor(color::BgSurface2);
-        this->titlesMenu->SetOnSelectionChanged([this]() { this->refreshPanel(); });
+        this->titlesMenu->SetOnSelectionChanged([this]() {
+            this->refreshPanel();
+        });
         this->SetBackgroundColor(color::BgBase);
         this->Add(this->titlesMenu);
 
-        this->panelBg = pu::ui::elm::Rectangle::New(
+        this->panelBg =
-            PanelX, ContentY, PanelW, ContentH, color::BgSurface, radius::lg);
+            pu::ui::elm::Rectangle::New(PanelX, ContentY, PanelW, ContentH, color::BgSurface, radius::lg);
         this->Add(this->panelBg);
 
-        this->panelTitle = pu::ui::elm::TextBlock::New(
+        this->panelTitle = pu::ui::elm::TextBlock::New(PanelX + space::lg, ContentY + space::lg, "");
-            PanelX + space::lg, ContentY + space::lg, "");
         this->panelTitle->SetFont(type::font(type::Title));
         this->panelTitle->SetColor(color::TextPrimary);
         this->Add(this->panelTitle);
 
-        this->panelHint = pu::ui::elm::TextBlock::New(
+        this->panelHint =
-            PanelX + space::lg, ContentY + space::lg + 48, "Pick an action:");
+            pu::ui::elm::TextBlock::New(PanelX + space::lg, ContentY + space::lg + 48, "Pick an action:");
         this->panelHint->SetFont(type::font(type::Body));
         this->panelHint->SetColor(color::TextSecondary);
         this->Add(this->panelHint);
 
         int btnY = ContentY + 200;
-        this->btnTransferBg = pu::ui::elm::Rectangle::New(
+        this->btnTransferBg =
-            PanelX + space::lg, btnY, BtnW, BtnH, color::BgSurface2, radius::md);
+            pu::ui::elm::Rectangle::New(PanelX + space::lg, btnY, BtnW, BtnH, color::BgSurface2, radius::md);
         this->Add(this->btnTransferBg);
-        this->btnTransferText = pu::ui::elm::TextBlock::New(
+        this->btnTransferText = pu::ui::elm::TextBlock::New(PanelX + space::lg + space::md, btnY + 14,
-            PanelX + space::lg + space::md, btnY + 14, "Transfer to another device");
+                                                            "Transfer to another device");
         this->btnTransferText->SetFont(type::font(type::Body));
         this->btnTransferText->SetColor(color::TextSecondary);
         this->Add(this->btnTransferText);
 
         int btnY2 = btnY + BtnH + space::md;
-        this->btnReceiveBg = pu::ui::elm::Rectangle::New(
+        this->btnReceiveBg =
-            PanelX + space::lg, btnY2, BtnW, BtnH, color::BgSurface2, radius::md);
+            pu::ui::elm::Rectangle::New(PanelX + space::lg, btnY2, BtnW, BtnH, color::BgSurface2, radius::md);
         this->Add(this->btnReceiveBg);
-        this->btnReceiveText = pu::ui::elm::TextBlock::New(
+        this->btnReceiveText = pu::ui::elm::TextBlock::New(PanelX + space::lg + space::md, btnY2 + 14,
-            PanelX + space::lg + space::md, btnY2 + 14, "Receive from another device");
+                                                           "Receive from another device");
         this->btnReceiveText->SetFont(type::font(type::Body));
         this->btnReceiveText->SetColor(color::TextSecondary);
         this->Add(this->btnReceiveText);
 
         this->panelFooter = pu::ui::elm::TextBlock::New(
-            PanelX + space::lg,
+            PanelX + space::lg, ContentY + ContentH - space::lg - 18, "Save data only");
-            ContentY + ContentH - space::lg - 18,
-            "Save data only");
         this->panelFooter->SetFont(type::font(type::Caption));
         this->panelFooter->SetColor(color::TextMuted);
         this->Add(this->panelFooter);
 
-        this->emptyText = pu::ui::elm::TextBlock::New(
+        this->emptyText = pu::ui::elm::TextBlock::New(ListX + ListW / 2 - 280, ContentY + ContentH / 2 - 40,
-            ListX + ListW / 2 - 280, ContentY + ContentH / 2 - 40,
+                                                      "No save data on this profile");
-            "No save data on this profile");
         this->emptyText->SetFont(type::font(type::Display));
         this->emptyText->SetColor(color::TextPrimary);
         this->emptyText->SetVisible(false);
         this->Add(this->emptyText);
 
-        this->emptySub = pu::ui::elm::TextBlock::New(
+        this->emptySub = pu::ui::elm::TextBlock::New(ListX + ListW / 2 - 220, ContentY + ContentH / 2 + 16,
-            ListX + ListW / 2 - 220, ContentY + ContentH / 2 + 16,
+                                                     "Play something first, then come back.");
-            "Play something first, then come back.");
         this->emptySub->SetFont(type::font(type::Body));
         this->emptySub->SetColor(color::TextMuted);
         this->emptySub->SetVisible(false);
@@ -141,15 +135,16 @@ namespace ui {
         this->refreshButtons();
         this->updateHints();
 
-        this->header->SetUser(uid, Account::username(uid));
+        this->header->SetUser(uid, account::username(uid));
     }
 
     void TitlesLayout::refreshPanel() {
-        if (this->titlesMenu->GetItems().empty()) return;
+        if (this->titlesMenu->GetItems().empty())
+            return;
         int idx = this->titlesMenu->GetSelectedIndex();
         Title title;
         getTitle(title, this->current_uid, idx);
-        this->panelTitle->SetText(StringUtils::elide(title.name(), 24));
+        this->panelTitle->SetText(string_utils::elide(title.name(), 24));
     }
 
     void TitlesLayout::refreshButtons() {
@@ -219,7 +214,8 @@ namespace ui {
 
     void TitlesLayout::runReceive(int index, Title& title) {
         if (mainApp->transfer.startReceive((size_t)index, this->current_uid, title.name()) != 0) {
-            mainApp->CreateShowDialog("Receive", "Failed to start receiver.\nCheck network connection.", {"OK"}, true);
+            mainApp->CreateShowDialog("Receive", "Failed to start receiver.\nCheck network connection.",
+                                      {"OK"}, true);
             return;
         }
         auto ovl = TransferOverlay::New("Receiving save data...");
@@ -242,15 +238,20 @@ namespace ui {
         if (mainApp->transfer.isReceiveCancelled()) {
             mainApp->CreateShowDialog("Receive", "Transfer cancelled.", {"OK"}, true);
         } else if (mainApp->transfer.restoreSucceeded()) {
-            mainApp->CreateShowDialog("Receive", "Save data received and restored successfully!", {"OK"}, true);
+            mainApp->CreateShowDialog("Receive", "Save data received and restored successfully!", {"OK"},
+                                      true);
         } else {
-            mainApp->CreateShowDialog("Receive", "Restore failed:\n" + mainApp->transfer.restoreError(), {"OK"}, true);
+            mainApp->CreateShowDialog("Receive", "Restore failed:\n" + mainApp->transfer.restoreError(),
+                                      {"OK"}, true);
         }
     }
 
     void TitlesLayout::onInput(u64 Down, u64 Up, u64 Held, pu::ui::TouchPoint Pos) {
-        (void)Up; (void)Held; (void)Pos;
+        (void)Up;
-        if (m_inputLocked) return;
+        (void)Held;
+        (void)Pos;
+        if (m_inputLocked)
+            return;
 
         if (Down & HidNpadButton_Plus) {
             mainApp->transfer.cancelSend();
@@ -266,7 +267,8 @@ namespace ui {
                 return;
             }
             if (Down & HidNpadButton_A) {
-                if (this->titlesMenu->GetItems().empty()) return;
+                if (this->titlesMenu->GetItems().empty())
+                    return;
                 this->lockedListIndex = this->titlesMenu->GetSelectedIndex();
                 this->focus = TitlesFocus::Actions;
                 this->action = TitlesAction::Transfer;
@@ -284,10 +286,10 @@ namespace ui {
                 this->updateHints();
                 return;
             }
-            if (Down & (HidNpadButton_Up | HidNpadButton_Down |
+            if (Down &
-                       HidNpadButton_StickLUp | HidNpadButton_StickLDown)) {
+                (HidNpadButton_Up | HidNpadButton_Down | HidNpadButton_StickLUp | HidNpadButton_StickLDown)) {
-                this->action = (action == TitlesAction::Transfer)
+                this->action =
-                    ? TitlesAction::Receive : TitlesAction::Transfer;
+                    (action == TitlesAction::Transfer) ? TitlesAction::Receive : TitlesAction::Transfer;
                 this->refreshButtons();
                 return;
             }
@@ -307,4 +309,4 @@ namespace ui {
             }
         }
     }
-}
+}  // namespace ui

src/ui/users_layout.cpp

@@ -1,33 +1,27 @@
 #include <nxst/app/main_application.hpp>
 
 namespace ui {
-    extern MainApplication *mainApp;
+    extern MainApplication* mainApp;
 
     UsersLayout::UsersLayout() : Layout::Layout() {
         using namespace theme;
 
-        this->usersMenu = pu::ui::elm::Menu::New(
+        this->usersMenu = pu::ui::elm::Menu::New(0, layout::ContentTop + space::md, layout::ScreenW,
-            0, layout::ContentTop + space::md,
+                                                 color::BgBase, color::BgSurface2, 88, 6);
-            layout::ScreenW,
-            color::BgBase, color::BgSurface2,
-            88, 6);
         this->usersMenu->SetScrollbarColor(color::Primary);
         this->usersMenu->SetItemsFocusColor(color::BgSurface2);
 
-        for (AccountUid const& uid : Account::ids()) {
+        for (AccountUid const& uid : account::ids()) {
-            auto item = pu::ui::elm::MenuItem::New(Account::username(uid));
+            auto item = pu::ui::elm::MenuItem::New(account::username(uid));
             item->SetColor(color::TextPrimary);
             this->usersMenu->AddItem(item);
         }
 
-        this->loadingBg = pu::ui::elm::Rectangle::New(
+        this->loadingBg = pu::ui::elm::Rectangle::New(0, 0, layout::ScreenW, layout::ScreenH, color::Scrim);
-            0, 0, layout::ScreenW, layout::ScreenH, color::Scrim);
         this->loadingBg->SetVisible(false);
 
-        this->loadingText = pu::ui::elm::TextBlock::New(
+        this->loadingText = pu::ui::elm::TextBlock::New(layout::ScreenW / 2 - 120, layout::ScreenH / 2 - 12,
-            layout::ScreenW / 2 - 120,
+                                                        "Loading saves...");
-            layout::ScreenH / 2 - 12,
-            "Loading saves...");
         this->loadingText->SetFont(type::font(type::Body));
         this->loadingText->SetColor(color::TextSecondary);
         this->loadingText->SetVisible(false);
@@ -53,7 +47,7 @@ namespace ui {
         }
 
         if (Down & HidNpadButton_A) {
-            AccountUid uid = Account::ids().at(this->usersMenu->GetSelectedIndex());
+            AccountUid uid = account::ids().at(this->usersMenu->GetSelectedIndex());
 
             if (!areTitlesLoaded()) {
                 this->usersMenu->SetVisible(false);
@@ -72,4 +66,4 @@ namespace ui {
             mainApp->LoadLayout(mainApp->titles_layout);
         }
     }
-}
+}  // namespace ui