Dark98/threeSD
1
0
Fork 0
mirror of https://github.com/Dark98/threeSD.git synced 2026-07-06 00:38:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to CIA building

Browse Source 
1. Optimizes ticket finding
2. Fixes progress reporting overshoot
3. Use u64 for size in general
4. Various other fixes and cleanups
This commit is contained in:
Pengfei
2021-08-06 00:55:35 +08:00
parent fd1c2363eb
commit d4e1404788
23 changed files with 266 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/importer.h
+4 -4
View File
@@ -6,7 +6,6 @@
#include <functional>
#include <memory>
#include <mutex>
#include <string>
#include <vector>
#include "common/common_types.h"
@@ -17,6 +16,7 @@ namespace Core {
class CIABuilder;
class SDMCDecryptor;
class TicketDB;
class TitleDB;
class TitleMetadata;
@@ -120,7 +120,7 @@ public:
*/
bool ImportContent(
const ContentSpecifier& specifier,
const Common::ProgressCallback& callback = [](std::size_t, std::size_t) {});
const Common::ProgressCallback& callback = [](u64, u64) {});
/**
* Aborts current importing.
@@ -175,7 +175,7 @@ private:
// Impl of ImportContent without deleting mechanism.
bool ImportContentImpl(
const ContentSpecifier& specifier,
const Common::ProgressCallback& callback = [](std::size_t, std::size_t) {});
const Common::ProgressCallback& callback = [](u64, u64) {});
bool ImportTitle(const ContentSpecifier& specifier, const Common::ProgressCallback& callback);
bool ImportNandTitle(const ContentSpecifier& specifier,
const Common::ProgressCallback& callback);
@@ -207,8 +207,8 @@ private:
Config config;
std::unique_ptr<SDMCDecryptor> sdmc_decryptor;
// Used for CIA building
std::unique_ptr<CIABuilder> cia_builder;
std::mutex cia_builder_mutex;
// The NCCH used to dump CXIs.
std::unique_ptr<NCCHContainer> dump_cxi_ncch;