From 7a9008ba6d343b9779db0da110b90d4355eafc46 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Wed, 29 Jun 2011 08:14:04 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=81=BF=E5=A4=B1?=
 =?UTF-8?q?=E6=95=97=E6=99=82=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=82=BA=E8=AA=BF=E6=95=B4=E3=82=92=E6=AD=A3?=
 =?UTF-8?q?=E3=81=97=E3=81=8F=20IVS=E3=81=AE=E3=82=A4=E3=83=B3=E3=83=9D?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=82=92=E5=86=8D=E8=B5=B7=E5=8B=95=E7=9B=B4?=
 =?UTF-8?q?=E5=89=8D=E3=81=AB=E7=A7=BB=E5=8B=95?=
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@348 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp        | 15 ++++++++++++---
 .../sources/ConsoleRestore/Importer.cpp          |  9 +++++----
 .../sources/ConsoleRestore/Importer.h            |  3 +++
 .../sources/common/FileTransfer.cpp              | 16 ++++++++++++----
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 560c971..19d2a95 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -1260,10 +1260,19 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
         case POST_RESTORE:
         {
             operationMessage.push_back(::std::string("Post Process..."));
-            // 書き込み完了ファイルを作成
-            CreateWriteFinishedFile();
 
-            s_RestoreState = RESTORE_DONE;
+            // SDカードのIVSファイルを書き込む
+            if(ImportIvsData())
+            {
+                // 書き込み完了ファイルを作成
+                CreateWriteFinishedFile();
+
+                s_RestoreState = RESTORE_DONE;
+            }
+            else
+            {
+                s_RestoreState = FAIL;
+            }
         }
         break;
 
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index 446f25d..581511f 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -690,6 +690,11 @@ nn::Result ImportIvs()
     return result;
 }
 
+bool ImportIvsData()
+{
+    return ImportIvs().IsSuccess();
+}
+
 void ImportThreadFunc()
 {
     nn::Result result;
@@ -1856,10 +1861,6 @@ nn::Result ImportData()
         // NANDのごみを削除する
         Cleanup();
 
-        // SDカードのIVSファイルを書き込む
-        result = ImportIvs();
-        NN_UTIL_RETURN_IF_FAILED(result);
-
         // NORデータを書き込む
         result = ImportNorData();
         NN_UTIL_RETURN_IF_FAILED(result);
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
index cbe3cb5..b55c9d4 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
@@ -154,6 +154,9 @@ nn::Result ReadVersionData();
 // SDカードのNintendo 3DS以下ににIVSと一致するディレクトリがあるかどうか
 bool ExistsIvsDirectory(std::string& ivsRoot);
 
+// SDカードのIVSデータを書き込む
+bool ImportIvsData();
+
 }
 
 #endif /* IMPORTER_H_ */
diff --git a/trunk/ConsoleDataMigration/sources/common/FileTransfer.cpp b/trunk/ConsoleDataMigration/sources/common/FileTransfer.cpp
index 4678c06..c07bac5 100644
--- a/trunk/ConsoleDataMigration/sources/common/FileTransfer.cpp
+++ b/trunk/ConsoleDataMigration/sources/common/FileTransfer.cpp
@@ -625,7 +625,6 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
                                                 target_from.str().c_str(), target_tmp.str().c_str(),
                                                 target_to.str().c_str()))
                                         {
-                                            s_FinishedFileSize -= readsize;
                                             ret_value = false;
                                         }
                                         break;
@@ -646,6 +645,12 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
             }
             from_file.Finalize();
         }
+
+        // 1ファイルごとの結果確認
+        if(!ret_value)
+        {
+            break;
+        }
     }
 
     from_dir.Finalize();
@@ -799,9 +804,12 @@ bool ConfirmFile(nn::fs::FileInputStream* from_file, nn::fs::FileStream* to_file
     else
     {
         NN_LOG("Verification Success %s, Rename\n", GetCharStr(sdPath));
-        // 削除する
-        nn::fs::TryDeleteFile(truePath);
-        // リネームする
+        // 書き込み先を削除する
+        result = nn::fs::TryDeleteFile(truePath);
+        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        // 正しいファイル名にリネームする
+
+
         result = nn::fs::TryRenameFile(tmpPath, truePath);
         COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
         if (result.IsFailure())