From 92c972d9e0e06f80772be39919d8d656435fdfc5 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Thu, 10 Feb 2011 02:27:45 +0000
Subject: [PATCH] =?UTF-8?q?=E6=99=82=E8=A8=88=E3=81=82=E3=82=8F=E3=81=9B?=
 =?UTF-8?q?=E7=B5=82=E4=BA=86=E5=BE=8C=E3=81=AB=E3=83=AA=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=82=A2=E7=8A=B6=E6=85=8B=E7=AE=A1=E7=90=86=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=82=92=E3=81=99=E3=81=B9=E3=81=A6=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 .../ConsoleRestore/Controller.cpp                     |  5 ++++-
 .../ConsoleDataMigration/ConsoleRestore/Importer.cpp  | 11 +++++++----
 trunk/ConsoleDataMigration/ConsoleRestore/Importer.h  | 10 +++++++++-
 trunk/ConsoleDataMigration/common/FileChecker.h       |  2 +-
 trunk/ConsoleDataMigration/common/FileName.h          |  2 +-
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
index 2384767..2a8acae 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Controller.cpp
@@ -636,6 +636,8 @@ void ControlState(::std::vector<std::string>& operationMessage, bool& nextStep,
                     s_RestoreState = FAIL;
                 }
 
+                // リストア状態チェックファイルをすべて削除
+                DeleteAllCheckFiles();
             }
         }
         break;
@@ -740,7 +742,8 @@ u32 GetProgress()
     {
         return GetImportProgress();
     }
-    else if(s_RestoreState == UPDATE_IN_PROGRESS)
+    else if(s_RestoreState == UPDATE_IN_PROGRESS ||
+            s_RestoreState == UPDATE_DONE)
     {
         return GetUpdateProgress();
     }
diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
index fe19cb8..957d1f6 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
@@ -669,14 +669,17 @@ void Cleanup()
     COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 }
 
-void DeleteConsoleInitializedFile()
+void DeleteAllCheckFiles()
 {
     nn::Result result;
     common::SdMountManager::Mount();
 
-    result = nn::fs::TryDeleteFile(common::INITIALIZED_CHECK_PATHNAME);
-    COMMON_LOGGER_RESULT_IF_FAILED(result);
+    for(u32 i = 0; i <  sizeof(CHECK_FILENAME_TABLE) / sizeof(CHECK_FILENAME_TABLE[0]); i++)
+    {
+        result = nn::fs::TryDeleteFile(CHECK_FILENAME_TABLE[i]);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
 
+    }
     common::SdMountManager::Unmount();
 }
 
@@ -693,7 +696,7 @@ bool IsImportFinished()
 
 void CreateWriteFinishedFile()
 {
-    CreateEmptyFile(common::WRITE_FINISHED_PATHNAME);
+    CreateEmptyFile(common::WRITE_FINISHED_CHECK_PATHNAME);
 }
 
 void CreateConsoleInitializedFile()
diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h
index fa3b7f9..881175f 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.h
@@ -40,7 +40,15 @@ u32 GetImportProgress();
 // NANDのごみを削除する
 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
 {
diff --git a/trunk/ConsoleDataMigration/common/FileChecker.h b/trunk/ConsoleDataMigration/common/FileChecker.h
index f959105..9c9928a 100644
--- a/trunk/ConsoleDataMigration/common/FileChecker.h
+++ b/trunk/ConsoleDataMigration/common/FileChecker.h
@@ -39,7 +39,7 @@ const wchar_t* const FILENAME_TABLE[EXISTS_MAX] =
         common::SERIAL_PATHNAME,
         common::IVS_PATHNAME,
         common::INITIALIZED_CHECK_PATHNAME,
-        common::WRITE_FINISHED_PATHNAME,
+        common::WRITE_FINISHED_CHECK_PATHNAME,
         common::AP_SETTING_PATHNAME,
         common::RTC_SYNC_CHECK_PATHNAME
 };
diff --git a/trunk/ConsoleDataMigration/common/FileName.h b/trunk/ConsoleDataMigration/common/FileName.h
index 2f1d023..ad1234b 100644
--- a/trunk/ConsoleDataMigration/common/FileName.h
+++ b/trunk/ConsoleDataMigration/common/FileName.h
@@ -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_SOUND_DATA_ROOT_PATHNAME_WITH_SLASH = L"twls:/";
 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 INITIALIZED_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/ConsoleInitialized";
 const wchar_t* const RTC_SYNC_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/RtcSyncFinished";