diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 06381fa..6db6a4b 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,42 +1,42 @@ add_library(core STATIC - data_container.cpp - data_container.h + cia_builder.cpp + cia_builder.h + db/seed_db.cpp + db/seed_db.h + db/title_db.cpp + db/title_db.h + db/title_keys_bin.cpp + db/title_keys_bin.h decryptor.cpp decryptor.h - extdata.cpp - extdata.h + file_sys/certificate.cpp + file_sys/certificate.h + file_sys/cia_common.h + file_sys/data/data_container.cpp + file_sys/data/data_container.h + file_sys/data/extdata.cpp + file_sys/data/extdata.h + file_sys/data/inner_fat.hpp + file_sys/data/savegame.cpp + file_sys/data/savegame.h + file_sys/ncch_container.cpp + file_sys/ncch_container.h + file_sys/signature.cpp + file_sys/signature.h + file_sys/smdh.cpp + file_sys/smdh.h + file_sys/ticket.cpp + file_sys/ticket.h + file_sys/title_metadata.cpp + file_sys/title_metadata.h importer.cpp importer.h - inner_fat.hpp key/arithmetic128.cpp key/arithmetic128.h key/key.cpp key/key.h - ncch/certificate.cpp - ncch/certificate.h - ncch/cia_builder.cpp - ncch/cia_builder.h - ncch/cia_common.h - ncch/ncch_container.cpp - ncch/ncch_container.h - ncch/signature.cpp - ncch/signature.h - ncch/seed_db.cpp - ncch/seed_db.h - ncch/smdh.cpp - ncch/smdh.h - ncch/ticket.cpp - ncch/ticket.h - ncch/title_metadata.cpp - ncch/title_metadata.h quick_decryptor.cpp quick_decryptor.h - savegame.cpp - savegame.h - title_db.cpp - title_db.h - title_keys_bin.cpp - title_keys_bin.h ) target_link_libraries(core PRIVATE common cryptopp) diff --git a/src/core/ncch/cia_builder.cpp b/src/core/cia_builder.cpp similarity index 97% rename from src/core/ncch/cia_builder.cpp rename to src/core/cia_builder.cpp index 60fa1df..0b3919e 100644 --- a/src/core/ncch/cia_builder.cpp +++ b/src/core/cia_builder.cpp @@ -6,14 +6,14 @@ #include #include #include "common/alignment.h" +#include "core/cia_builder.h" +#include "core/db/title_db.h" +#include "core/db/title_keys_bin.h" +#include "core/file_sys/certificate.h" +#include "core/file_sys/cia_common.h" +#include "core/file_sys/ticket.h" +#include "core/file_sys/title_metadata.h" #include "core/importer.h" -#include "core/ncch/certificate.h" -#include "core/ncch/cia_builder.h" -#include "core/ncch/cia_common.h" -#include "core/ncch/ticket.h" -#include "core/ncch/title_metadata.h" -#include "core/title_db.h" -#include "core/title_keys_bin.h" namespace Core { diff --git a/src/core/ncch/cia_builder.h b/src/core/cia_builder.h similarity index 96% rename from src/core/ncch/cia_builder.h rename to src/core/cia_builder.h index cba2612..599bcc6 100644 --- a/src/core/ncch/cia_builder.h +++ b/src/core/cia_builder.h @@ -10,10 +10,10 @@ #include "common/file_util.h" #include "common/progress_callback.h" #include "common/swap.h" +#include "core/file_sys/cia_common.h" +#include "core/file_sys/ncch_container.h" +#include "core/file_sys/title_metadata.h" #include "core/key/key.h" -#include "core/ncch/cia_common.h" -#include "core/ncch/ncch_container.h" -#include "core/ncch/title_metadata.h" #include "core/quick_decryptor.h" namespace Core { diff --git a/src/core/ncch/seed_db.cpp b/src/core/db/seed_db.cpp similarity index 99% rename from src/core/ncch/seed_db.cpp rename to src/core/db/seed_db.cpp index 1d68e83..1691f7d 100644 --- a/src/core/ncch/seed_db.cpp +++ b/src/core/db/seed_db.cpp @@ -7,7 +7,7 @@ #include #include "common/file_util.h" #include "common/logging/log.h" -#include "core/ncch/seed_db.h" +#include "core/db/seed_db.h" namespace Core { diff --git a/src/core/ncch/seed_db.h b/src/core/db/seed_db.h similarity index 100% rename from src/core/ncch/seed_db.h rename to src/core/db/seed_db.h diff --git a/src/core/title_db.cpp b/src/core/db/title_db.cpp similarity index 97% rename from src/core/title_db.cpp rename to src/core/db/title_db.cpp index ca81741..d60d45a 100644 --- a/src/core/title_db.cpp +++ b/src/core/db/title_db.cpp @@ -4,8 +4,8 @@ #include "common/file_util.h" #include "common/logging/log.h" -#include "core/data_container.h" -#include "core/title_db.h" +#include "core/db/title_db.h" +#include "core/file_sys/data/data_container.h" namespace Core { diff --git a/src/core/title_db.h b/src/core/db/title_db.h similarity index 97% rename from src/core/title_db.h rename to src/core/db/title_db.h index 14cb627..f48cda4 100644 --- a/src/core/title_db.h +++ b/src/core/db/title_db.h @@ -10,8 +10,8 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/swap.h" -#include "core/inner_fat.hpp" -#include "core/ncch/ticket.h" +#include "core/file_sys/data/inner_fat.hpp" +#include "core/file_sys/ticket.h" namespace Core { diff --git a/src/core/title_keys_bin.cpp b/src/core/db/title_keys_bin.cpp similarity index 96% rename from src/core/title_keys_bin.cpp rename to src/core/db/title_keys_bin.cpp index e4a885a..bd053b7 100644 --- a/src/core/title_keys_bin.cpp +++ b/src/core/db/title_keys_bin.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "common/file_util.h" -#include "core/title_keys_bin.h" +#include "core/db/title_keys_bin.h" namespace Core { diff --git a/src/core/title_keys_bin.h b/src/core/db/title_keys_bin.h similarity index 100% rename from src/core/title_keys_bin.h rename to src/core/db/title_keys_bin.h diff --git a/src/core/ncch/certificate.cpp b/src/core/file_sys/certificate.cpp similarity index 97% rename from src/core/ncch/certificate.cpp rename to src/core/file_sys/certificate.cpp index 30605a5..54933ae 100644 --- a/src/core/ncch/certificate.cpp +++ b/src/core/file_sys/certificate.cpp @@ -11,9 +11,9 @@ #include "common/file_util.h" #include "common/logging/log.h" #include "common/string_util.h" -#include "core/data_container.h" -#include "core/ncch/certificate.h" -#include "core/ncch/cia_common.h" +#include "core/file_sys/certificate.h" +#include "core/file_sys/cia_common.h" +#include "core/file_sys/data/data_container.h" namespace Core { diff --git a/src/core/ncch/certificate.h b/src/core/file_sys/certificate.h similarity index 97% rename from src/core/ncch/certificate.h rename to src/core/file_sys/certificate.h index 35f8014..e32e39b 100644 --- a/src/core/ncch/certificate.h +++ b/src/core/file_sys/certificate.h @@ -9,7 +9,7 @@ #include #include "common/common_funcs.h" #include "common/swap.h" -#include "core/ncch/signature.h" +#include "core/file_sys/signature.h" namespace CryptoPP { class Integer; diff --git a/src/core/ncch/cia_common.h b/src/core/file_sys/cia_common.h similarity index 100% rename from src/core/ncch/cia_common.h rename to src/core/file_sys/cia_common.h diff --git a/src/core/data_container.cpp b/src/core/file_sys/data/data_container.cpp similarity index 99% rename from src/core/data_container.cpp rename to src/core/file_sys/data/data_container.cpp index fbe2028..8001074 100644 --- a/src/core/data_container.cpp +++ b/src/core/file_sys/data/data_container.cpp @@ -5,7 +5,7 @@ #include #include "common/assert.h" #include "common/common_funcs.h" -#include "core/data_container.h" +#include "core/file_sys/data/data_container.h" namespace Core { diff --git a/src/core/data_container.h b/src/core/file_sys/data/data_container.h similarity index 100% rename from src/core/data_container.h rename to src/core/file_sys/data/data_container.h diff --git a/src/core/extdata.cpp b/src/core/file_sys/data/extdata.cpp similarity index 97% rename from src/core/extdata.cpp rename to src/core/file_sys/data/extdata.cpp index c3d8ed6..32927e2 100644 --- a/src/core/extdata.cpp +++ b/src/core/file_sys/data/extdata.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "core/data_container.h" #include "core/decryptor.h" -#include "core/extdata.h" +#include "core/file_sys/data/data_container.h" +#include "core/file_sys/data/extdata.h" namespace Core { diff --git a/src/core/extdata.h b/src/core/file_sys/data/extdata.h similarity index 96% rename from src/core/extdata.h rename to src/core/file_sys/data/extdata.h index 573a01f..b89591f 100644 --- a/src/core/extdata.h +++ b/src/core/file_sys/data/extdata.h @@ -4,7 +4,7 @@ #pragma once -#include "core/inner_fat.hpp" +#include "core/file_sys/data/inner_fat.hpp" namespace Core { diff --git a/src/core/inner_fat.hpp b/src/core/file_sys/data/inner_fat.hpp similarity index 100% rename from src/core/inner_fat.hpp rename to src/core/file_sys/data/inner_fat.hpp diff --git a/src/core/savegame.cpp b/src/core/file_sys/data/savegame.cpp similarity index 98% rename from src/core/savegame.cpp rename to src/core/file_sys/data/savegame.cpp index d022a7f..45ed6bf 100644 --- a/src/core/savegame.cpp +++ b/src/core/file_sys/data/savegame.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "core/savegame.h" +#include "core/file_sys/data/savegame.h" namespace Core { diff --git a/src/core/savegame.h b/src/core/file_sys/data/savegame.h similarity index 93% rename from src/core/savegame.h rename to src/core/file_sys/data/savegame.h index d7b1ce7..495b08e 100644 --- a/src/core/savegame.h +++ b/src/core/file_sys/data/savegame.h @@ -4,7 +4,7 @@ #pragma once -#include "core/inner_fat.hpp" +#include "core/file_sys/data/inner_fat.hpp" namespace Core { diff --git a/src/core/ncch/ncch_container.cpp b/src/core/file_sys/ncch_container.cpp similarity index 99% rename from src/core/ncch/ncch_container.cpp rename to src/core/file_sys/ncch_container.cpp index 3fb6eb2..cfc5936 100644 --- a/src/core/ncch/ncch_container.cpp +++ b/src/core/file_sys/ncch_container.cpp @@ -14,11 +14,11 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/logging/log.h" -#include "core/data_container.h" +#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" -#include "core/ncch/ncch_container.h" -#include "core/ncch/seed_db.h" namespace Core { diff --git a/src/core/ncch/ncch_container.h b/src/core/file_sys/ncch_container.h similarity index 100% rename from src/core/ncch/ncch_container.h rename to src/core/file_sys/ncch_container.h diff --git a/src/core/ncch/signature.cpp b/src/core/file_sys/signature.cpp similarity index 97% rename from src/core/ncch/signature.cpp rename to src/core/file_sys/signature.cpp index 5edb797..62516f8 100644 --- a/src/core/ncch/signature.cpp +++ b/src/core/file_sys/signature.cpp @@ -7,8 +7,8 @@ #include "common/common_funcs.h" #include "common/file_util.h" #include "common/logging/log.h" -#include "core/ncch/certificate.h" -#include "core/ncch/signature.h" +#include "core/file_sys/certificate.h" +#include "core/file_sys/signature.h" namespace Core { diff --git a/src/core/ncch/signature.h b/src/core/file_sys/signature.h similarity index 100% rename from src/core/ncch/signature.h rename to src/core/file_sys/signature.h diff --git a/src/core/ncch/smdh.cpp b/src/core/file_sys/smdh.cpp similarity index 99% rename from src/core/ncch/smdh.cpp rename to src/core/file_sys/smdh.cpp index 5354e7f..17d5db0 100644 --- a/src/core/ncch/smdh.cpp +++ b/src/core/file_sys/smdh.cpp @@ -6,7 +6,7 @@ #include #include "common/common_funcs.h" #include "common/common_types.h" -#include "core/ncch/smdh.h" +#include "core/file_sys/smdh.h" namespace Core { diff --git a/src/core/ncch/smdh.h b/src/core/file_sys/smdh.h similarity index 100% rename from src/core/ncch/smdh.h rename to src/core/file_sys/smdh.h diff --git a/src/core/ncch/ticket.cpp b/src/core/file_sys/ticket.cpp similarity index 97% rename from src/core/ncch/ticket.cpp rename to src/core/file_sys/ticket.cpp index 55913a3..3b54571 100644 --- a/src/core/ncch/ticket.cpp +++ b/src/core/file_sys/ticket.cpp @@ -10,8 +10,8 @@ #include "common/common_funcs.h" #include "common/file_util.h" #include "common/string_util.h" -#include "core/ncch/cia_common.h" -#include "core/ncch/ticket.h" +#include "core/file_sys/cia_common.h" +#include "core/file_sys/ticket.h" namespace Core { diff --git a/src/core/ncch/ticket.h b/src/core/file_sys/ticket.h similarity index 97% rename from src/core/ncch/ticket.h rename to src/core/file_sys/ticket.h index deae241..7f6f02a 100644 --- a/src/core/ncch/ticket.h +++ b/src/core/file_sys/ticket.h @@ -9,7 +9,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/swap.h" -#include "core/ncch/signature.h" +#include "core/file_sys/signature.h" namespace FileUtil { class IOFile; diff --git a/src/core/ncch/title_metadata.cpp b/src/core/file_sys/title_metadata.cpp similarity index 98% rename from src/core/ncch/title_metadata.cpp rename to src/core/file_sys/title_metadata.cpp index d47b3ce..47f8529 100644 --- a/src/core/ncch/title_metadata.cpp +++ b/src/core/file_sys/title_metadata.cpp @@ -11,9 +11,9 @@ #include "common/file_util.h" #include "common/logging/log.h" #include "common/string_util.h" -#include "core/ncch/certificate.h" -#include "core/ncch/cia_common.h" -#include "core/ncch/title_metadata.h" +#include "core/file_sys/certificate.h" +#include "core/file_sys/cia_common.h" +#include "core/file_sys/title_metadata.h" namespace Core { diff --git a/src/core/ncch/title_metadata.h b/src/core/file_sys/title_metadata.h similarity index 98% rename from src/core/ncch/title_metadata.h rename to src/core/file_sys/title_metadata.h index b6ac1bc..01a6937 100644 --- a/src/core/ncch/title_metadata.h +++ b/src/core/file_sys/title_metadata.h @@ -9,7 +9,7 @@ #include #include "common/common_types.h" #include "common/swap.h" -#include "core/ncch/signature.h" +#include "core/file_sys/signature.h" namespace Core { diff --git a/src/core/importer.cpp b/src/core/importer.cpp index d655b44..4bd723b 100644 --- a/src/core/importer.cpp +++ b/src/core/importer.cpp @@ -8,19 +8,19 @@ #include "common/file_util.h" #include "common/scope_exit.h" #include "common/string_util.h" -#include "core/data_container.h" +#include "core/cia_builder.h" +#include "core/db/seed_db.h" +#include "core/db/title_db.h" #include "core/decryptor.h" -#include "core/extdata.h" +#include "core/file_sys/certificate.h" +#include "core/file_sys/data/data_container.h" +#include "core/file_sys/data/extdata.h" +#include "core/file_sys/data/savegame.h" +#include "core/file_sys/ncch_container.h" +#include "core/file_sys/smdh.h" +#include "core/file_sys/title_metadata.h" #include "core/importer.h" #include "core/key/key.h" -#include "core/ncch/certificate.h" -#include "core/ncch/cia_builder.h" -#include "core/ncch/ncch_container.h" -#include "core/ncch/seed_db.h" -#include "core/ncch/smdh.h" -#include "core/ncch/title_metadata.h" -#include "core/savegame.h" -#include "core/title_db.h" namespace Core { diff --git a/src/core/importer.h b/src/core/importer.h index 2bcba81..b60969b 100644 --- a/src/core/importer.h +++ b/src/core/importer.h @@ -11,7 +11,7 @@ #include #include "common/common_types.h" #include "common/progress_callback.h" -#include "core/ncch/cia_common.h" +#include "core/file_sys/cia_common.h" namespace Core { diff --git a/src/frontend/cia_build_dialog.h b/src/frontend/cia_build_dialog.h index efbb591..7138adf 100644 --- a/src/frontend/cia_build_dialog.h +++ b/src/frontend/cia_build_dialog.h @@ -5,7 +5,7 @@ #include #include #include -#include "core/ncch/cia_common.h" +#include "core/file_sys/cia_common.h" namespace Ui { class CIABuildDialog; diff --git a/src/frontend/import_dialog.h b/src/frontend/import_dialog.h index 0da63bd..3f2d3ca 100644 --- a/src/frontend/import_dialog.h +++ b/src/frontend/import_dialog.h @@ -9,8 +9,8 @@ #include #include #include +#include "core/file_sys/ncch_container.h" #include "core/importer.h" -#include "core/ncch/ncch_container.h" class AdvancedMenu; class MultiJob; diff --git a/src/frontend/utilities.cpp b/src/frontend/utilities.cpp index 5e4ae24..eda9c60 100644 --- a/src/frontend/utilities.cpp +++ b/src/frontend/utilities.cpp @@ -8,12 +8,12 @@ #include #include #include -#include "core/data_container.h" #include "core/decryptor.h" -#include "core/extdata.h" +#include "core/file_sys/data/data_container.h" +#include "core/file_sys/data/extdata.h" +#include "core/file_sys/data/savegame.h" +#include "core/file_sys/ncch_container.h" #include "core/key/key.h" -#include "core/ncch/ncch_container.h" -#include "core/savegame.h" #include "frontend/select_files_dialog.h" #include "frontend/utilities.h" #include "ui_utilities.h"