mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2024-11-23 12:22:08 +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>
209 lines
8.3 KiB
C++
209 lines
8.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/>.
|
|
*/
|
|
#include <stratosphere.hpp>
|
|
#include "ncm_fs_utils.hpp"
|
|
|
|
namespace ams::ncm {
|
|
|
|
namespace {
|
|
|
|
constexpr inline size_t MaxPackagePathLength = 0x100;
|
|
|
|
Result ConvertToFsCommonPath(char *dst, size_t dst_size, const char *package_root_path, const char *entry_path) {
|
|
char package_path[MaxPackagePathLength];
|
|
|
|
const size_t path_len = std::snprintf(package_path, sizeof(package_path), "%s%s", package_root_path, entry_path);
|
|
AMS_ABORT_UNLESS(path_len < MaxPackagePathLength);
|
|
|
|
return fs::ConvertToFsCommonPath(dst, dst_size, package_path);
|
|
}
|
|
|
|
Result LoadContentMeta(ncm::AutoBuffer *out, const char *package_root_path, const fs::DirectoryEntry &entry) {
|
|
AMS_ABORT_UNLESS(impl::PathView(entry.name).HasSuffix(".cnmt.nca"));
|
|
|
|
char path[MaxPackagePathLength];
|
|
R_TRY(ConvertToFsCommonPath(path, sizeof(path), package_root_path, entry.name));
|
|
|
|
return ncm::ReadContentMetaPath(out, path);
|
|
}
|
|
|
|
template<typename F>
|
|
Result ForEachFileInDirectory(const char *root_path, F f) {
|
|
/* Open the directory. */
|
|
fs::DirectoryHandle dir;
|
|
R_TRY(fs::OpenDirectory(std::addressof(dir), root_path, fs::OpenDirectoryMode_File));
|
|
ON_SCOPE_EXIT { fs::CloseDirectory(dir); };
|
|
|
|
while (true) {
|
|
/* Read the current entry. */
|
|
s64 count;
|
|
fs::DirectoryEntry entry;
|
|
R_TRY(fs::ReadDirectory(std::addressof(count), std::addressof(entry), dir, 1));
|
|
if (count == 0) {
|
|
break;
|
|
}
|
|
|
|
/* Invoke our handler on the entry. */
|
|
bool done;
|
|
R_TRY(f(std::addressof(done), entry));
|
|
R_SUCCEED_IF(done);
|
|
}
|
|
|
|
return ResultSuccess();
|
|
}
|
|
|
|
}
|
|
|
|
Result ContentMetaDatabaseBuilder::BuildFromPackageContentMeta(void *buf, size_t size, const ContentInfo &meta_info) {
|
|
/* Create a reader for the content meta. */
|
|
ncm::PackagedContentMetaReader package_meta_reader(buf, size);
|
|
|
|
/* Allocate space to hold the converted meta. */
|
|
const size_t meta_size = package_meta_reader.CalculateConvertContentMetaSize();
|
|
void *meta = std::malloc(meta_size);
|
|
ON_SCOPE_EXIT { std::free(meta); };
|
|
|
|
/* Convert the meta from packaged form to normal form. */
|
|
package_meta_reader.ConvertToContentMeta(meta, meta_size, meta_info);
|
|
ncm::ContentMetaReader meta_reader(meta, meta_size);
|
|
|
|
/* Insert the new metas into the database. */
|
|
R_TRY(this->db->Set(package_meta_reader.GetKey(), meta_reader.GetData(), meta_reader.GetSize()));
|
|
|
|
/* We're done. */
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result ContentMetaDatabaseBuilder::BuildFromStorage(ContentStorage *storage) {
|
|
/* Get the total count of contents. */
|
|
s32 total_count;
|
|
R_TRY(storage->GetContentCount(std::addressof(total_count)));
|
|
|
|
/* Loop over all contents, looking for a package we can build from. */
|
|
const size_t MaxContentIds = 64;
|
|
ContentId content_ids[MaxContentIds];
|
|
for (s32 offset = 0; offset < total_count; /* ... */) {
|
|
/* List contents at the current offset. */
|
|
s32 count;
|
|
R_TRY(storage->ListContentId(std::addressof(count), content_ids, MaxContentIds, offset));
|
|
|
|
/* Loop the contents we listed, looking for a correct one. */
|
|
for (s32 i = 0; i < count; i++) {
|
|
/* Get the path for this content id. */
|
|
auto &content_id = content_ids[i];
|
|
ncm::Path path;
|
|
storage->GetPath(std::addressof(path), content_id);
|
|
|
|
/* Read the content meta path, and build. */
|
|
ncm::AutoBuffer package_meta;
|
|
if (R_SUCCEEDED(ncm::ReadContentMetaPath(std::addressof(package_meta), path.str))) {
|
|
/* Get the size of the content. */
|
|
s64 size;
|
|
R_TRY(storage->GetSize(std::addressof(size), content_id));
|
|
|
|
/* Build. */
|
|
R_TRY(this->BuildFromPackageContentMeta(package_meta.Get(), package_meta.GetSize(), ContentInfo::Make(content_id, size, ContentType::Meta)));
|
|
}
|
|
}
|
|
|
|
/* Advance. */
|
|
offset += count;
|
|
}
|
|
|
|
/* Commit our changes. */
|
|
return this->db->Commit();
|
|
}
|
|
|
|
Result ContentMetaDatabaseBuilder::BuildFromPackage(const char *package_root_path) {
|
|
/* Build the database by writing every entry in the package. */
|
|
R_TRY(ForEachFileInDirectory(package_root_path, [&](bool *done, const fs::DirectoryEntry &entry) -> Result {
|
|
/* Never early terminate. */
|
|
*done = false;
|
|
|
|
/* We have nothing to list if we're not looking at a meta. */
|
|
R_SUCCEED_IF(!impl::PathView(entry.name).HasSuffix(".cnmt.nca"));
|
|
|
|
/* Read the content meta path, and build. */
|
|
ncm::AutoBuffer package_meta;
|
|
R_TRY(LoadContentMeta(std::addressof(package_meta), package_root_path, entry));
|
|
|
|
/* Try to parse a content id from the name. */
|
|
auto content_id = GetContentIdFromString(entry.name, sizeof(entry.name));
|
|
R_UNLESS(content_id, ncm::ResultInvalidPackageFormat());
|
|
|
|
/* Build using the meta. */
|
|
return this->BuildFromPackageContentMeta(package_meta.Get(), package_meta.GetSize(), ContentInfo::Make(*content_id, entry.file_size, ContentType::Meta));
|
|
}));
|
|
|
|
/* Commit our changes. */
|
|
return this->db->Commit();
|
|
}
|
|
|
|
Result ContentMetaDatabaseBuilder::Cleanup() {
|
|
/* This cleans up the content meta by removing all entries. */
|
|
while (true) {
|
|
/* List as many keys as we can. */
|
|
constexpr s32 MaxKeys = 64;
|
|
ContentMetaKey keys[MaxKeys];
|
|
auto list_count = this->db->ListContentMeta(keys, MaxKeys);
|
|
|
|
/* Remove the listed keys. */
|
|
for (auto i = 0; i < list_count.written; i++) {
|
|
R_TRY(this->db->Remove(keys[i]));
|
|
}
|
|
|
|
/* If there aren't more keys to read, we're done. */
|
|
if (list_count.written < MaxKeys) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Commit our deletions. */
|
|
return this->db->Commit();
|
|
}
|
|
|
|
Result ListApplicationPackage(s32 *out_count, ApplicationId *out_ids, size_t max_out_ids, const char *package_root_path) {
|
|
size_t count = 0;
|
|
R_TRY(ForEachFileInDirectory(package_root_path, [&](bool *done, const fs::DirectoryEntry &entry) -> Result {
|
|
/* Never early terminate. */
|
|
*done = false;
|
|
|
|
/* We have nothing to list if we're not looking at a meta. */
|
|
R_SUCCEED_IF(!impl::PathView(entry.name).HasSuffix(".cnmt.nca"));
|
|
|
|
/* Read the content meta path, and build. */
|
|
ncm::AutoBuffer package_meta;
|
|
R_TRY(LoadContentMeta(std::addressof(package_meta), package_root_path, entry));
|
|
|
|
/* Create a reader for the meta. */
|
|
ncm::PackagedContentMetaReader package_meta_reader(package_meta.Get(), package_meta.GetSize());
|
|
|
|
/* Write the key to output if we're reading an application. */
|
|
const auto &key = package_meta_reader.GetKey();
|
|
if (key.type == ContentMetaType::Application) {
|
|
R_UNLESS(count < max_out_ids, ncm::ResultBufferInsufficient());
|
|
|
|
out_ids[count++] = { key.id };
|
|
}
|
|
|
|
return ResultSuccess();
|
|
}));
|
|
|
|
*out_count = static_cast<s32>(count);
|
|
return ResultSuccess();
|
|
}
|
|
|
|
}
|