v1.1.4 Changes

Taicanium · Sep 2, 2024 · 43f8e44 · 43f8e44
1 parent 2d762d9
commit 43f8e44
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 132 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 1.1.4 - 02/09/2024
+- Migrated to .NET 8.0
+- Fixed detection of broken eicon and icon tags.
+- Refactored color tag selection.
+- Many, many changes and optimizations to assembly-level code.
+- Massive refactoring of XAML backend interactions, including additional data bindings for sharing info between tabs.
+
 # 1.1.3.15 - 02/07/2024
 - Fixed a crash occurring when the user mouses over a UI object during single-file processing.
 

diff --git a/ContextSettings.cs b/ContextSettings.cs
@@ -11,13 +11,16 @@ public class ContextSettings : INotifyPropertyChanged
 		private DateTime? _afterDate;
 		private DateTime? _beforeDate;
 		private string _corruptedTimestamps = "Corrupted Timestamps:";
+		private bool? _divideLogs = false;
 		private string _emptyMessages = "Empty Messages:";
 		private string _exception = "";
 		private string _intactMessages = "Intact Messages:";
 		private string _logHeader = "Ready to receive data.";
 		private double _progress = 0.0;
 		private double _progressMax = 100.0;
 		private string _runLabel = "Run";
+		private bool? _saveHTML = false;
+		private bool? _saveTruncated = false;
 		private string _themeLabel = "Dark";
 		private string _truncatedMessages = "Truncated Messages:";
 		private string _unreadData = "Unread Data:";
@@ -26,6 +29,7 @@ public class ContextSettings : INotifyPropertyChanged
 		public DateTime? AfterDate { get => _afterDate; set { _afterDate = value; OnPropertyChanged(); } }
 		public DateTime? BeforeDate { get => _beforeDate; set { _beforeDate = value; OnPropertyChanged(); } }
 		public string CorruptedTimestamps { get => _corruptedTimestamps; set { _corruptedTimestamps = value; OnPropertyChanged(); } }
+		public bool? DivideLogs { get => _divideLogs; set { _divideLogs = value; OnPropertyChanged(); } }
 		public string EmptyMessages { get => _emptyMessages; set { _emptyMessages = value; OnPropertyChanged(); } }
 		public string Exception { get => _exception; set { _exception = value; OnPropertyChanged(); } }
 		public string IntactMessages { get => _intactMessages; set { _intactMessages = value; OnPropertyChanged(); } }
@@ -34,6 +38,8 @@ public class ContextSettings : INotifyPropertyChanged
 		public double ProgressMax { get => _progressMax; set { _progressMax = value; OnPropertyChanged(); } }
 		public event PropertyChangedEventHandler? PropertyChanged;
 		public string RunLabel { get => _runLabel; set { _runLabel = value; OnPropertyChanged(); } }
+		public bool? SaveHTML { get => _saveHTML; set { _saveHTML = value; OnPropertyChanged(); } }
+		public bool? SaveTruncated { get => _saveTruncated; set { _saveTruncated = value; OnPropertyChanged(); } }
 		public string ThemeLabel { get => _themeLabel; set { _themeLabel = value; OnPropertyChanged(); } }
 		public string TruncatedMessages { get => _truncatedMessages; set { _truncatedMessages = value; OnPropertyChanged(); } }
 		public string UnreadData { get => _unreadData; set { _unreadData = value; OnPropertyChanged(); } }

diff --git a/FLogS.csproj b/FLogS.csproj
@@ -1,42 +1,43 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UseWPF>true</UseWPF>
-    <Title>FLogS</Title>
-    <Version>1.1.4</Version>
-    <Authors>Taica</Authors>
+	<OutputType>WinExe</OutputType>
+	<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+	<Nullable>enable</Nullable>
+	<ImplicitUsings>enable</ImplicitUsings>
+	<UseWPF>true</UseWPF>
+	<Title>FLogS</Title>
+	<Version>1.1.4</Version>
+	<Authors>Taica</Authors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebugType>embedded</DebugType>
+	<DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DebugType>embedded</DebugType>
+	<DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <PropertyGroup>
-    <SourceRevisionId>build$([System.DateTime]::UtcNow.ToString("yyyyMMdd"))</SourceRevisionId>
-    <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
+	<SourceRevisionId>build$([System.DateTime]::UtcNow.ToString("yyyyMMdd"))</SourceRevisionId>
+	<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
+	<NeutralLanguage>en-US</NeutralLanguage>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Update="Properties\Settings.Designer.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
+	<Compile Update="Properties\Settings.Designer.cs">
+	  <DesignTimeSharedInput>True</DesignTimeSharedInput>
+	  <AutoGen>True</AutoGen>
+	  <DependentUpon>Settings.settings</DependentUpon>
+	</Compile>
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
+	<None Update="Properties\Settings.settings">
+	  <Generator>SettingsSingleFileGenerator</Generator>
+	  <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+	</None>
   </ItemGroup>
 
 </Project>
