mirror of
https://github.com/Atmosphere-NX/Atmosphere
synced 2024-11-14 00:56:35 +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>
200 lines
8.7 KiB
C++
200 lines
8.7 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_storage.hpp>
|
|
|
|
namespace ams::ncm {
|
|
|
|
class ContentStorage {
|
|
NON_COPYABLE(ContentStorage);
|
|
private:
|
|
std::shared_ptr<IContentStorage> interface;
|
|
public:
|
|
ContentStorage() { /* ... */ }
|
|
explicit ContentStorage(std::shared_ptr<IContentStorage> intf) : interface(std::move(intf)) { /* ... */ }
|
|
|
|
ContentStorage(ContentStorage &&rhs) {
|
|
this->interface = std::move(rhs.interface);
|
|
}
|
|
|
|
ContentStorage &operator=(ContentStorage &&rhs) {
|
|
ContentStorage(std::move(rhs)).Swap(*this);
|
|
return *this;
|
|
}
|
|
|
|
void Swap(ContentStorage &rhs) {
|
|
std::swap(this->interface, rhs.interface);
|
|
}
|
|
public:
|
|
PlaceHolderId GeneratePlaceHolderId() {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
|
|
PlaceHolderId id;
|
|
R_ABORT_UNLESS(this->interface->GeneratePlaceHolderId(std::addressof(id)));
|
|
return id;
|
|
}
|
|
|
|
Result CreatePlaceHolder(PlaceHolderId placeholder_id, ContentId content_id, s64 size) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->CreatePlaceHolder(placeholder_id, content_id, size);
|
|
}
|
|
|
|
Result DeletePlaceHolder(PlaceHolderId placeholder_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->DeletePlaceHolder(placeholder_id);
|
|
}
|
|
|
|
Result HasPlaceHolder(bool *out, PlaceHolderId placeholder_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->HasPlaceHolder(out, placeholder_id);
|
|
}
|
|
|
|
Result WritePlaceHolder(PlaceHolderId placeholder_id, s64 offset, const void *buf, size_t size) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->WritePlaceHolder(placeholder_id, offset, sf::InBuffer(buf, size));
|
|
}
|
|
|
|
Result Register(PlaceHolderId placeholder_id, ContentId content_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->Register(placeholder_id, content_id);
|
|
}
|
|
|
|
Result Delete(ContentId content_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->Delete(content_id);
|
|
}
|
|
|
|
Result Has(bool *out, ContentId content_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->Has(out, content_id);
|
|
}
|
|
|
|
void GetPath(Path *out, ContentId content_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
R_ABORT_UNLESS(this->interface->GetPath(out, content_id));
|
|
}
|
|
|
|
void GetPlaceHolderPath(Path *out, PlaceHolderId placeholder_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
R_ABORT_UNLESS(this->interface->GetPlaceHolderPath(out, placeholder_id));
|
|
}
|
|
|
|
Result CleanupAllPlaceHolder() {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->CleanupAllPlaceHolder();
|
|
}
|
|
|
|
Result ListPlaceHolder(s32 *out_count, PlaceHolderId *out_list, size_t out_list_size) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->ListPlaceHolder(out_count, sf::OutArray<PlaceHolderId>(out_list, out_list_size));
|
|
}
|
|
|
|
Result GetContentCount(s32 *out_count) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->GetContentCount(out_count);
|
|
}
|
|
|
|
Result ListContentId(s32 *out_count, ContentId *out_list, size_t out_list_size, s32 offset) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->ListContentId(out_count, sf::OutArray<ContentId>(out_list, out_list_size), offset);
|
|
}
|
|
|
|
Result GetSize(s64 *out_size, ContentId content_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->GetSizeFromContentId(out_size, content_id);
|
|
}
|
|
|
|
Result GetSize(s64 *out_size, PlaceHolderId placeholder_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->GetSizeFromPlaceHolderId(out_size, placeholder_id);
|
|
}
|
|
|
|
Result DisableForcibly() {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->DisableForcibly();
|
|
}
|
|
|
|
Result RevertToPlaceHolder(PlaceHolderId placeholder_id, ContentId old_content_id, ContentId new_content_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->RevertToPlaceHolder(placeholder_id, old_content_id, new_content_id);
|
|
}
|
|
|
|
Result SetPlaceHolderSize(PlaceHolderId placeholder_id, s64 size) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->SetPlaceHolderSize(placeholder_id, size);
|
|
}
|
|
|
|
Result ReadContentIdFile(void *dst, size_t size, ContentId content_id, s64 offset) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->ReadContentIdFile(sf::OutBuffer(dst, size), content_id, offset);
|
|
}
|
|
|
|
Result GetRightsId(ams::fs::RightsId *out_rights_id, PlaceHolderId placeholder_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
AMS_ABORT_UNLESS(hos::GetVersion() < hos::Version_300);
|
|
return this->interface->GetRightsIdFromPlaceHolderIdDeprecated(out_rights_id, placeholder_id);
|
|
}
|
|
|
|
Result GetRightsId(ncm::RightsId *out_rights_id, PlaceHolderId placeholder_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
AMS_ABORT_UNLESS(hos::GetVersion() >= hos::Version_300);
|
|
return this->interface->GetRightsIdFromPlaceHolderId(out_rights_id, placeholder_id);
|
|
}
|
|
|
|
Result GetRightsId(ams::fs::RightsId *out_rights_id, ContentId content_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
AMS_ABORT_UNLESS(hos::GetVersion() < hos::Version_300);
|
|
return this->interface->GetRightsIdFromContentIdDeprecated(out_rights_id, content_id);
|
|
}
|
|
|
|
Result GetRightsId(ncm::RightsId *out_rights_id, ContentId content_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
AMS_ABORT_UNLESS(hos::GetVersion() >= hos::Version_300);
|
|
return this->interface->GetRightsIdFromContentId(out_rights_id, content_id);
|
|
}
|
|
|
|
Result WriteContentForDebug(ContentId content_id, s64 offset, const void *buf, size_t size) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->WriteContentForDebug(content_id, offset, sf::InBuffer(buf, size));
|
|
}
|
|
|
|
Result GetFreeSpaceSize(s64 *out_size) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->GetFreeSpaceSize(out_size);
|
|
}
|
|
|
|
Result GetTotalSpaceSize(s64 *out_size) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->GetTotalSpaceSize(out_size);
|
|
}
|
|
|
|
Result FlushPlaceHolder() {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->FlushPlaceHolder();
|
|
}
|
|
|
|
Result RepairInvalidFileAttribute() {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->RepairInvalidFileAttribute();
|
|
}
|
|
|
|
Result GetRightsIdFromPlaceHolderIdWithCache(ncm::RightsId *out_rights_id, PlaceHolderId placeholder_id, ContentId cache_content_id) {
|
|
AMS_ASSERT(this->interface != nullptr);
|
|
return this->interface->GetRightsIdFromPlaceHolderIdWithCache(out_rights_id, placeholder_id, cache_content_id);
|
|
}
|
|
};
|
|
|
|
}
|