diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/Controller.cpp index e27eb3d..16ab9a1 100644 --- a/trunk/ConsoleDataMigration/ConsoleBackup/Controller.cpp +++ b/trunk/ConsoleDataMigration/ConsoleBackup/Controller.cpp @@ -101,7 +101,7 @@ void ControlState(::std::vector& operationMessage, bool& nextStep, s_ExistAPSettingAnnotation = true; common::PlaySound(common::SOUND_ANNOTATION); } - operationMessage.push_back(::std::string("APSetting.txt does not exist!")); + operationMessage.push_back(::std::string("Accsess_Point_Setting does not exist!")); } } else diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp index e7604b7..16bf330 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp +++ b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp @@ -93,7 +93,7 @@ bool CheckAndReadAPSetting(::std::vector& operationMessage) s_ExistAPSettingAnnotation = true; common::PlaySound(common::SOUND_ANNOTATION); } - operationMessage.push_back(::std::string("APSetting.txt does not exist!")); + operationMessage.push_back(::std::string("Accsess_Point_Setting does not exist!")); return false; } @@ -375,6 +375,16 @@ void ControlState(::std::vector& operationMessage, bool& nextStep, if (IsNetworkUpdateFinished()) { FinishFGNetworkUpdate(); + // エラーがあったら表示する + if(GetUpdateResult().IsFailure()) + { + // APが見つからない + if(GetUpdateResult() == nn::ac::ResultNotFoundAccessPoint()) + { + COMMON_LOGGER("No Access Point Found!"); + } + } + if (GetUpdateResult().IsSuccess()) { COMMON_LOGGER("Network Update Finished.\n"); diff --git a/trunk/ConsoleDataMigration/common/FileName.h b/trunk/ConsoleDataMigration/common/FileName.h index 95009e2..7d49ac7 100644 --- a/trunk/ConsoleDataMigration/common/FileName.h +++ b/trunk/ConsoleDataMigration/common/FileName.h @@ -26,6 +26,7 @@ const char* const SDMC_ARCHIVE_NAME = "sdmc:"; const char* const NAND_TWL_PHOTO_ARCHIVE_NAME = "twlp:"; const char* const NAND_TWL_SOUND_ARCHIVE_NAME = "twls:"; +const wchar_t* const LOG_ROOT_DIRECTORY_PATH = L"sdmc:/CTR_Console_Repair"; const wchar_t* const SD_SAVEDATA_ROOT_NAME = L"CTR_Console_Repair/CTRBackup/"; const wchar_t* const SD_SAVEDATA_TWL_PHOTO_ROOT_NAME = L"CTR_Console_Repair/TWLPhotoBackup/"; const wchar_t* const SD_SAVEDATA_TWL_SOUND_ROOT_NAME = L"CTR_Console_Repair/TWLSoundBackup/"; diff --git a/trunk/ConsoleDataMigration/common/SdLogger.cpp b/trunk/ConsoleDataMigration/common/SdLogger.cpp index 1ebf08d..8d1b7ad 100644 --- a/trunk/ConsoleDataMigration/common/SdLogger.cpp +++ b/trunk/ConsoleDataMigration/common/SdLogger.cpp @@ -138,6 +138,14 @@ void SdLogger::Print(const char* fmt, ::std::va_list arg) ::std::wstring log(common::SDMC_ROOT_DIRECTORY_PATH); log += common::LOG_FILENAME; + // ディレクトリが無ければ作る + nn::fs::Directory dir; + result = dir.TryInitialize(common::LOG_ROOT_DIRECTORY_PATH); + if(result.IsFailure()) + { + result = nn::fs::TryCreateDirectory(common::LOG_ROOT_DIRECTORY_PATH); + } + result = sd.TryInitialize(log.c_str(), true); if (result.IsSuccess()) { @@ -186,6 +194,7 @@ void SdLogger::Print(const char* fmt, ::std::va_list arg) PrintResultIfFailed(result, __LINE__); } + dir.Finalize(); sd.Finalize(); SdMountManager::Unmount(); }