add mtp install, fix es ticket being the wrong size, fix yati not returning the read fail result, updated haze, updated translations

see #132

sphaira/include/defines.hpp

@@ -581,6 +581,7 @@ enum class SphairaResult : Result {
     EsPersonalisedTicketDeviceIdMissmatch,
     EsFailedDecryptPersonalisedTicket,
     EsBadDecryptedPersonalisedTicketSize,
+    EsBadTicketSize,
 
     OwoBadArgs,
 
@@ -717,6 +718,7 @@ enum : Result {
     MAKE_SPHAIRA_RESULT_ENUM(EsPersonalisedTicketDeviceIdMissmatch),
     MAKE_SPHAIRA_RESULT_ENUM(EsFailedDecryptPersonalisedTicket),
     MAKE_SPHAIRA_RESULT_ENUM(EsBadDecryptedPersonalisedTicketSize),
+    MAKE_SPHAIRA_RESULT_ENUM(EsBadTicketSize),
     MAKE_SPHAIRA_RESULT_ENUM(OwoBadArgs),
     MAKE_SPHAIRA_RESULT_ENUM(UsbCancelled),
     MAKE_SPHAIRA_RESULT_ENUM(UsbBadMagic),
@@ -803,4 +805,6 @@ enum : Result {
 #define THREAD_AFFINITY_ALL (THREAD_AFFINITY_CORE0|THREAD_AFFINITY_CORE1|THREAD_AFFINITY_CORE2)
 
 // mutex helpers.
-#define SCOPED_MUTEX(mutex) mutexLock(mutex); ON_SCOPE_EXIT(mutexUnlock(mutex))
+#define SCOPED_MUTEX(mutex) \
+    mutexLock(mutex); \
+    ON_SCOPE_EXIT(mutexUnlock(mutex))

sphaira/include/ftpsrv_helper.hpp

@@ -7,11 +7,11 @@ namespace sphaira::ftpsrv {
 bool Init();
 void Exit();
 
-using OnInstallStart = std::function<bool(void* user, const char* path)>;
-using OnInstallWrite = std::function<bool(void* user, const void* buf, size_t size)>;
-using OnInstallClose = std::function<void(void* user)>;
+using OnInstallStart = std::function<bool(const char* path)>;
+using OnInstallWrite = std::function<bool(const void* buf, size_t size)>;
+using OnInstallClose = std::function<void()>;
 
-void InitInstallMode(void* user, OnInstallStart on_start, OnInstallWrite on_write, OnInstallClose on_close);
+void InitInstallMode(OnInstallStart on_start, OnInstallWrite on_write, OnInstallClose on_close);
 void DisableInstallMode();
 
 unsigned GetPort();

sphaira/include/haze_helper.hpp

@@ -7,11 +7,11 @@ namespace sphaira::haze {
 bool Init();
 void Exit();
 
-using OnInstallStart = std::function<bool(void* user, const char* path)>;
-using OnInstallWrite = std::function<bool(void* user, const void* buf, size_t size)>;
-using OnInstallClose = std::function<void(void* user)>;
+using OnInstallStart = std::function<bool(const char* path)>;
+using OnInstallWrite = std::function<bool(const void* buf, size_t size)>;
+using OnInstallClose = std::function<void()>;
 
-void InitInstallMode(void* user, OnInstallStart on_start, OnInstallWrite on_write, OnInstallClose on_close);
+void InitInstallMode(OnInstallStart on_start, OnInstallWrite on_write, OnInstallClose on_close);
 void DisableInstallMode();
 
 } // namespace sphaira::haze

sphaira/include/ui/menus/ftp_menu.hpp

@@ -1,56 +1,20 @@
 #pragma once
 
 #include "ui/menus/menu_base.hpp"
-#include "yati/source/stream.hpp"
+#include "ui/menus/install_stream_menu_base.hpp"
 
 namespace sphaira::ui::menu::ftp {
 
-enum class State {
-    // not connected.
-    None,
-    // just connected, starts the transfer.
-    Connected,
-    // set whilst transfer is in progress.
-    Progress,
-    // set when the transfer is finished.
-    Done,
-    // failed to connect.
-    Failed,
-};
-
-struct StreamFtp final : yati::source::Stream {
-    StreamFtp(const fs::FsPath& path, std::stop_token token);
-
-    Result ReadChunk(void* buf, s64 size, u64* bytes_read) override;
-    bool Push(const void* buf, s64 size);
-    void Disable();
-
-// private:
-    fs::FsPath m_path{};
-    std::stop_token m_token{};
-    std::vector<u8> m_buffer{};
-    Mutex m_mutex{};
-    bool m_active{};
-    // bool m_push_exit{};
-};
-
-struct Menu final : MenuBase {
+struct Menu final : stream::Menu {
     Menu(u32 flags);
     ~Menu();
 
     auto GetShortTitle() const -> const char* override { return "FTP"; };
     void Update(Controller* controller, TouchInfo* touch) override;
     void Draw(NVGcontext* vg, Theme* theme) override;
-    void OnFocusGained() override;
-
-// this should be private
-// private:
-    std::shared_ptr<StreamFtp> m_source{};
-    Thread m_thread{};
-    Mutex m_mutex{};
-    // the below are shared across threads, lock with the above mutex!
-    State m_state{State::None};
+    void OnDisableInstallMode() override;
 
+private:
     const char* m_user{};
     const char* m_pass{};
     unsigned m_port{};

sphaira/include/ui/menus/install_stream_menu_base.hpp

@@ -0,0 +1,62 @@
+#pragma once
+
+#include "ui/menus/menu_base.hpp"
+#include "yati/source/stream.hpp"
+
+namespace sphaira::ui::menu::stream {
+
+enum class State {
+    // not connected.
+    None,
+    // just connected, starts the transfer.
+    Connected,
+    // set whilst transfer is in progress.
+    Progress,
+    // set when the transfer is finished.
+    Done,
+    // failed to connect.
+    Failed,
+};
+
+using OnInstallStart = std::function<bool(const char* path)>;
+using OnInstallWrite = std::function<bool(const void* buf, size_t size)>;
+using OnInstallClose = std::function<void()>;
+
+struct Stream final : yati::source::Stream {
+    Stream(const fs::FsPath& path, std::stop_token token);
+
+    Result ReadChunk(void* buf, s64 size, u64* bytes_read) override;
+    bool Push(const void* buf, s64 size);
+    void Disable();
+    auto& GetPath() const { return m_path; }
+
+private:
+    fs::FsPath m_path{};
+    std::stop_token m_token{};
+    std::vector<u8> m_buffer{};
+    Mutex m_mutex{};
+    CondVar m_can_read{};
+    bool m_active{};
+};
+
+struct Menu : MenuBase {
+    Menu(const std::string& title, u32 flags);
+    virtual ~Menu();
+
+    virtual void Update(Controller* controller, TouchInfo* touch);
+    virtual void Draw(NVGcontext* vg, Theme* theme);
+    virtual void OnDisableInstallMode() = 0;
+
+protected:
+    bool OnInstallStart(const char* path);
+    bool OnInstallWrite(const void* buf, size_t size);
+    void OnInstallClose();
+
+private:
+    std::shared_ptr<Stream> m_source{};
+    Thread m_thread{};
+    Mutex m_mutex{};
+    State m_state{State::None};
+};
+
+} // namespace sphaira::ui::menu::stream

sphaira/include/ui/menus/mtp_menu.hpp

@@ -1,56 +1,18 @@
 #pragma once
 
-#include "ui/menus/menu_base.hpp"
-#include "yati/source/stream.hpp"
+#include "ui/menus/install_stream_menu_base.hpp"
 
 namespace sphaira::ui::menu::mtp {
 
-enum class State {
-    // not connected.
-    None,
-    // just connected, starts the transfer.
-    Connected,
-    // set whilst transfer is in progress.
-    Progress,
-    // set when the transfer is finished.
-    Done,
-    // failed to connect.
-    Failed,
-};
-
-struct StreamFtp final : yati::source::Stream {
-    StreamFtp(const fs::FsPath& path, std::stop_token token);
-
-    Result ReadChunk(void* buf, s64 size, u64* bytes_read) override;
-    bool Push(const void* buf, s64 size);
-    void Disable();
-
-// private:
-    fs::FsPath m_path{};
-    std::stop_token m_token{};
-    std::vector<u8> m_buffer{};
-    Mutex m_mutex{};
-    bool m_active{};
-    // bool m_push_exit{};
-};
-
-struct Menu final : MenuBase {
+struct Menu final : stream::Menu {
     Menu(u32 flags);
     ~Menu();
 
     auto GetShortTitle() const -> const char* override { return "MTP"; };
     void Update(Controller* controller, TouchInfo* touch) override;
-    void Draw(NVGcontext* vg, Theme* theme) override;
-    void OnFocusGained() override;
-
-// this should be private
-// private:
-    std::shared_ptr<StreamFtp> m_source{};
-    Thread m_thread{};
-    Mutex m_mutex{};
-    // the below are shared across threads, lock with the above mutex!
-    State m_state{State::None};
+    void OnDisableInstallMode() override;
 
+private:
     bool m_was_mtp_enabled{};
 };
 

sphaira/include/yati/nx/es.hpp

@@ -53,9 +53,8 @@ struct TicketData {
     FsRightsId rights_id;
     u32 account_id;
     u8 _0x174[0xC];
-    u8 _0x180[0x140];
 };
-static_assert(sizeof(TicketData) == 0x2C0);
+static_assert(sizeof(TicketData) == 0x180);
 
 struct EticketRsaDeviceKey {
     u8 ctr[AES_128_KEY_SIZE];