diff --git a/KNOWN.md b/KNOWN.md
@@ -1,6 +1,7 @@
 # Known Issues
 - Ads are read correctly as they are in later versions, but much older clients didn't record ads as uniquely ID'd messages - they appear to have just been plaintext, with no delimiter. Reading them causes patches of garbage.
 - The scrollbar on the log window cannot be enabled under any circumstances, as in I have memory-manipulated it to be active and it still doesn't work. This presents a problem with viewing error messages when they appear.
+- We don't currently detect existing output files within date-separated subdirectories, so the related warning message doesn't appear.
 
 # Todo
 - Android version for mobile users of F-Chat.
diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -12,25 +12,25 @@
 			<TabItem Header="File">
 				<Grid>
 					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="*"/>
+						<ColumnDefinition Width="*"/>
 					</Grid.ColumnDefinitions>
 					<Grid.RowDefinitions>
-						<RowDefinition Height="3*" />
-						<RowDefinition Height="*" />
+						<RowDefinition Height="3*"/>
+						<RowDefinition Height="*"/>
 					</Grid.RowDefinitions>
 					<Grid Tag="PanelGrid" Grid.Row="0" Grid.Column="0" Background="Beige" Margin="2,0">
 						<StackPanel Background="LightGray" Margin="2,2">
 							<ListBox IsHitTestVisible="False" Width="350" Height="430" Margin="0,21" HorizontalAlignment="Center" Padding="3" FontSize="14" BorderBrush="#FF333333" BorderThickness="1">
-								<ListBoxItem Content="{Binding LogHeader}" />
-								<ListBoxItem Margin="10" Visibility="Hidden" />
-								<ListBoxItem FontWeight="Bold" Content="{Binding IntactMessages}" />
-								<ListBoxItem Content="{Binding CorruptedTimestamps}" />
-								<ListBoxItem Content="{Binding TruncatedMessages}" />
-								<ListBoxItem Content="{Binding EmptyMessages}" />
-								<ListBoxItem Content="{Binding UnreadData}" />
-								<ListBoxItem Margin="10" Visibility="Hidden" />
-								<ListBoxItem Tag="WarningLabel" Foreground="Red" Content="{Binding Exception}" />
+								<ListBoxItem Content="{Binding LogHeader}"/>
+								<ListBoxItem Margin="10" Visibility="Hidden"/>
+								<ListBoxItem FontWeight="Bold" Content="{Binding IntactMessages}"/>
+								<ListBoxItem Content="{Binding CorruptedTimestamps}"/>
+								<ListBoxItem Content="{Binding TruncatedMessages}"/>
+								<ListBoxItem Content="{Binding EmptyMessages}"/>
+								<ListBoxItem Content="{Binding UnreadData}"/>
+								<ListBoxItem Margin="10" Visibility="Hidden"/>
+								<ListBoxItem Tag="WarningLabel" Foreground="Red" Content="{Binding Exception}"/>
 							</ListBox>
 						</StackPanel>
 					</Grid>
@@ -59,15 +59,15 @@
 							</StackPanel>
 							<StackPanel HorizontalAlignment="Center" Margin="0,30,0,0" Orientation="Horizontal">
 								<Label FontFamily="Arial" FontSize="12" Height="25" HorizontalAlignment="Center" Margin="0,0,10,0" Foreground="Black" Content="Divide logs by date?"/>
-								<CheckBox x:Name="F_DivideLogsCheckbox" VerticalAlignment="Center" IsChecked="False" Tag="Enableable" Click="FormatOverride"/>
+								<CheckBox x:Name="F_DivideLogs" VerticalAlignment="Center" IsChecked="{Binding DivideLogs}" Tag="Enableable"/>
 							</StackPanel>
 							<StackPanel HorizontalAlignment="Center" Margin="0,20,0,0" Orientation="Horizontal">
 								<Label FontFamily="Arial" FontSize="12" Height="25" HorizontalAlignment="Center" Margin="0,0,10,0" Foreground="Black" Content="Save non-intact messages?"/>
