diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_id_utils.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_id_utils.hpp index 95bff84ce..32d2e9bf9 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_id_utils.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_id_utils.hpp @@ -32,6 +32,10 @@ namespace ams::ncm { ContentIdString GetContentIdString(ContentId id); void GetStringFromContentId(char *dst, size_t dst_size, ContentId id); + void GetStringFromRightsId(char *dst, size_t dst_size, fs::RightsId id); + + void GetTicketFileStringFromRightsId(char *dst, size_t dst_size, fs::RightsId id); + void GetCertificateFileStringFromRightsId(char *dst, size_t dst_size, fs::RightsId id); std::optional GetContentIdFromString(const char *str, size_t len); diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_package_install_task_base.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_package_install_task_base.hpp index e923ccf45..72580ae30 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_package_install_task_base.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_package_install_task_base.hpp @@ -27,6 +27,8 @@ namespace ams::ncm { void *buffer; size_t buffer_size; public: + PackageInstallTaskBase() : package_root() { /* ... */ } + Result Initialize(const char *package_path, void *buffer, size_t buffer_size, StorageId storage_id, InstallTaskDataBase *data, u32 config); protected: const char *GetPackageRootPath() { @@ -35,11 +37,11 @@ namespace ams::ncm { private: void CreateContentMetaPath(PackagePath *out_path, ContentId content_id); void CreateContentPath(PackagePath *out_path, ContentId content_id); - Result InstallTicket(const fs::RightsId &rights_id, ContentMetaType meta_type); void CreateTicketPath(PackagePath *out_path, fs::RightsId id); void CreateCertificatePath(PackagePath *out_path, fs::RightsId id); private: virtual Result OnWritePlaceHolder(const ContentMetaKey &key, InstallContentInfo *content_info) override; + virtual Result InstallTicket(const fs::RightsId &rights_id, ContentMetaType meta_type) override; }; }