From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sat, 20 Jan 2018 09:12:20 +0000 (+0900)
Subject: エラーログのレスポンスからapi_resultを取り除くのをやめる
X-Git-Tag: v10.0~2
X-Git-Url: http://git.osdn.net/view?p=kancollesniffer%2FKancolleSniffer.git;a=commitdiff_plain;h=4a20a44c7341afe28c0002ed995f1785f2b215d8

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

diff --git a/KancolleSniffer.Test/ErrorLogTest.cs b/KancolleSniffer.Test/ErrorLogTest.cs
index e2672f1..222df1f 100644
--- a/KancolleSniffer.Test/ErrorLogTest.cs
+++ b/KancolleSniffer.Test/ErrorLogTest.cs
@@ -43,14 +43,13 @@ namespace KancolleSniffer.Test
         public void RemoveUnwantedInformationFromResponse()
         {
             var request = "";
-            var response = @"{""api_result"":1,""api_result_msg"":""成功"",""api_data"":"+
-                            @"{""api_basic"":{""api_member_id"":""123456""," +
-                            @"""api_nickname"":""ぱんなこった"",""api_nickname_id"":""12345678"",""api_active_flag"":1}}}";
+            var response = @"{""api_result"":1,""api_result_msg"":""成功"",""api_data"":" +
+                           @"{""api_basic"":{""api_member_id"":""123456""," +
+                           @"""api_nickname"":""ぱんなこった"",""api_nickname_id"":""12345678"",""api_active_flag"":1}}}";
             ErrorLog.RemoveUnwantedInformation(ref request, ref response);
-            PAssert.That(() => response == @"{""api_basic"":{""api_active_flag"":1}}");
-            var response2 = @"{""api_result"":1,""api_result_msg"":""成功""}";
-            ErrorLog.RemoveUnwantedInformation(ref request, ref response2);
-            PAssert.That(() => response2 == @"");
+            PAssert.That(() => response ==
+                               @"{""api_result"":1,""api_result_msg"":""成功"",""api_data"":" +
+                               @"{""api_basic"":{""api_active_flag"":1}}}");
         }
     }
 }
\ No newline at end of file
diff --git a/KancolleSniffer/ErrorLog.cs b/KancolleSniffer/ErrorLog.cs
index 1a8cdd7..1134980 100644
--- a/KancolleSniffer/ErrorLog.cs
+++ b/KancolleSniffer/ErrorLog.cs
@@ -114,8 +114,6 @@ namespace KancolleSniffer
             request = token.Replace(request, "");
             var id = new Regex(@"""api_member_id"":""\d+?"",?|""api_nickname"":"".+?"",?|""api_nickname_id"":""\d+"",?");
             response = id.Replace(response, "");
-            var preamble = new Regex(@"^{""api_result"":.+?({.*})?}$");
-            response = preamble.Replace(response, match => match.Groups[1].Value);
         }
 
         private string CompressApi(string api)