Changelog: - re-enable use in release build. - remove ftpsrv and untitled from builtin ghdl options, as both packages are available in the appstore. - add image viewer (png, jpg, bmp) - add music player (bfstm, bfwav, mp3, wav, ogg) - add idv3 tag parsing support for mp3. - add "decyption" of GTA Vice City mp3. - add usbdvd support for music playback and file browsing. - add nsz export support (solid, block, ldm). - add xcz export support (same as above). - add nro fs proper mount support (romfs, nacp, icon). - add program nca fs support. - add bfsar fs support. - re-write the usb protocol, still wip. replaces tinfoil protocol. - all threads are now create with pre-emptive support with the proper affinity mask set. - fix oob crash in libpulsar when a bfwav was opened that had more than 2 channels. - bump yyjson version. - bump usbhsfs version. - disable nvjpg. - add support for theme music of any supported playback type (bfstm, bfwav, mp3, wav, ogg). - add support for setting background music. - add async exit to blocking threads (download, nxlink, ftpsrv) to reduce exit time. - add support for dumping to pc via usb. - add null, deflate, zstd hash options, mainly used for benchmarking. - add sidebar slider (currently unused). - file_viwer can now be used with any filesystem. - filebrowser will only ever stat file once. previously it would keep stat'ing until it succeeded. - disabled themezer due to the api breaking and i am not willing to keep maintaining it. - disable zlt handling in usbds as it's not needed for my api's because the size is always known. - remove usbds enums and GetSpeed() as i pr'd it to libnx. - added support for mounting nca's from any source, including files, memory, nsps, xcis etc. - split the lru cache into it's own header as it's now used in multiple places (nsz, all mounted options). - add support for fetching and decrypting es personalised tickets. - fix es common ticket converting where i forgot to also convert the cert chain as well. - remove the download default music option. - improve performance of libpulsar when opening a bfsar by remove the large setvbuf option. instead, use the default 1k buffer and handle large buffers manually in sphaira by using a lru cache (todo: just write my own bfsar parser). - during app init and exit, load times have been halved as i now load/exit async. timestamps have also been added to measure how long everything takes. - download now async loads / exits the etag json file to improve init times. - add custom zip io to dumper to support writing a zip to any dest (such as usb). - dumper now returns a proper error if the transfer was cancelled by the user. - fatfs mount now sets the timestamp for files. - fatfs mount handles folders with the archive bit by reporting them as a file. - ftpsrv config is async loaded to speed up load times. - nxlink now tries attempt to connect/accept by handling blocking rather than just bailing out. - added support for minini floats. - thread_file_transfer now spawns 3 threads rather than 2, to have the middle thread be a optional processor (mainly used for compressing/decompressing). - added spinner to progress box, taken from nvg demo. - progress box disables sleep mode on init. - add gamecard detection to game menu to detect a refresh. - handle xci that have the key area prepended. - change gamecard mount fs to use the xci mount code instead of native fs, that way we can see all the partitions rather than just secure. - reformat the ghdl entries to show the timestamp first. - support for exporting saves to pc via usb. - zip fs now uses lru cache.
117 lines
3.4 KiB
C++
117 lines
3.4 KiB
C++
#pragma once
|
|
|
|
#include "ui/widget.hpp"
|
|
#include "ui/scrolling_text.hpp"
|
|
#include "fs.hpp"
|
|
#include <functional>
|
|
#include <span>
|
|
|
|
namespace sphaira::ui {
|
|
|
|
struct ProgressBox;
|
|
using ProgressBoxCallback = std::function<Result(ProgressBox*)>;
|
|
using ProgressBoxDoneCallback = std::function<void(Result rc)>;
|
|
|
|
struct ProgressBox final : Widget {
|
|
ProgressBox(
|
|
int image,
|
|
const std::string& action,
|
|
const std::string& title,
|
|
const ProgressBoxCallback& callback, const ProgressBoxDoneCallback& done = nullptr
|
|
);
|
|
~ProgressBox();
|
|
|
|
auto Update(Controller* controller, TouchInfo* touch) -> void override;
|
|
auto Draw(NVGcontext* vg, Theme* theme) -> void override;
|
|
|
|
auto SetActionName(const std::string& action) -> ProgressBox&;
|
|
auto SetTitle(const std::string& title) -> ProgressBox&;
|
|
auto NewTransfer(const std::string& transfer) -> ProgressBox&;
|
|
// zeros the saved offset.
|
|
auto ResetTranfser() -> ProgressBox&;
|
|
auto UpdateTransfer(s64 offset, s64 size) -> ProgressBox&;
|
|
// not const in order to avoid copy by using std::swap
|
|
auto SetImage(int image) -> ProgressBox&;
|
|
auto SetImageData(std::vector<u8>& data) -> ProgressBox&;
|
|
auto SetImageDataConst(std::span<const u8> data) -> ProgressBox&;
|
|
|
|
void RequestExit();
|
|
auto ShouldExit() -> bool;
|
|
auto ShouldExitResult() -> Result;
|
|
|
|
// helper functions
|
|
auto CopyFile(fs::Fs* fs_src, fs::Fs* fs_dst, const fs::FsPath& src, const fs::FsPath& dst, bool single_threaded = false) -> Result;
|
|
auto CopyFile(fs::Fs* fs, const fs::FsPath& src, const fs::FsPath& dst, bool single_threaded = false) -> Result;
|
|
auto CopyFile(const fs::FsPath& src, const fs::FsPath& dst, bool single_threaded = false) -> Result;
|
|
void Yield();
|
|
|
|
auto OnDownloadProgressCallback() {
|
|
return [this](s64 dltotal, s64 dlnow, s64 ultotal, s64 ulnow){
|
|
if (this->ShouldExit()) {
|
|
return false;
|
|
}
|
|
|
|
if (dltotal) {
|
|
this->UpdateTransfer(dlnow, dltotal);
|
|
} else {
|
|
this->UpdateTransfer(ulnow, ultotal);
|
|
}
|
|
|
|
return true;
|
|
};
|
|
}
|
|
|
|
// auto-clear = false
|
|
auto GetCancelEvent() {
|
|
return &m_uevent;
|
|
}
|
|
|
|
private:
|
|
void FreeImage();
|
|
|
|
public:
|
|
struct ThreadData {
|
|
ProgressBox* pbox{};
|
|
ProgressBoxCallback callback{};
|
|
Result result{};
|
|
};
|
|
|
|
private:
|
|
UEvent m_uevent{};
|
|
Mutex m_mutex{};
|
|
Thread m_thread{};
|
|
ThreadData m_thread_data{};
|
|
ProgressBoxDoneCallback m_done{};
|
|
|
|
// shared data start.
|
|
std::string m_action{};
|
|
std::string m_title{};
|
|
std::string m_transfer{};
|
|
s64 m_size{};
|
|
s64 m_offset{};
|
|
s64 m_last_offset{};
|
|
s64 m_speed{};
|
|
TimeStamp m_timestamp{};
|
|
std::vector<u8> m_image_data{};
|
|
int m_image_pending{};
|
|
bool m_is_image_pending{};
|
|
// shared data end.
|
|
|
|
ScrollingText m_scroll_title{};
|
|
ScrollingText m_scroll_transfer{};
|
|
|
|
int m_image{};
|
|
bool m_own_image{};
|
|
};
|
|
|
|
// this is a helper function that does many things.
|
|
// 1. creates a progress box, pushes that box to app
|
|
// 2. creates a thread and passes the pbox and callback to that thread
|
|
// 3. that thread calls the callback.
|
|
|
|
// this allows for blocking processes to run on a seperate thread whilst
|
|
// updating the ui with the progress of the operation.
|
|
// the callback should poll ShouldExit() whether to keep running
|
|
|
|
} // namespace sphaira::ui {
|