デバッグログに日付を入れる

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 6eb6186..2b9e86d 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -43,12 +43,14 @@ namespace KancolleSniffer.Test
                     var triple = new List<string>();\r
                     foreach (var s in new[] {"url: ", "request: ", "response: "})\r
                     {\r
-                        var line = stream.ReadLine();\r
-                        ln++;\r
-                        if (line == null)\r
-                            throw new Exception($"ログのurl, request, responseがそろっていません: {ln:d}行目");\r
-                        if (!line.StartsWith(s))\r
-                            throw new Exception($"ログに不正な行が含まれています: {ln:d}行目");\r
+                        string line;\r
+                        do\r
+                        {\r
+                            line = stream.ReadLine();\r
+                            ln++;\r
+                            if (line == null)\r
+                                throw new Exception($"ログの内容がそろっていません: {ln:d}行目");\r
+                        } while (!line.StartsWith(s));\r
                         triple.Add(line.Substring(s.Length));\r
                     }\r
                     var json = JsonParser.Parse(triple[2]);\r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index a54955c..ecf08ed 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -128,7 +128,7 @@ namespace KancolleSniffer
             if (_debugLogFile != null)\r
             {\r
                 File.AppendAllText(_debugLogFile,\r
-                    $"url: {url}\nrequest: {request}\nresponse: {response ?? "(null)"}\n");\r
+                    $"date: {DateTime.Now:g}\nurl: {url}\nrequest: {request}\nresponse: {response ?? "(null)"}\n");\r
             }\r
         }\r
 \r
@@ -328,12 +328,14 @@ namespace KancolleSniffer
             var lines = new List<string>();\r
             foreach (var s in new[] {"url: ", "request: ", "response: "})\r
             {\r
-                // ReSharper disable once PossibleNullReferenceException\r
-                if (!_playLog.MoveNext() || !_playLog.Current.StartsWith(s))\r
+                do\r
                 {\r
-                    labelPlayLog.Visible = false;\r
-                    return;\r
-                }\r
+                    if (!_playLog.MoveNext() || _playLog.Current == null)\r
+                    {\r
+                        labelPlayLog.Visible = false;\r
+                        return;\r
+                    }\r
+                } while (!_playLog.Current.StartsWith(s));\r
                 lines.Add(_playLog.Current.Substring(s.Length));\r
             }\r
             labelPlayLog.Visible = !labelPlayLog.Visible;\r