another stage of refactoring

include/nxst/infra/fs/directory.hpp

@@ -1,55 +1,32 @@
-/*
- *   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.
- */
-
+// Copyright (C) 2024-2026 NXST contributors
 #pragma once
-#include <dirent.h>
-#include <errno.h>
 #include <string>
 #include <vector>
 
 #include <switch.h>
 
-struct DirectoryEntry {
-    std::string name;
-    bool directory;
-};
-
 class Directory {
   public:
-    Directory(const std::string& root);
-    ~Directory() = default;
+    explicit Directory(const std::string& path);
 
-    Result error(void);
-    std::string entry(size_t index);
-    bool folder(size_t index);
-    bool good(void);
-    size_t size(void);
+    bool good() const {
+        return m_good;
+    }
+    Result error() const {
+        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:
-    std::vector<struct DirectoryEntry> mList;
-    Result mError;
-    bool mGood;
+    struct Entry {
+        std::string name;
+        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 @@
-/*
- *   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.
- */
-
+// Copyright (C) 2024-2026 NXST contributors
 #pragma once
 #include <switch.h>
 
-#include <nxst/domain/account.hpp>
-
 namespace FileSystem {
-Result mount(FsFileSystem* fileSystem, u64 titleID, AccountUid userID);
-int mount(FsFileSystem fs);
-void unmount(void);
+    Result mount(FsFileSystem* fs, u64 title_id, AccountUid uid);
+    int mount(FsFileSystem fs);
+    void unmount();
 }  // namespace FileSystem

include/nxst/infra/fs/handles.hpp

@@ -5,67 +5,67 @@
 
 namespace nxst {
 
-// RAII wrapper for FsFileSystem — auto-closes on destruction.
-struct FsFileSystemHandle {
-    FsFileSystem fs{};
-    bool valid{false};
+    // RAII wrapper for FsFileSystem — auto-closes on destruction.
+    struct FsFileSystemHandle {
+        FsFileSystem fs{};
+        bool valid{false};
 
-    FsFileSystemHandle() = default;
-    ~FsFileSystemHandle() {
-        if (valid)
-            fsFsClose(&fs);
-    }  // NOLINT(modernize-use-equals-default)
+        FsFileSystemHandle() = default;
+        ~FsFileSystemHandle() {
+            if (valid)
+                fsFsClose(&fs);
+        }  // NOLINT(modernize-use-equals-default)
 
-    FsFileSystemHandle(const FsFileSystemHandle&) = delete;
-    FsFileSystemHandle& operator=(const FsFileSystemHandle&) = delete;
+        FsFileSystemHandle(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.
-struct FileHandle {
-    FILE* ptr{nullptr};
+    // RAII wrapper for FILE* — auto-fclose on destruction.
+    struct FileHandle {
+        FILE* ptr{nullptr};
 
-    explicit FileHandle(FILE* file) : ptr(file) {}
-    ~FileHandle() {
-        if (ptr != nullptr)
-            fclose(ptr);
-    }  // NOLINT(modernize-use-equals-default)
+        explicit FileHandle(FILE* file) : ptr(file) {}
+        ~FileHandle() {
+            if (ptr != nullptr)
+                fclose(ptr);
+        }  // NOLINT(modernize-use-equals-default)
 
-    FileHandle(const FileHandle&) = delete;
-    FileHandle& operator=(const FileHandle&) = delete;
+        FileHandle(const FileHandle&) = delete;
+        FileHandle& operator=(const FileHandle&) = delete;
 
-    explicit operator bool() const {
-        return ptr != nullptr;
-    }
-    FILE* get() const {
-        return ptr;
-    }
-};
+        explicit operator bool() const {
+            return ptr != nullptr;
+        }
+        FILE* get() const {
+            return ptr;
+        }
+    };
 
-// RAII wrapper for AccountProfile — auto-closes on destruction.
-struct AccountProfileHandle {
-    AccountProfile profile{};
-    bool valid{false};
+    // 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() = default;
+        ~AccountProfileHandle() {
+            if (valid)
+                accountProfileClose(&profile);
+        }  // NOLINT(modernize-use-equals-default)
 
-    AccountProfileHandle(const AccountProfileHandle&) = delete;
-    AccountProfileHandle& operator=(const AccountProfileHandle&) = delete;
+        AccountProfileHandle(const AccountProfileHandle&) = delete;
+        AccountProfileHandle& operator=(const AccountProfileHandle&) = delete;
 
-    AccountProfile* get() {
-        return &profile;
-    }
-};
+        AccountProfile* get() {
+            return &profile;
+        }
+    };
 
 }  // namespace nxst

include/nxst/infra/fs/io.hpp

@@ -1,53 +1,19 @@
-/*
- *   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.
- */
-
+// Copyright (C) 2024-2026 NXST contributors
 #pragma once
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
+#include <string>
 
 #include <switch.h>
 
-#include <nxst/domain/account.hpp>
 #include <nxst/domain/result.hpp>
-#include <nxst/domain/title.hpp>
-#include <nxst/domain/util.hpp>
-#include <nxst/infra/fs/directory.hpp>
-
-#define BUFFER_SIZE 0x80000
 
 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> backup(size_t index, AccountUid uid);
+    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);
-void copyFile(const std::string& srcPath, const std::string& dstPath);
-Result createDirectory(const std::string& path);
-Result deleteFolderRecursively(const std::string& path);
-bool directoryExists(const std::string& path);
-bool fileExists(const std::string& path);
+    Result copyDirectory(const std::string& src, const std::string& dst);
+    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 fileExists(const std::string& path);
 }  // namespace io

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,59 +1,15 @@
 #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 debug(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 error(const char* fmt, ...) __attribute__((format(printf, 1, 2)));
+    void write(Level level, const char* fmt, ...) __attribute__((format(printf, 2, 3)));
+    void debug(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 error(const char* fmt, ...) __attribute__((format(printf, 1, 2)));
 
-// No-op: writes are immediate. Kept for source compatibility during migration.
-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)
-};
+}  // namespace nxst::log