start2を処理したかをSnifferから取れるようにする

diff --git a/KancolleSniffer.Test/LoggerTest.cs b/KancolleSniffer.Test/LoggerTest.cs
index e12b104..f37a5fa 100644 (file)
--- a/KancolleSniffer.Test/LoggerTest.cs
+++ b/KancolleSniffer.Test/LoggerTest.cs
@@ -38,7 +38,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void InspectMissionResult()\r
         {\r
-            var sniffer = new Sniffer();\r
+            var sniffer = new Sniffer(true);\r
             var result = "";\r
             var header = "";\r
             sniffer.SetLogWriter((path, s, h) =>\r
@@ -46,7 +46,6 @@ namespace KancolleSniffer.Test
                 result += s + "|";\r
                 header = h;\r
             }, () => new DateTime(2015, 1, 1));\r
-            sniffer.SkipMaster();\r
             sniffer.EnableLog(LogType.Mission);\r
             SnifferTest.SniffLogFile(sniffer, "mission_result_001");\r
             PAssert.That(() => "日付,結果,遠征,燃料,弾薬,鋼材,ボーキ,開発資材,高速修復材,高速建造材,改修資材" == header);\r
@@ -60,7 +59,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void MissionResultGetScrew()\r
         {\r
-            var sniffer = new Sniffer();\r
+            var sniffer = new Sniffer(true);\r
             var result = "";\r
             var header = "";\r
             sniffer.SetLogWriter((path, s, h) =>\r
@@ -68,7 +67,6 @@ namespace KancolleSniffer.Test
                 result += s + "|";\r
                 header = h;\r
             }, () => new DateTime(2019, 1, 1));\r
-            sniffer.SkipMaster();\r
             sniffer.EnableLog(LogType.Mission);\r
             SnifferTest.SniffLogFile(sniffer, "mission_result_002");\r
             PAssert.That(() => "日付,結果,遠征,燃料,弾薬,鋼材,ボーキ,開発資材,高速修復材,高速建造材,改修資材" == header);\r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index 075b003..e4553ad 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -31,7 +31,6 @@ namespace KancolleSniffer
         private readonly ResizableToolTip _toolTip = new ResizableToolTip();\r
         private readonly ResizableToolTip _tooltipCopy = new ResizableToolTip {ShowAlways = false, AutomaticDelay = 0};\r
         private readonly ListFormGroup _listFormGroup;\r
-        private bool _started;\r
 \r
         private IEnumerable<IUpdateContext> _updateable;\r
         private IEnumerable<IUpdateTimers> _timers;\r
@@ -113,11 +112,10 @@ namespace KancolleSniffer
             {\r
                 hqPanel.Login.Visible = false;\r
                 mainFleetPanel.Start();\r
-                _started = true;\r
                 Notifier.StopAllRepeat();\r
                 return;\r
             }\r
-            if (!_started)\r
+            if (!Sniffer.Started)\r
                 return;\r
             if (_main.Step.Now == DateTime.MinValue)\r
                 _main.Step.SetNow();\r

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index f719d6b..f4e4f09 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -23,7 +23,6 @@ namespace KancolleSniffer
 {\r
     public class Sniffer\r
     {\r
-        private bool _start;\r
         private readonly ItemMaster _itemMaster = new ItemMaster();\r
         private readonly ItemInventory _itemInventory = new ItemInventory();\r
         private readonly ItemInfo _itemInfo;\r
@@ -86,9 +85,11 @@ namespace KancolleSniffer
             All = (1 << 10) - 1\r
         }\r
 \r
-        public Sniffer(bool start = false)\r
+        public bool Started { get; private set; }\r
+\r
+        public Sniffer(bool started = false)\r
         {\r
-            _start = start;\r
+            Started = started;\r
             _itemInfo = new ItemInfo(_itemMaster, _itemInventory);\r
             _shipInfo = new ShipInfo(_shipMaster, _shipInventory, _itemInventory);\r
             _conditionTimer = new ConditionTimer(_shipInfo);\r
@@ -145,7 +146,7 @@ namespace KancolleSniffer
             {\r
                 return ApiStart(data);\r
             }\r
-            if (!_start)\r
+            if (!Started)\r
                 return Update.None;\r
 \r
             if (url.EndsWith("api_port/port"))\r
@@ -186,7 +187,7 @@ namespace KancolleSniffer
             _miscTextInfo.InspectMaster(data);\r
             _logger.InspectMapInfoMaster(data.api_mst_mapinfo);\r
             SetMapDictionary(data.api_mst_mapinfo);\r
-            _start = true;\r
+            Started = true;\r
             return Update.Start;\r
         }\r
 \r
@@ -694,11 +695,6 @@ namespace KancolleSniffer
             _logger.SetWriter(writer, nowFunc);\r
         }\r
 \r
-        public void SkipMaster()\r
-        {\r
-            _start = true;\r
-        }\r
-\r
         public void EnableLog(LogType type)\r
         {\r
             _logger.EnableLog(type);\r