エラーログのレスポンスからapi_resultを取り除くのをやめる

diff --git a/KancolleSniffer.Test/ErrorLogTest.cs b/KancolleSniffer.Test/ErrorLogTest.cs
index e2672f1..222df1f 100644 (file)
--- a/KancolleSniffer.Test/ErrorLogTest.cs
+++ b/KancolleSniffer.Test/ErrorLogTest.cs
@@ -43,14 +43,13 @@ namespace KancolleSniffer.Test
         public void RemoveUnwantedInformationFromResponse()\r
         {\r
             var request = "";\r
-            var response = @"{""api_result"":1,""api_result_msg"":""成功"",""api_data"":"+\r
-                            @"{""api_basic"":{""api_member_id"":""123456""," +\r
-                            @"""api_nickname"":""ぱんなこった"",""api_nickname_id"":""12345678"",""api_active_flag"":1}}}";\r
+            var response = @"{""api_result"":1,""api_result_msg"":""成功"",""api_data"":" +\r
+                           @"{""api_basic"":{""api_member_id"":""123456""," +\r
+                           @"""api_nickname"":""ぱんなこった"",""api_nickname_id"":""12345678"",""api_active_flag"":1}}}";\r
             ErrorLog.RemoveUnwantedInformation(ref request, ref response);\r
-            PAssert.That(() => response == @"{""api_basic"":{""api_active_flag"":1}}");\r
-            var response2 = @"{""api_result"":1,""api_result_msg"":""成功""}";\r
-            ErrorLog.RemoveUnwantedInformation(ref request, ref response2);\r
-            PAssert.That(() => response2 == @"");\r
+            PAssert.That(() => response ==\r
+                               @"{""api_result"":1,""api_result_msg"":""成功"",""api_data"":" +\r
+                               @"{""api_basic"":{""api_active_flag"":1}}}");\r
         }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/ErrorLog.cs b/KancolleSniffer/ErrorLog.cs
index 1a8cdd7..1134980 100644 (file)
--- a/KancolleSniffer/ErrorLog.cs
+++ b/KancolleSniffer/ErrorLog.cs
@@ -114,8 +114,6 @@ namespace KancolleSniffer
             request = token.Replace(request, "");\r
             var id = new Regex(@"""api_member_id"":""\d+?"",?|""api_nickname"":"".+?"",?|""api_nickname_id"":""\d+"",?");\r
             response = id.Replace(response, "");\r
-            var preamble = new Regex(@"^{""api_result"":.+?({.*})?}$");\r
-            response = preamble.Replace(response, match => match.Groups[1].Value);\r
         }\r
 \r
         private string CompressApi(string api)\r