提交: 16aa2530b73b6933b8f79103674dddf7219e6602 - KancolleSniffer (git)

Commit MetaInfo

• 修订版: 16aa2530b73b6933b8f79103674dddf7219e6602 (tree)
• 时间: 2020-09-27 20:39:40
• 作者: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

7-3-Dの海戦報告書が正しく表示されないのを直す

更改概述

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

差异

--- a/KancolleSniffer.Test/LogProcessorTest.cs
+++ b/KancolleSniffer.Test/LogProcessorTest.cs
@@ -72,6 +72,27 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 敵艦隊名がカンマを含む海戦・ドロップ報告書を加工する
+        /// </summary>
+        [TestMethod]
+        public void BattleLogWithComma()
+        {
+            var processor = new LogProcessor();
+            var log = new[]
+            {
+                "2020-09-27 19:49:04,ペナン島沖,4,,S,同航戦,単縦陣,梯形陣,深海5,500t級軽巡洋艦,駆逐艦,神風," +
+                "羽黒改二(Lv159),64/64,足柄改二(Lv159),60/63,神風改(Lv99),23/23,島風改(Lv158),41/41,Gotland andra(Lv136),53/53,,," +
+                "軽巡ホ級(flagship),0/53,駆逐ロ級後期型,0/37,駆逐ロ級後期型,0/37,,,,,,,9,0,制空権確保,7-3",
+            };
+            var result = processor.Process(log, "海戦・ドロップ報告書.csv", DateTime.MinValue, DateTime.MaxValue, false);
+            PAssert.That(() =>
+                result.First() ==
+                "[\"2020-09-27 19:49:04\",\"ペナン島沖\",\"4\",\"\",\"S\",\"同航戦\",\"単縦陣\",\"梯形陣\",\"深海5,500t級軽巡洋艦\",\"駆逐艦\",\"神風\"," +
+                "\"羽黒改二(Lv159)\",\"64/64\",\"足柄改二(Lv159)\",\"60/63\",\"神風改(Lv99)\",\"23/23\",\"島風改(Lv158)\",\"41/41\",\"Gotland andra(Lv136)\",\"53/53\",\"\",\"\"," +
+                "\"軽巡ホ級(flagship)\",\"0/53\",\"駆逐ロ級後期型\",\"0/37\",\"駆逐ロ級後期型\",\"0/37\",\"\",\"\",\"\",\"\",\"\",\"\",\"9\",\"0\",\"確保\",\"\",\"\",\"7-3\"]");
+        }
+
+        /// <summary>
         /// 資材ログの最後に現在値を示すレコードを追加する
         /// </summary>
         [TestMethod]

--- a/KancolleSniffer/Log/BattleLogProcessor.cs
+++ b/KancolleSniffer/Log/BattleLogProcessor.cs
@@ -43,7 +43,14 @@ namespace KancolleSniffer.Log
                 case 39:
                     map = data[38];
                     break;
-                case 40: // 七隻分のログが出力されている
+                case 40:
+                    if (data[8] == "深海5" && data[9] == "500t級軽巡洋艦")
+                    {
+                        data[8] = "深海5,500t級軽巡洋艦";
+                        Array.Copy(data, 10, data, 9, 30);
+                        goto case 39;
+                    }
+                    // 七隻分のログが出力されている
                     data[21] = data[21] + "・" + data[23];
                     data[22] = data[22] + "・" + data[24];
                     Array.Copy(data, 24, data, 23, 15);