-								<CheckBox x:Name="F_SaveTruncatedCheckbox" VerticalAlignment="Center" IsChecked="False" Tag="Enableable" Click="FormatOverride"/>
+								<CheckBox x:Name="F_SaveTruncated" VerticalAlignment="Center" IsChecked="{Binding SaveTruncated}" Tag="Enableable"/>
 							</StackPanel>
 							<StackPanel HorizontalAlignment="Center" Margin="0,20,0,0" Orientation="Horizontal">
 								<Label FontFamily="Arial" FontSize="12" Height="25" HorizontalAlignment="Center" Margin="0,0,10,0" Foreground="Black" Content="Save to HTML?"/>
-								<CheckBox x:Name="F_SaveHTMLCheckbox" VerticalAlignment="Center" IsChecked="False" Tag="Enableable" Click="FormatOverride"/>
+								<CheckBox x:Name="F_SaveHTML" VerticalAlignment="Center" IsChecked="{Binding SaveHTML}" Tag="Enableable"/>
 							</StackPanel>
 						</StackPanel>
 					</Grid>
@@ -90,7 +90,7 @@
 									<Button x:Name="F_RunButton" Width="100" Height="25" HorizontalAlignment="Center" Margin="0,20" Background="Beige" IsEnabled="False" Click="RunButton_Click" Content="{Binding RunLabel}" Tag="F_"/>
 								</StackPanel>
 								<StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4">
-									<ProgressBar Width="600" Height="25" HorizontalAlignment="Center" Minimum="0" Maximum="{Binding ProgressMax}" Value="{Binding Progress}" />
+									<ProgressBar Width="600" Height="25" HorizontalAlignment="Center" Minimum="0" Maximum="{Binding ProgressMax}" Value="{Binding Progress}"/>
 								</StackPanel>
 							</Grid>
 							<Label Content="{Binding VersionString}" HorizontalAlignment="Right" FontStyle="Italic" Margin="10,30" FontWeight="Thin"/>
@@ -101,25 +101,25 @@
 			<TabItem Header="Directory">
 				<Grid>
 					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="*"/>
+						<ColumnDefinition Width="*"/>
 					</Grid.ColumnDefinitions>
 					<Grid.RowDefinitions>
-						<RowDefinition Height="3*" />
-						<RowDefinition Height="*" />
+						<RowDefinition Height="3*"/>
+						<RowDefinition Height="*"/>
 					</Grid.RowDefinitions>
 					<Grid Tag="PanelGrid" Grid.Row="0" Grid.Column="0" Background="Beige" Margin="2,0">
 						<StackPanel Background="LightGray" Margin="2,2">
 							<ListBox IsHitTestVisible="False" Width="350" Height="430" Margin="0,21" HorizontalAlignment="Center" Padding="3" FontSize="14" BorderBrush="#FF333333" BorderThickness="1">
-								<ListBoxItem Content="{Binding LogHeader}" />
-								<ListBoxItem Margin="10" Visibility="Hidden" />
-								<ListBoxItem FontWeight="Bold" Content="{Binding IntactMessages}" />
-								<ListBoxItem Content="{Binding CorruptedTimestamps}" />
-								<ListBoxItem Content="{Binding TruncatedMessages}" />
-								<ListBoxItem Content="{Binding EmptyMessages}" />
-								<ListBoxItem Content="{Binding UnreadData}" />
-								<ListBoxItem Margin="10" Visibility="Hidden" />
-								<ListBoxItem Tag="WarningLabel" Foreground="Red" Content="{Binding Exception}" />
+								<ListBoxItem Content="{Binding LogHeader}"/>
+								<ListBoxItem Margin="10" Visibility="Hidden"/>
+								<ListBoxItem FontWeight="Bold" Content="{Binding IntactMessages}"/>
+								<ListBoxItem Content="{Binding CorruptedTimestamps}"/>
+								<ListBoxItem Content="{Binding TruncatedMessages}"/>
+								<ListBoxItem Content="{Binding EmptyMessages}"/>
+								<ListBoxItem Content="{Binding UnreadData}"/>
+								<ListBoxItem Margin="10" Visibility="Hidden"/>
+								<ListBoxItem Tag="WarningLabel" Foreground="Red" Content="{Binding Exception}"/>
 							</ListBox>
 						</StackPanel>
 					</Grid>
