Merge branch develop v1.4.10.3814-Stable

Author: anoyetta

CURRENT_VERSION

@@ -1 +1 @@
-v1.4.9.4811-Stable
+v1.4.10.3814-Stable

RELEASE_NOTES.xml

@@ -559,4 +559,14 @@
      * [Minor] sharlayan のローカルキャッシュのクリアを修正した
     </description>
   </note>
+
+  <note>
+    <version>1.4.10.3814</version>
+    <channel>Stable</channel>
+    <timestamp>2020-04-14T14:31:31.1375768+09:00</timestamp>
+    <uri>https://github.com/anoyetta/RINGS/releases/download/v1.4.10.3814-Stable/RINGS_v1_4_10_3814_Stable.zip</uri>
+    <description>
+     * [Minor] sharlayan からのログの出力を追加した
+    </description>
+  </note>
 </release_notes>

source/RINGS/Common/ChatLogger.cs

@@ -9,6 +9,12 @@ public static class ChatLogger
     {
         private static readonly Lazy<Logger> LazyLogger = new Lazy<Logger>(() => LogManager.GetLogger("RINGSChatLogger"));
 
+        public static void WriteRaw(
+            string raw)
+        {
+            LazyLogger.Value.Trace(raw);
+        }
+
         public static void Write(
             string channel,
             string speaker,

source/RINGS/Controllers/SharlayanController.cs

@@ -342,7 +342,11 @@ private void SubscribeChatLog()
                     if (isExistLogs)
                     {
                         var models = targetLogs
-                            .Select(x => ChatLogModel.FromXIVLog(x, this.currentPlayerNames))
+                            .Select(x =>
+                            {
+                                ChatLogger.WriteRaw(x.Raw);
+                                return ChatLogModel.FromXIVLog(x, this.currentPlayerNames);
+                            })
                             .ToArray();
 
                         WPFHelper.Dispatcher.Invoke(() =>

source/RINGS/Models/ChatLogModel.cs

@@ -660,8 +660,8 @@ public static ChatLogModel FromXIVLog(
             if (i < 0)
             {
                 // sharlayan がパッチに対応していないときの回避策
-                i = xivLog.Line.IndexOf(".");
                 speakerSafix = ".";
+                i = xivLog.Line.IndexOf(speakerSafix);
             }
 
             if (i >= 0)

source/RINGS/Version.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.4.9.4811")]
+[assembly: AssemblyVersion("1.4.10.3814")]
 [assembly: AssemblyConfiguration("Stable")]