mirror of
https://github.com/Atmosphere-NX/Atmosphere
synced 2024-12-26 22:51:12 +00:00
c7026b9094
* Implement NCM * Modernize ncm_main * Remove unnecessary smExit * Give access to svcCallSecureMonitor * Stack size bump * Fix incorrect setup for NandUser's content storage entry * Fix a potential data abort when flushing the placeholder accessor cache * Fix HasFile and HasDirectory * Use r+b, not w+b * Misc fixes * errno begone * Fixed more stdio error handling * More main fixes * Various command improvements * Make dispatch tables great again * Fix logic inversion * Fixed content path generation * Bump heap size, fix CleanupAllPlaceHolder * Various fixes. Note: This contains debug stuff which will be removed later. I was getting tired of having to cherrypick tiny changes * Fixed placeholder/content deletion * Fixed incorrect content manager destruction * Prevent automatic placeholder creation on open * Fixed List implementation. Also lots of debug logging. * Removed debug code * Added a scope guard for WritePlaceHolder * Manually prevent placeholder/content appending * Revert "Removed debug code" This reverts commitd6ff261fcc
. * Always cache placeholder file. Switch to ftell for preventing appending * Universally use EnsureEnabled * Abstract away file writing logic * Misc cleanup * Refactor placeholder cacheing * Remove debug code (again) * Revert "Remove debug code (again)" This reverts commit168447d80e
. * Misc changes * Fixed file modes * Fixed ContentId/PlaceHolderId alignment * Improved type safety * Fixed reinitialization * Fixed doubleup on path creation * Remove debug code * Fixed 1.0.0 booting * Correct amount of add on content * Correct main thread stack size * lr: Introducing registered data * Reorder stratosphere Makefile * Move results to libstrat * lr: Cleanup lr_redirection * lr: lr_manager tweaks * lr: Imrpoved path handling and adjust ResolveAddOnContentPath order * lr: Organise types * Add eof newlines * lr: Eliminate unnecessary vars * lr: Unnecessary vars 2 electric boogaloo * lr: Various helpers * lr: RegisteredLocationResolver helpers * ncm: Move ncm_types to libstrat * ncm: Misc cleanup * Implement NCM * Modernize ncm_main * Remove unnecessary smExit * Give access to svcCallSecureMonitor * Stack size bump * Fix incorrect setup for NandUser's content storage entry * Fix a potential data abort when flushing the placeholder accessor cache * Fix HasFile and HasDirectory * Use r+b, not w+b * Misc fixes * errno begone * Fixed more stdio error handling * More main fixes * Various command improvements * Make dispatch tables great again * Fix logic inversion * Fixed content path generation * Bump heap size, fix CleanupAllPlaceHolder * Various fixes. Note: This contains debug stuff which will be removed later. I was getting tired of having to cherrypick tiny changes * Fixed placeholder/content deletion * Fixed incorrect content manager destruction * Prevent automatic placeholder creation on open * Fixed List implementation. Also lots of debug logging. * Removed debug code * Added a scope guard for WritePlaceHolder * Manually prevent placeholder/content appending * Revert "Removed debug code" This reverts commitd6ff261fcc
. * Always cache placeholder file. Switch to ftell for preventing appending * Universally use EnsureEnabled * Abstract away file writing logic * Misc cleanup * Refactor placeholder cacheing * Remove debug code (again) * Revert "Remove debug code (again)" This reverts commit168447d80e
. * Misc changes * Fixed file modes * Fixed ContentId/PlaceHolderId alignment * Improved type safety * Fixed reinitialization * Fixed doubleup on path creation * Remove debug code * Fixed 1.0.0 booting * Correct amount of add on content * Correct main thread stack size * lr: Introducing registered data * Reorder stratosphere Makefile * Move results to libstrat * lr: Cleanup lr_redirection * lr: lr_manager tweaks * lr: Imrpoved path handling and adjust ResolveAddOnContentPath order * lr: Organise types * Add eof newlines * lr: Eliminate unnecessary vars * lr: Unnecessary vars 2 electric boogaloo * lr: Various helpers * lr: RegisteredLocationResolver helpers * ncm: Move ncm_types to libstrat * ncm: Misc cleanup * Updated AddOnContentLocationResolver and RegisteredLocationResolver to 9.0.0 * Finished updating lr to 9.0.0 * Updated NCM to 9.0.0 * Fix libstrat includes * Fixed application launching * title_id_2 -> owner_tid * Updated to new-ipc * Change to using pure virtuals * Title Id -> Program Id * Fixed compilation against master * std::scoped_lock<> -> std::scoped_lock * Adopted R_UNLESS and R_CONVERT * Prefix namespace to Results * Adopt std::numeric_limits * Fixed incorrect error handling in ReadFile * Adopted AMS_ABORT_UNLESS * Adopt util::GenerateUuid() * Syntax improvements * ncm_types: Address review * Address more review comments * Updated copyrights * Address more feedback * More feedback addressed * More changes * Move dispatch tables out of interface files * Addressed remaining comments * lr: move into libstratosphere * ncm: Fix logic inversion * lr: Add comments * lr: Remove whitespace * ncm: Start addressing feedback * ncm: Cleanup InitializeContentManager * lr: support client-side usage * lr_service -> lr_api * ncm: Begin refactoring content manager * ncm: More content manager improvements * ncm: Content manager mount improvements * ldr: use lr bindings * lr bindings usage: minor fixes * ncm/lr: Pointer placement * ncm: placeholder accessor cleanup * ncm: minor fixes * ncm: refactor rights cache * ncm: content meta database cleanup * ncm: move content meta database impl out of interface file * ncm: Use const ContentMetaKey & * ncm: fix other non-const ContentMetaKey references * ncm: content meta database cleanup * ncm: content storage fixes for 2.0.0 * ncm: add missing end of file newlines * ncm: implement ContentMetaReader * ncm: client-side api * ncm: trim trailing spaces * ncm: FS_MAX_PATH-1 -> fs::EntryNameLengthMax * ncm: Use PathString and Path * fs: implement accessor wrappers for ncm * fs: implement user fs wrappers * fs: add MountSdCard * ncm: move to content manager impl * ncm: fix up main * kvdb: use fs:: * fs: Add wrappers needed for ncm * ncm: use fs bindings, other refactoring * ncm: minor fixes * fsa: fix ReadFile without size output * fs: add substorage, rom path tool * ncm: fix dangling fsdev usage * fs: fix bug in Commit * fs: fixed incorrect mode check * fs: implement Mount(System)Data * ncm: don't delete hos * results: add R_SUCCEED_IF * ams-except-ncm: use R_SUCCEED_IF * ncm: added comments * ncm: fix api definitions * ncm: use R_SUCCEED_IF * pm: think of the savings * ncm: employ kernel strats * ncm: Nintendo has 5 MiB of heap. Give ourselves 4 to be safe, pending analysis * ncm: refactor IDs, split types header into many headers * ams.mitm: use fs bindings instead of stdio * fs: SystemData uses SystemDataId * ncm: improve meta-db accuracy * ncm: inline getlatestkey * fs: improve UnsupportedOperation results * fs: modernize mount utils * ams: misc fixes for merge-errors * fs: improve unsupportedoperation results * git subrepo pull emummc subrepo: subdir: "emummc" merged: "d12dd546" upstream: origin: "https://github.com/m4xw/emuMMC" branch: "develop" commit: "d12dd546" git-subrepo: version: "0.4.1" origin: "???" commit: "???" * util: add boundedmap * ncm: minor style fixes * ncm: don't unmount if mounting fails * lr: bug fixes * ncm: implement ncm.for-initialize + ncm.for-safemode * lr: ncm::ProgramId::Invalid -> ncm::InvalidProgramId * ncm: fix open directory mode on 1.0.0 * ncm: fix fs use, implement more of < 4.0.0 for-initialize/safemode * ncm: implement packagedcontent -> content for building metadb * ncm: fix save data flag management * ncm: address some review suggestions (thanks @leoetlino!) * updater: use fs bindings * fs: implement MountCode * fs: prefer make_unique to operator new * ncm: implement remaining ContentMetaDatabaseBuilder functionality Co-authored-by: Michael Scire <SciresM@gmail.com>
194 lines
9.3 KiB
C++
194 lines
9.3 KiB
C++
/*
|
|
* Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope 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/>.
|
|
*/
|
|
#pragma once
|
|
#include <stratosphere/ncm/ncm_i_content_meta_database.hpp>
|
|
|
|
namespace ams::ncm {
|
|
|
|
class ContentMetaDatabase {
|
|
NON_COPYABLE(ContentMetaDatabase);
|
|
public:
|
|
struct ListCount {
|
|
s32 written;
|
|
s32 total;
|
|
};
|
|
private:
|
|
std::shared_ptr<IContentMetaDatabase> interface;
|
|
public:
|
|
ContentMetaDatabase() { /* ... */ }
|
|
explicit ContentMetaDatabase(std::shared_ptr<IContentMetaDatabase> intf) : interface(std::move(intf)) { /* ... */ }
|
|
|
|
ContentMetaDatabase(ContentMetaDatabase &&rhs) {
|
|
this->interface = std::move(rhs.interface);
|
|
}
|
|
|
|
ContentMetaDatabase &operator=(ContentMetaDatabase &&rhs) {
|
|
ContentMetaDatabase(std::move(rhs)).Swap(*this);
|
|
return *this;
|
|
}
|
|
|
|
void Swap(ContentMetaDatabase &rhs) {
|
|
std::swap(this->interface, rhs.interface);
|
|
}
|
|
public:
|
|
Result Set(const ContentMetaKey &key, const void *buf, size_t size) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->Set(key, sf::InBuffer(buf, size));
|
|
}
|
|
|
|
Result Get(size_t *out_size, void *dst, size_t dst_size, const ContentMetaKey &key) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
u64 size;
|
|
R_TRY(this->interface->Get(std::addressof(size), key, sf::OutBuffer(dst, dst_size)));
|
|
|
|
*out_size = size;
|
|
return ResultSuccess();
|
|
}
|
|
|
|
#define AMS_NCM_DEFINE_GETTERS(Kind, IdType) \
|
|
Result Get##Kind(ContentId *out, IdType##Id id, u32 version) { \
|
|
return this->interface->GetContentIdByType(out, ContentMetaKey::MakeUnknownType(id.value, version), ContentType::Kind); \
|
|
} \
|
|
\
|
|
Result GetLatest##Kind(ContentId *out, IdType##Id id) { \
|
|
ContentMetaKey latest_key; \
|
|
R_TRY(this->interface->GetLatestContentMetaKey(std::addressof(latest_key), id.value)); \
|
|
return this->interface->GetContentIdByType(out, latest_key, ContentType::Kind); \
|
|
}
|
|
|
|
AMS_NCM_DEFINE_GETTERS(Program, Program)
|
|
AMS_NCM_DEFINE_GETTERS(Data, Data)
|
|
AMS_NCM_DEFINE_GETTERS(Control, Application)
|
|
AMS_NCM_DEFINE_GETTERS(HtmlDocument, Application)
|
|
AMS_NCM_DEFINE_GETTERS(LegalInformation, Application)
|
|
|
|
#undef AMS_NCM_DEFINE_GETTERS
|
|
|
|
Result Remove(const ContentMetaKey &key) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->Remove(key);
|
|
}
|
|
|
|
Result Remove(SystemProgramId id, u32 version) {
|
|
return this->Remove(ContentMetaKey::Make(id, version));
|
|
}
|
|
|
|
Result Remove(SystemDataId id, u32 version) {
|
|
return this->Remove(ContentMetaKey::Make(id, version));
|
|
}
|
|
|
|
Result Remove(ApplicationId id, u32 version) {
|
|
return this->Remove(ContentMetaKey::Make(id, version));
|
|
}
|
|
|
|
Result GetContentIdByType(ContentId *out_content_id, const ContentMetaKey &key, ContentType type) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->GetContentIdByType(out_content_id, key, type);
|
|
}
|
|
|
|
Result GetContentIdByTypeAndIdOffset(ContentId *out_content_id, const ContentMetaKey &key, ContentType type, u8 id_offset) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->GetContentIdByTypeAndIdOffset(out_content_id, key, type, id_offset);
|
|
}
|
|
|
|
ListCount ListApplication(ApplicationContentMetaKey *dst, size_t dst_size) {
|
|
ListCount lc = {};
|
|
R_ABORT_UNLESS(this->interface->ListApplication(std::addressof(lc.total), std::addressof(lc.written), sf::OutArray<ApplicationContentMetaKey>(dst, dst_size), ContentMetaType::Unknown));
|
|
return lc;
|
|
}
|
|
|
|
ListCount ListContentMeta(ContentMetaKey *dst, size_t dst_size, ContentMetaType type = ContentMetaType::Unknown, ApplicationId app_id = InvalidApplicationId, u64 min = std::numeric_limits<u64>::min(), u64 max = std::numeric_limits<u64>::max(), ContentInstallType install_type = ContentInstallType::Full) {
|
|
ListCount lc = {};
|
|
R_ABORT_UNLESS(this->interface->List(std::addressof(lc.total), std::addressof(lc.written), sf::OutArray<ContentMetaKey>(dst, dst_size), type, app_id, min, max, install_type));
|
|
return lc;
|
|
}
|
|
|
|
Result GetLatest(ContentMetaKey *out_key, u64 id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->GetLatestContentMetaKey(out_key, id);
|
|
}
|
|
|
|
Result ListContentInfo(s32 *out_count, ContentInfo *dst, size_t dst_size, const ContentMetaKey &key, s32 offset) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->ListContentInfo(out_count, sf::OutArray<ContentInfo>(dst, dst_size), key, offset);
|
|
}
|
|
|
|
Result ListContentMetaInfo(s32 *out_count, ContentMetaInfo *dst, size_t dst_size, const ContentMetaKey &key, s32 offset) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->ListContentMetaInfo(out_count, sf::OutArray<ContentMetaInfo>(dst, dst_size), key, offset);
|
|
}
|
|
|
|
Result Has(bool *out, const ContentMetaKey &key) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->Has(out, key);
|
|
}
|
|
|
|
Result HasAll(bool *out, const ContentMetaKey *keys, size_t num_keys) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->HasAll(out, sf::InArray<ContentMetaKey>(keys, num_keys));
|
|
}
|
|
|
|
Result HasContent(bool *out, const ContentMetaKey &key, const ContentId &content_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->HasContent(out, key, content_id);
|
|
}
|
|
|
|
Result GetSize(size_t *out_size, const ContentMetaKey &key) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
u64 size;
|
|
R_TRY(this->interface->GetSize(std::addressof(size), key));
|
|
|
|
*out_size = size;
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result GetRequiredSystemVersion(u32 *out_version, const ContentMetaKey &key) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->GetRequiredSystemVersion(out_version, key);
|
|
}
|
|
|
|
Result GetPatchId(PatchId *out_patch_id, const ContentMetaKey &key) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->GetPatchId(out_patch_id, key);
|
|
}
|
|
|
|
Result DisableForcibly() {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->DisableForcibly();
|
|
}
|
|
|
|
Result LookupOrphanContent(bool *out_orphaned, ContentId *content_list, size_t count) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->LookupOrphanContent(sf::OutArray<bool>(out_orphaned, count), sf::InArray<ContentId>(content_list, count));
|
|
}
|
|
|
|
Result Commit() {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->Commit();
|
|
}
|
|
|
|
Result GetAttributes(u8 *out_attributes, const ContentMetaKey &key) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->GetAttributes(out_attributes, key);
|
|
}
|
|
|
|
Result GetRequiredApplicationVersion(u32 *out_version, const ContentMetaKey &key) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->GetRequiredApplicationVersion(out_version, key);
|
|
}
|
|
};
|
|
|
|
}
|