rvtr/ctr_Repair
1
Fork 0
mirror of https://github.com/rvtr/ctr_Repair.git synced 2025-10-31 13:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

時計あわせ終了後にリストア状態管理ファイルをすべて削除

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@44 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-02-10 02:27:45 +00:00
parent 8e66dda90d
commit 92c972d9e0
5 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
View File

@ -636,6 +636,8 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
s_RestoreState = FAIL; s_RestoreState = FAIL;
} }
// リストア状態チェックファイルをすべて削除
DeleteAllCheckFiles();
} }
} }
break; break;
@ -740,7 +742,8 @@ u32 GetProgress()
{ {
return GetImportProgress(); return GetImportProgress();
} }
else if(s_RestoreState == UPDATE_IN_PROGRESS) else if(s_RestoreState == UPDATE_IN_PROGRESS ||
s_RestoreState == UPDATE_DONE)
{ {
return GetUpdateProgress(); return GetUpdateProgress();
} }

11
trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
View File

@ -669,14 +669,17 @@ void Cleanup()
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
} }
void DeleteConsoleInitializedFile() void DeleteAllCheckFiles()
{ {
nn::Result result; nn::Result result;
common::SdMountManager::Mount(); common::SdMountManager::Mount();
result = nn::fs::TryDeleteFile(common::INITIALIZED_CHECK_PATHNAME); for(u32 i = 0; i < sizeof(CHECK_FILENAME_TABLE) / sizeof(CHECK_FILENAME_TABLE[0]); i++)
COMMON_LOGGER_RESULT_IF_FAILED(result); {
result = nn::fs::TryDeleteFile(CHECK_FILENAME_TABLE[i]);
COMMON_LOGGER_RESULT_IF_FAILED(result);
}
common::SdMountManager::Unmount(); common::SdMountManager::Unmount();
} }
@ -693,7 +696,7 @@ bool IsImportFinished()
void CreateWriteFinishedFile() void CreateWriteFinishedFile()
{ {
CreateEmptyFile(common::WRITE_FINISHED_PATHNAME); CreateEmptyFile(common::WRITE_FINISHED_CHECK_PATHNAME);
} }
void CreateConsoleInitializedFile() void CreateConsoleInitializedFile()

10
trunk/ConsoleDataMigration/ConsoleRestore/Importer.h
View File

@ -40,7 +40,15 @@ u32 GetImportProgress();
// NANDのごみを削除する // NANDのごみを削除する
void Cleanup(); void Cleanup();
void DeleteConsoleInitializedFile(); const wchar_t* const CHECK_FILENAME_TABLE[] =
{
common::UPDATE_CHECK_PATHNAME,
common::INITIALIZED_CHECK_PATHNAME,
common::WRITE_FINISHED_CHECK_PATHNAME,
common::RTC_SYNC_CHECK_PATHNAME
};
void DeleteAllCheckFiles();
struct TimeZone struct TimeZone
{ {

2
trunk/ConsoleDataMigration/common/FileChecker.h
View File

@ -39,7 +39,7 @@ const wchar_t* const FILENAME_TABLE[EXISTS_MAX] =
common::SERIAL_PATHNAME, common::SERIAL_PATHNAME,
common::IVS_PATHNAME, common::IVS_PATHNAME,
common::INITIALIZED_CHECK_PATHNAME, common::INITIALIZED_CHECK_PATHNAME,
common::WRITE_FINISHED_PATHNAME, common::WRITE_FINISHED_CHECK_PATHNAME,
common::AP_SETTING_PATHNAME, common::AP_SETTING_PATHNAME,
common::RTC_SYNC_CHECK_PATHNAME common::RTC_SYNC_CHECK_PATHNAME
}; };

2
trunk/ConsoleDataMigration/common/FileName.h
View File

@ -45,7 +45,7 @@ const wchar_t* const NAND_DATA_ROOT_PATHNAME_WITH_SLASH = L"nand:/data/";
const wchar_t* const NAND_TWL_PHOTO_DATA_ROOT_PATHNAME_WITH_SLASH = L"twlp:/"; const wchar_t* const NAND_TWL_PHOTO_DATA_ROOT_PATHNAME_WITH_SLASH = L"twlp:/";
const wchar_t* const NAND_TWL_SOUND_DATA_ROOT_PATHNAME_WITH_SLASH = L"twls:/"; const wchar_t* const NAND_TWL_SOUND_DATA_ROOT_PATHNAME_WITH_SLASH = L"twls:/";
const wchar_t* const SDMC_ROOT_DIRECTORY_PATH = L"sdmc:/"; const wchar_t* const SDMC_ROOT_DIRECTORY_PATH = L"sdmc:/";
const wchar_t* const WRITE_FINISHED_PATHNAME = L"sdmc:/CTR_Console_Repair/WriteFinished"; const wchar_t* const WRITE_FINISHED_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/WriteFinished";
const wchar_t* const UPDATE_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/UpdateFinished"; const wchar_t* const UPDATE_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/UpdateFinished";
const wchar_t* const INITIALIZED_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/ConsoleInitialized"; const wchar_t* const INITIALIZED_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/ConsoleInitialized";
const wchar_t* const RTC_SYNC_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/RtcSyncFinished"; const wchar_t* const RTC_SYNC_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/RtcSyncFinished";