latest

kauffman12 · May 12, 2024 · 7823619 · 7823619
1 parent 0a9611e
commit 7823619
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/EQLogParser/Properties/AssemblyInfo.cs b/EQLogParser/Properties/AssemblyInfo.cs
@@ -53,7 +53,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.16")]
-[assembly: AssemblyFileVersion("2.2.16")]
+[assembly: AssemblyVersion("2.2.17")]
+[assembly: AssemblyFileVersion("2.2.17")]
 [assembly: XmlConfigurator(Watch = true)]
 [assembly: SupportedOSPlatform("windows10.0")]
diff --git a/EQLogParser/data/releasenotes.rtf b/EQLogParser/data/releasenotes.rtf
@@ -1,6 +1,14 @@
 {\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Segoe UI;}{\f1\fnil\fcharset2 Symbol;}}
 {\*\generator Riched20 10.0.22621}\viewkind4\uc1 
-\pard\ul\f0\fs20\lang1033 Updates in Version 2.2.16\ulnone\par
+\pard\ul\f0\fs20\lang1033 Updates in Version 2.2.17\ulnone\par
+\par
+
+\pard 
+{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent0\pnstart1\pndec{\pntxta.}}
+\fi-360\li720 Fix for Log Management trying to archive files that are already compressed. Also made the filename check a little smarter to avoid re-arching files that match the archive format.\par
+
+\pard\par
+\ul Updated in Version 2.2.16\ulnone\par
 \par
 
 \pard 

diff --git a/EQLogParser/src/util/FileUtil.cs b/EQLogParser/src/util/FileUtil.cs
@@ -263,7 +263,7 @@ internal static void SetStartingPosition(FileStream f, double time, long left =
       }
     }
 
-    [GeneratedRegex(@"^eqlog_([a-zA-Z]+)_([a-zA-Z]+).*\.txt", RegexOptions.Singleline)]
+    [GeneratedRegex(@"^eqlog_([a-zA-Z]+)_([a-zA-Z]+)(?!.*_\d{5}\.txt$).*\.txt$", RegexOptions.Singleline)]
     private static partial Regex TheFileNameRegex();
   }
 }
diff --git a/EQLogParserInstall/EQLogParserInstall.iss b/EQLogParserInstall/EQLogParserInstall.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "EQLogParser"
-#define MyAppVersion "2.2.16"
+#define MyAppVersion "2.2.17"
 #define MyAppPublisher "Kizant"
 #define MyAppURL "https://github.com/kauffman12/EQLogParser"
 #define MyAppExeName "EQLogParser.exe"

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 Everquest Log Parser for Live/TLP servers with basic support for P99.
 
 Link to DOWNLOAD the latest Installer:</br>
-https://github.com/kauffman12/EQLogParser/raw/master/Release/EQLogParser-install-2.2.16.exe
+https://github.com/kauffman12/EQLogParser/raw/master/Release/EQLogParser-install-2.2.17.exe
 
 ### IMPORTANT --- If after install the Log Search feature crashes and you're missing Syncfusion.Edit.WPF.dll and Syncfusion.GridCommon.WPF.dll from where you installed  EQLogParser.. try running the installer again and choosing Repair to fix the problem.
 

diff --git a/Release/EQLogParser-install-2.2.16.exe b/Release/EQLogParser-install-2.2.16.exe