From 598bcca47c998bd4fa49eac5eb5ae70f06a4046e Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 20 May 2011 11:36:09 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E5=89=8A=E9=99=A4=E5=BE=8C=E5=86=8D=E8=B5=B7=E5=8B=95=E3=81=97?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=20=E3=82=A2?=
 =?UTF-8?q?=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88=E8=BB=A2=E9=80=81=E5=89=8D?=
 =?UTF-8?q?=E3=81=AB=E5=85=A5=E5=8A=9B=E3=82=92=E5=BE=85=E3=81=A4=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=20=E5=90=8C=E4=B8=80=E6=9C=AC=E4=BD=93?=
 =?UTF-8?q?=E6=9B=B8=E3=81=8D=E6=88=BB=E3=81=97=E3=81=AE=E5=A0=B4=E5=90=88?=
 =?UTF-8?q?=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88=E8=BB=A2=E9=80=81?=
 =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E3=82=B9=E3=82=AD=E3=83=83=E3=83=97?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
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@263 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp     | 49 ++++++++++++++++---
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 0bf447a..9e17522 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -106,6 +106,7 @@ typedef enum RestoreState
     UPDATE_DONE, // アップデート完了
     NUP_ONLY_WAIT_SD_EJECT, // NUP_ONLYモードでSDカード抜き待ち
     NUP_ONLY_WAIT_NEXT, // NUP_ONLYモードでキー入力待ち
+    WAIT_START_TRANSFER_ACCOUNT, // アカウント転送開始入力まち
     TRANSFER_ACCOUNT, // アカウント転送を完了させる
     TRANSFER_ACCOUNT_DONE, // アカウント転送完了
     DOWNLOAD_IVS, // インフラからIVSを取得する
@@ -304,11 +305,18 @@ void CheckAccountDeleted(common::HardwareStateManager& manager, ::std::vector<st
         if(EqualsDeviceIdFileandDeviceId(manager).IsSuccess())
         {
             CreateDeleteAccountFinishedFile();
-            CheckAccountTransfered(manager, message, goNextStep);
+            // IVS専用モードならばIVSを取得させる
+            if(s_GetIvsOnlyMode)
+            {
+                CheckDownloadIvs(manager, message, goNextStep);
+            }
+            else
+            {
+                CheckWriteFinished(manager, message, goNextStep);
+            }
         }
         else
         {
-            COMMON_LOGGER("Delete Account\n");
             s_RestoreState = WAIT_START_DELETE_ACCOUNT;
         }
     }
@@ -325,7 +333,7 @@ void CheckAccountTransfered(common::HardwareStateManager& manager, ::std::vector
     else
     {
         COMMON_LOGGER("Transfer Account\n");
-        s_RestoreState = TRANSFER_ACCOUNT;
+        s_RestoreState = WAIT_START_TRANSFER_ACCOUNT;
     }
 }
 
@@ -543,7 +551,10 @@ void ShopOperationSingleTemplate(
         }
         // IVSがアップロードされていない場合もあるため
         // IVSを取得できない状況も成功として扱う
-        else if(op == SHOP_OPERATION_GET_IVS && GetShopOperationSingleResult() == nn::nim::ResultCannotGetIvs())
+        // IVSサイズが違う場合も成功として扱う
+        else if(op == SHOP_OPERATION_GET_IVS && ( GetShopOperationSingleResult() == nn::nim::ResultCannotGetIvs()  ||
+                GetShopOperationSingleResult() == nn::nim::ResultInvalidData()
+        ))
         {
             ShopOperationSuccess(op, logMessage, nextState);
         }
@@ -972,6 +983,24 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
         }
         break;
 
+        case WAIT_START_TRANSFER_ACCOUNT:
+        {
+            operationMessage.push_back(::std::string("Push A or START Button"));
+            operationMessage.push_back(::std::string("Transfer Account Mode"));
+            if (!s_PlayedStartCursor)
+            {
+                PlaySound(SOUND_CURSOR);
+                s_PlayedStartCursor = true;
+            }
+
+            if (nextStep)
+            {
+                COMMON_LOGGER("Transfer Account\n");
+                s_RestoreState = TRANSFER_ACCOUNT;
+            }
+        }
+        break;
+
         case TRANSFER_ACCOUNT:
         {
             ShopOperationSingleTemplate(manager, operationMessage, SHOP_OPERATION_CONNECT, "Transfer Account",
@@ -1025,7 +1054,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                 operationMessage.push_back(::std::string("Delete Account Done."));
                 operationMessage.push_back(::std::string("Operate BMS."));
                 operationMessage.push_back(::std::string(""));
-                operationMessage.push_back(::std::string("Press A or START Button to Reboot"));
+                operationMessage.push_back(::std::string("Press A or START Button to Continue"));
 
                 if (!s_PlayedRebootCursor)
                 {
@@ -1035,7 +1064,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
 
                 if (nextStep)
                 {
-                    s_RestoreState = REBOOTING;
+                    s_RestoreState = STARTUP;
                 }
             }
         }
@@ -1076,6 +1105,8 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                 init = false;
             }
 
+            PutAliveMessage(operationMessage, "Importing TWL Sound Data");
+
             // 処理が完了した
             if (IsImportThreadFinished())
             {
@@ -1096,6 +1127,8 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                 init = false;
             }
 
+            PutAliveMessage(operationMessage, "Importing TWL Photo Data");
+
             // 処理が完了した
             if (IsImportThreadFinished())
             {
@@ -1120,6 +1153,8 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                 s_RestoreState = FAIL;
             }
 
+            PutAliveMessage(operationMessage, "Importing Nand Data");
+
             // 処理が完了した
             if (!NeedsAcAdater(manager) && IsImportThreadFinished())
             {
@@ -1289,6 +1324,8 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                 init = false;
             }
 
+            PutAliveMessage(operationMessage, "Importing TWL SaveData");
+
             // 処理が完了した
             if (IsImportThreadFinished())
             {