@@ -148,15 +148,15 @@
 							</StackPanel>
 							<StackPanel HorizontalAlignment="Center" Margin="0,30,0,0" Orientation="Horizontal">
 								<Label FontFamily="Arial" FontSize="12" Height="25" HorizontalAlignment="Center" Margin="0,0,10,0" Foreground="Black" Content="Divide logs by date?"/>
-								<CheckBox x:Name="D_DivideLogsCheckbox" VerticalAlignment="Center" IsChecked="False" Tag="Enableable"  Click="FormatOverride"/>
+								<CheckBox x:Name="D_DivideLogs" VerticalAlignment="Center" IsChecked="{Binding DivideLogs}" Tag="Enableable"/>
 							</StackPanel>
 							<StackPanel HorizontalAlignment="Center" Margin="0,20,0,0" Orientation="Horizontal">
 								<Label FontFamily="Arial" FontSize="12" Height="25" HorizontalAlignment="Center" Margin="0,0,10,0" Foreground="Black" Content="Save non-intact messages?"/>
-								<CheckBox x:Name="D_SaveTruncatedCheckbox" VerticalAlignment="Center" IsChecked="False" Tag="Enableable"  Click="FormatOverride"/>
+								<CheckBox x:Name="D_SaveTruncated" VerticalAlignment="Center" IsChecked="{Binding SaveTruncated}" Tag="Enableable"/>
 							</StackPanel>
 							<StackPanel HorizontalAlignment="Center" Margin="0,20,0,0" Orientation="Horizontal">
 								<Label FontFamily="Arial" FontSize="12" Height="25" HorizontalAlignment="Center" Margin="0,0,10,0" Foreground="Black" Content="Save to HTML?"/>
-								<CheckBox x:Name="D_SaveHTMLCheckbox" VerticalAlignment="Center" IsChecked="False" Tag="Enableable" Click="FormatOverride"/>
+								<CheckBox x:Name="D_SaveHTML" VerticalAlignment="Center" IsChecked="{Binding SaveHTML}" Tag="Enableable"/>
 							</StackPanel>
 						</StackPanel>
 					</Grid>
@@ -179,7 +179,7 @@
 									<Button x:Name="D_RunButton" Width="100" Height="25" HorizontalAlignment="Center" Margin="0,20" Background="Beige" IsEnabled="False" Click="RunButton_Click" Content="{Binding RunLabel}" Tag="D_"/>
 								</StackPanel>
 								<StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5">
-									<ProgressBar Width="600" Height="25" HorizontalAlignment="Center" Minimum="0" Maximum="{Binding ProgressMax}" Value="{Binding Progress}" />
+									<ProgressBar Width="600" Height="25" HorizontalAlignment="Center" Minimum="0" Maximum="{Binding ProgressMax}" Value="{Binding Progress}"/>
 								</StackPanel>
 							</Grid>
 							<Label Content="{Binding VersionString}" HorizontalAlignment="Right" FontStyle="Italic" Margin="10,30" FontWeight="Thin"/>
@@ -190,25 +190,25 @@
 			<TabItem Header="Phrase">
 				<Grid>
 					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="*"/>
+						<ColumnDefinition Width="*"/>
 					</Grid.ColumnDefinitions>
 					<Grid.RowDefinitions>
-						<RowDefinition Height="3*" />
-						<RowDefinition Height="*" />
+						<RowDefinition Height="3*"/>
+						<RowDefinition Height="*"/>
 					</Grid.RowDefinitions>
 					<Grid Tag="PanelGrid" Grid.Row="0" Grid.Column="0" Background="Beige" Margin="2,0">
 						<StackPanel Background="LightGray" Margin="2,2">
 							<ListBox IsHitTestVisible="False" Width="350" Height="430" Margin="0,21" HorizontalAlignment="Center" Padding="3" FontSize="14" BorderBrush="#FF333333" BorderThickness="1">
