Move EncryptionType to NCCHContainer

src/core/file_sys/ncch_container.cpp

@@ -17,7 +17,6 @@
 #include "core/db/seed_db.h"
 #include "core/file_sys/data/data_container.h"
 #include "core/file_sys/ncch_container.h"
-#include "core/importer.h"
 #include "core/key/key.h"
 
 namespace Core {

src/core/file_sys/ncch_container.h

@@ -196,7 +196,17 @@ struct ExHeader_Header {
 
 static_assert(sizeof(ExHeader_Header) == 0x800, "ExHeader structure size is wrong");
 
-enum class EncryptionType;
+/**
+ * Encryption type of an importable content.
+ */
+enum class EncryptionType {
+    None,
+    FixedKey,
+    NCCHSecure1,
+    NCCHSecure2,
+    NCCHSecure3,
+    NCCHSecure4,
+};
 
 /**
  * Helper which implements an interface to deal with NCCH containers which can

src/core/importer.h

@@ -46,18 +46,6 @@ constexpr bool IsNandTitle(ContentType type) {
     return type == ContentType::SystemTitle || type == ContentType::SystemApplet;
 }
 
-/**
- * Encryption type of an importable content.
- */
-enum class EncryptionType {
-    None,
-    FixedKey,
-    NCCHSecure1,
-    NCCHSecure2,
-    NCCHSecure3,
-    NCCHSecure4,
-};
-
 /**
  * Struct that specifies an importable content.
  */
@@ -187,6 +175,10 @@ public:
     bool LoadTMD(ContentType type, u64 id, TitleMetadata& out) const;
     bool LoadTMD(const ContentSpecifier& specifier, TitleMetadata& out) const;
 
+    std::string GetTitleContentsPath(const ContentSpecifier& specifier) const;
+    std::shared_ptr<FileUtil::IOFile> OpenBootContent(const ContentSpecifier& specifier,
+                                                      const TitleMetadata& tmd) const;
+
     std::shared_ptr<TicketDB>& GetTicketDB() {
         return ticket_db;
     }