diff options
| author | 2015-01-07 00:33:00 +0000 | |
|---|---|---|
| committer | 2015-01-15 22:23:08 +0100 | |
| commit | 2c24e539a23438c84653f00f08df455d9837a20f (patch) | |
| tree | 29254661ba71284d6808e9536fb62ab042863c30 /src/core/loader/loader.cpp | |
| parent | Loader: Guess filetype from the magic, or fallback to the extension. (diff) | |
| download | yuzu-2c24e539a23438c84653f00f08df455d9837a20f.tar.gz yuzu-2c24e539a23438c84653f00f08df455d9837a20f.tar.xz yuzu-2c24e539a23438c84653f00f08df455d9837a20f.zip | |
Loader: Display the type of the file being loaded.
Diffstat (limited to 'src/core/loader/loader.cpp')
| -rw-r--r-- | src/core/loader/loader.cpp | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 01b415215..60460292d 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -72,12 +72,30 @@ static FileType GuessFromFilename(const std::string& filename) { | |||
| 72 | return FileType::Unknown; | 72 | return FileType::Unknown; |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | ResultStatus LoadFile(const std::string& filename) { | 75 | static const char* GetFileTypeString(FileType type) { |
| 76 | LOG_INFO(Loader, "Loading file %s...", filename.c_str()); | 76 | switch (type) { |
| 77 | case FileType::CCI: | ||
| 78 | return "NCSD"; | ||
| 79 | case FileType::CXI: | ||
| 80 | return "NCCH"; | ||
| 81 | case FileType::ELF: | ||
| 82 | return "ELF"; | ||
| 83 | case FileType::THREEDSX: | ||
| 84 | return "3DSX"; | ||
| 85 | case FileType::BIN: | ||
| 86 | return "raw"; | ||
| 87 | case FileType::Error: | ||
| 88 | case FileType::Unknown: | ||
| 89 | return "unknown"; | ||
| 90 | } | ||
| 91 | } | ||
| 77 | 92 | ||
| 93 | ResultStatus LoadFile(const std::string& filename) { | ||
| 78 | std::unique_ptr<FileUtil::IOFile> file(new FileUtil::IOFile(filename, "rb")); | 94 | std::unique_ptr<FileUtil::IOFile> file(new FileUtil::IOFile(filename, "rb")); |
| 79 | if (!file->IsOpen()) | 95 | if (!file->IsOpen()) { |
| 96 | LOG_ERROR(Loader, "Failed to load file %s", filename.c_str()); | ||
| 80 | return ResultStatus::Error; | 97 | return ResultStatus::Error; |
| 98 | } | ||
| 81 | 99 | ||
| 82 | FileType type = IdentifyFile(*file); | 100 | FileType type = IdentifyFile(*file); |
| 83 | FileType filename_type = GuessFromFilename(filename); | 101 | FileType filename_type = GuessFromFilename(filename); |
| @@ -88,6 +106,8 @@ ResultStatus LoadFile(const std::string& filename) { | |||
| 88 | type = filename_type; | 106 | type = filename_type; |
| 89 | } | 107 | } |
| 90 | 108 | ||
| 109 | LOG_INFO(Loader, "Loading file %s as %s...", filename.c_str(), GetFileTypeString(type)); | ||
| 110 | |||
| 91 | switch (type) { | 111 | switch (type) { |
| 92 | 112 | ||
| 93 | //3DSX file format... | 113 | //3DSX file format... |