Commit: e252d359b55626b89ff0329ad6734415b6bf6cd8 - KancolleSniffer (git)

Commit MetaInfo

• Revisión: e252d359b55626b89ff0329ad6734415b6bf6cd8 (tree)
• Tiempo: 2020-02-21 19:35:48
• Autor: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

LogProcessorのリファクタリング

Cambiar Resumen

• modified: KancolleSniffer.Test/LogProcessorTest.cs
• modified: KancolleSniffer/Log/BattleLogProcessor.cs
• modified: KancolleSniffer/Log/LogProcessor.cs

Diferencia incremental

--- a/KancolleSniffer.Test/LogProcessorTest.cs
+++ b/KancolleSniffer.Test/LogProcessorTest.cs
@@ -173,5 +173,26 @@ namespace KancolleSniffer.Test
             var excel = "2018/9/10 20:13";
             PAssert.That(() => "[\"2018-09-10 20:13:00\"" + expected == dateProcessor(excel), "Excelの形式から変換する");
         }
+
+        /// <summary>
+        /// 壊れたログを取り除く
+        /// </summary>
+        [TestMethod]
+        public void TruncatedLog()
+        {
+            var processor = new LogProcessor();
+            var logs = new[]
+            {
+                "2014-12-15 23:10:34,29734,29855,28016,41440,1407,1529,2151,13",
+                "2014-12-15 23:13:29,29709,29819,28019,41440,1407,1529,21",
+                "2014-12-15 23:16:06,29710,29819,28018,41440,1407,1529,2151,13"
+            };
+            var result = processor.Process(logs, "資材ログ", DateTime.MinValue, DateTime.MaxValue, true);
+            PAssert.That(() => result.SequenceEqual(new[]
+            {
+                "[1418652634000,29734,29855,28016,41440,1407,1529,2151,13]",
+                ",\n[1418652966000,29710,29819,28018,41440,1407,1529,2151,13]"
+            }));
+        }
     }
 }
\ No newline at end of file

--- a/KancolleSniffer/Log/BattleLogProcessor.cs
+++ b/KancolleSniffer/Log/BattleLogProcessor.cs
@@ -20,7 +20,7 @@ using KancolleSniffer.Model;
 
 namespace KancolleSniffer.Log
 {
-    public class BattleLogProcessor
+    public class BattleLogProcessor : LogProcessor.Processor
     {
         private readonly Dictionary<string, string> _mapDictionary;
 
@@ -29,7 +29,7 @@ namespace KancolleSniffer.Log
             _mapDictionary = mapDictionary ?? new Dictionary<string, string>();
         }
 
-        public string[] Process(string[] data)
+        public override string[] Process(string[] data)
         {
             string map;
             switch (data.Length)
@@ -49,8 +49,10 @@ namespace KancolleSniffer.Log
                     Array.Copy(data, 24, data, 23, 15);
                     goto case 38;
                 default:
-                    return data;
+                    Skip = true;
+                    return null;
             }
+            Skip = false;
             if (data[5] == "Ｔ字戦(有利)")
                 data[5] = "Ｔ字有利";
             if (data[5] == "Ｔ字戦(不利)")

--- a/KancolleSniffer/Log/LogProcessor.cs
+++ b/KancolleSniffer/Log/LogProcessor.cs
@@ -32,40 +32,55 @@ namespace KancolleSniffer.Log
             _battleLogProcessor = new BattleLogProcessor(mapDictionary);
         }
 
-        public IEnumerable<string> Process(IEnumerable<string> lines, string path, DateTime from, DateTime to,
-            bool number, DateTime now = default)
+        public class Processor
         {
-            var fields = 0;
-            var mission = false;
-            var battle = false;
-            var material = false;
-            switch (Path.GetFileNameWithoutExtension(path))
+            protected virtual int Fields { get; }
+            public bool Skip { get; protected set; }
+
+            public Processor()
             {
-                case "遠征報告書":
-                    mission = true;
-                    fields = 11;
-                    break;
-                case "改修報告書":
-                    fields = 15;
-                    break;
-                case "海戦・ドロップ報告書":
-                    fields = 40;
-                    battle = true;
-                    break;
-                case "開発報告書":
-                    fields = 9;
-                    break;
-                case "建造報告書":
-                    fields = 12;
-                    break;
-                case "資材ログ":
-                    fields = 9;
-                    material = true;
-                    break;
-                case "戦果":
-                    fields = 3;
-                    break;
             }
+
+            public Processor(int fields)
+            {
+                Fields = fields;
+            }
+
+            public virtual string[] Process(string[] data)
+            {
+                Skip = data.Length != Fields;
+                return Skip ? null : data;
+            }
+        }
+
+        private class MissionProcessor : Processor
+        {
+            protected override int Fields { get; } = 11;
+
+            public override string[] Process(string[] data)
+            {
+                return data.Concat(new[] {"0"}).Take(Fields).ToArray();
+            }
+        }
+
+        private class MaterialProcessor : Processor
+        {
+            protected override int Fields { get; } = 9;
+
+            public override string[] Process(string[] data)
+            {
+                if (data.Length >= Fields)
+                    Array.Resize(ref data, Fields);
+                return base.Process(data);
+            }
+        }
+
+        public IEnumerable<string> Process(IEnumerable<string> lines, string path, DateTime from, DateTime to,
+            bool number, DateTime now = default)
+        {
+            var logName = Path.GetFileNameWithoutExtension(path);
+            var currentMaterial = logName == "資材ログ" && !number;
+            var processor = DecideProcessor(logName);
             var delimiter = "";
             foreach (var line in lines)
             {
@@ -78,14 +93,8 @@ namespace KancolleSniffer.Log
                 if (date < from)
                     continue;
                 data[0] = Logger.FormatDateTime(date);
-                var entries = data;
-                if (mission)
-                    entries = data.Concat(new[] {"0"}).Take(fields).ToArray();
-                if (material)
-                    entries = data.Take(fields).ToArray();
-                if (battle)
-                    entries = _battleLogProcessor.Process(data);
-                if (entries.Length != fields)
+                var entries = processor.Process(data);
+                if (processor.Skip)
                     continue;
                 var result =
                     number
@@ -94,11 +103,34 @@ namespace KancolleSniffer.Log
                 delimiter = ",\n";
                 yield return result;
             }
-            if (material && !number) // 資材の現在値を出力する
+            if (currentMaterial) // 資材の現在値を出力する
                 yield return delimiter + "[\"" + Logger.FormatDateTime(now) + "\",\"" +
                              string.Join("\",\"", _materialCount.Select(c => c.Now)) + "\"]";
         }
 
+        private Processor DecideProcessor(string logName)
+        {
+            switch (logName)
+            {
+                case "遠征報告書":
+                    return new MissionProcessor();
+                case "改修報告書":
+                    return new Processor(15);
+                case "海戦・ドロップ報告書":
+                    return _battleLogProcessor;
+                case "開発報告書":
+                    return new Processor(9);
+                case "建造報告書":
+                    return new Processor(12);
+                case "資材ログ":
+                    return new MaterialProcessor();
+                case "戦果":
+                    return new Processor(3);
+                default:
+                    return new Processor();
+            }
+        }
+
         private DateTime ParseDateTime(string dateTime)
         {
             if (DateTime.TryParseExact(dateTime, Logger.DateTimeFormat, CultureInfo.InvariantCulture,