-								<ListBoxItem Content="{Binding LogHeader}" />
-								<ListBoxItem Margin="10" Visibility="Hidden" />
-								<ListBoxItem FontWeight="Bold" Content="{Binding IntactMessages}" />
-								<ListBoxItem Content="{Binding CorruptedTimestamps}" />
-								<ListBoxItem Content="{Binding TruncatedMessages}" />
-								<ListBoxItem Content="{Binding EmptyMessages}" />
-								<ListBoxItem Content="{Binding UnreadData}" />
-								<ListBoxItem Margin="10" Visibility="Hidden" />
-								<ListBoxItem Tag="WarningLabel" Foreground="Red" Content="{Binding Exception}" />
+								<ListBoxItem Content="{Binding LogHeader}"/>
+								<ListBoxItem Margin="10" Visibility="Hidden"/>
+								<ListBoxItem FontWeight="Bold" Content="{Binding IntactMessages}"/>
+								<ListBoxItem Content="{Binding CorruptedTimestamps}"/>
+								<ListBoxItem Content="{Binding TruncatedMessages}"/>
+								<ListBoxItem Content="{Binding EmptyMessages}"/>
+								<ListBoxItem Content="{Binding UnreadData}"/>
+								<ListBoxItem Margin="10" Visibility="Hidden"/>
+								<ListBoxItem Tag="WarningLabel" Foreground="Red" Content="{Binding Exception}"/>
 							</ListBox>
 						</StackPanel>
 					</Grid>
@@ -242,15 +242,15 @@
 							</StackPanel>
 							<StackPanel HorizontalAlignment="Center" Margin="0,30,0,0" Orientation="Horizontal">
 								<Label FontFamily="Arial" FontSize="12" Height="25" HorizontalAlignment="Center" Margin="0,0,10,0" Foreground="Black" Content="Divide logs by date?"/>
-								<CheckBox x:Name="P_DivideLogsCheckbox" VerticalAlignment="Center" IsChecked="False" Tag="Enableable"  Click="FormatOverride"/>
+								<CheckBox x:Name="P_DivideLogs" VerticalAlignment="Center" IsChecked="{Binding DivideLogs}" Tag="Enableable"/>
 							</StackPanel>
 							<StackPanel HorizontalAlignment="Center" Margin="0,20,0,0" Orientation="Horizontal">
 								<Label FontFamily="Arial" FontSize="12" Height="25" HorizontalAlignment="Center" Margin="0,0,10,0" Foreground="Black" Content="Save non-intact messages?"/>
-								<CheckBox x:Name="P_SaveTruncatedCheckbox" VerticalAlignment="Center" IsChecked="False" Tag="Enableable"  Click="FormatOverride"/>
+								<CheckBox x:Name="P_SaveTruncated" VerticalAlignment="Center" IsChecked="{Binding SaveTruncated}" Tag="Enableable"/>
 							</StackPanel>
 							<StackPanel HorizontalAlignment="Center" Margin="0,20,0,0" Orientation="Horizontal">
 								<Label FontFamily="Arial" FontSize="12" Height="25" HorizontalAlignment="Center" Margin="0,0,10,0" Foreground="Black" Content="Save to HTML?"/>
-								<CheckBox x:Name="P_SaveHTMLCheckbox" VerticalAlignment="Center" IsChecked="False" Tag="Enableable" Click="FormatOverride"/>
+								<CheckBox x:Name="P_SaveHTML" VerticalAlignment="Center" IsChecked="{Binding SaveHTML}" Tag="Enableable"/>
 							</StackPanel>
 						</StackPanel>
 					</Grid>
@@ -273,7 +273,7 @@
 									<Button x:Name="P_RunButton" Width="100" Height="25" HorizontalAlignment="Center" Margin="0,20" Background="Beige" IsEnabled="False" Click="RunButton_Click" Content="{Binding RunLabel}" Tag="P_"/>
 								</StackPanel>
 								<StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5">
-									<ProgressBar Width="600" Height="25" HorizontalAlignment="Center" Minimum="0" Maximum="{Binding ProgressMax}" Value="{Binding Progress}" />
+									<ProgressBar Width="600" Height="25" HorizontalAlignment="Center" Minimum="0" Maximum="{Binding ProgressMax}" Value="{Binding Progress}"/>
 								</StackPanel>
 							</Grid>
 							<Label Content="{Binding VersionString}" HorizontalAlignment="Right" FontStyle="Italic" Margin="10,30" FontWeight="Thin"/>
@@ -284,12 +284,12 @@
 			<TabItem Header="Help">
 				<Grid>
 					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="*"/>
+						<ColumnDefinition Width="*"/>
 					</Grid.ColumnDefinitions>
 					<Grid.RowDefinitions>
-						<RowDefinition Height="*" />
-						<RowDefinition Height="*" />
+						<RowDefinition Height="*"/>
+						<RowDefinition Height="*"/>
 					</Grid.RowDefinitions>
 					<Grid Tag="PanelGrid" Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Background="Beige" Margin="2,0,2,2">
 						<StackPanel Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Background="LightGray" Margin="2,2">