Skip to content

Commit

Permalink
Log file search accepts tab characters #213
Browse files Browse the repository at this point in the history
Without this change, tab characters were converted to single spaces, thus leading to searching for the wrong string.
  • Loading branch information
Kittyfisto committed Oct 30, 2019
1 parent 96cb913 commit 0961175
Show file tree
Hide file tree
Showing 17 changed files with 24 additions and 20 deletions.
4 changes: 2 additions & 2 deletions src/Installer/Installer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Metrolib, Version=0.3.0.134, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
<HintPath>..\..\packages\Metrolib.0.3.0.134\lib\net45\Metrolib.dll</HintPath>
<Reference Include="Metrolib, Version=0.3.0.135, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
<HintPath>..\..\packages\Metrolib.0.3.0.135\lib\net45\Metrolib.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.8" targetFramework="net45" />
<package id="Metrolib" version="0.3.0.134" targetFramework="net471" />
<package id="Metrolib" version="0.3.0.135" targetFramework="net471" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
<HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Metrolib, Version=0.3.0.134, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
<HintPath>..\..\packages\Metrolib.0.3.0.134\lib\net45\Metrolib.dll</HintPath>
<Reference Include="Metrolib, Version=0.3.0.135, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
<HintPath>..\..\packages\Metrolib.0.3.0.135\lib\net45\Metrolib.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Build.Tasks.v4.0" />
<Reference Include="Moq, Version=4.7.127.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/Tailviewer.AcceptanceTests/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<package id="FluentAssertions" version="5.6.0" targetFramework="net471" />
<package id="FluentAssertions.Extensions" version="1.0.18" targetFramework="net471" />
<package id="log4net" version="2.0.8" targetFramework="net452" />
<package id="Metrolib" version="0.3.0.134" targetFramework="net471" />
<package id="Metrolib" version="0.3.0.135" targetFramework="net471" />
<package id="Moq" version="4.7.127" targetFramework="net471" />
<package id="NUnit" version="3.12.0" targetFramework="net471" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net471" />
Expand Down
2 changes: 1 addition & 1 deletion src/Tailviewer.Api/Tailviewer.Api.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<tags>.NET Tailviewer API SDK logfile</tags>
<dependencies>
<dependency id="log4net" version="2.0.8" />
<dependency id="Metrolib" version="0.3.0.129" />
<dependency id="Metrolib" version="0.3.0.135" />
<dependency id="System.Threading.Extensions" version="2.0.59" />
</dependencies>
</metadata>
Expand Down
4 changes: 2 additions & 2 deletions src/Tailviewer.Archiver/Tailviewer.Archiver.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
</Reference>
<Reference Include="Metrolib, Version=0.3.0.134, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
<HintPath>..\..\packages\Metrolib.0.3.0.134\lib\net45\Metrolib.dll</HintPath>
<Reference Include="Metrolib, Version=0.3.0.135, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
<HintPath>..\..\packages\Metrolib.0.3.0.135\lib\net45\Metrolib.dll</HintPath>
</Reference>
<Reference Include="PE, Version=0.1.13.0, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
<HintPath>..\..\packages\PE.0.1.13\lib\net45\PE.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/Tailviewer.Archiver/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="CommandLineParser" version="2.5.0" targetFramework="net452" />
<package id="log4net" version="2.0.8" targetFramework="net452" />
<package id="Metrolib" version="0.3.0.134" targetFramework="net452" />
<package id="Metrolib" version="0.3.0.135" targetFramework="net452" />
<package id="PE" version="0.1.13" targetFramework="net452" />
<package id="SharpRemote" version="0.6.184" targetFramework="net452" />
<package id="System.Threading.Extensions" version="2.0.59" targetFramework="net452" />
Expand Down
4 changes: 2 additions & 2 deletions src/Tailviewer.Core/Tailviewer.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
<HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Metrolib, Version=0.3.0.134, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
<HintPath>..\..\packages\Metrolib.0.3.0.134\lib\net45\Metrolib.dll</HintPath>
<Reference Include="Metrolib, Version=0.3.0.135, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
<HintPath>..\..\packages\Metrolib.0.3.0.135\lib\net45\Metrolib.dll</HintPath>
</Reference>
<Reference Include="PresentationFramework" />
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion src/Tailviewer.Core/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.8" targetFramework="net452" />
<package id="Metrolib" version="0.3.0.134" targetFramework="net45" />
<package id="Metrolib" version="0.3.0.135" targetFramework="net45" />
<package id="System.Threading.Extensions" version="2.0.59" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions src/Tailviewer.Test/Tailviewer.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
<HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Metrolib, Version=0.3.0.134, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
<HintPath>..\..\packages\Metrolib.0.3.0.134\lib\net45\Metrolib.dll</HintPath>
<Reference Include="Metrolib, Version=0.3.0.135, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
<HintPath>..\..\packages\Metrolib.0.3.0.135\lib\net45\Metrolib.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.7.127.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.7.127\lib\net45\Moq.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/Tailviewer.Test/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<package id="FluentAssertions" version="5.6.0" targetFramework="net471" />
<package id="FluentAssertions.Extensions" version="1.0.18" targetFramework="net471" />
<package id="log4net" version="2.0.8" targetFramework="net452" />
<package id="Metrolib" version="0.3.0.134" targetFramework="net471" />
<package id="Metrolib" version="0.3.0.135" targetFramework="net471" />
<package id="Moq" version="4.7.127" targetFramework="net471" />
<package id="NUnit" version="3.12.0" targetFramework="net471" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net471" />
Expand Down
2 changes: 1 addition & 1 deletion src/Tailviewer/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="metrolib" publicKeyToken="951c63ca832f7094" culture="neutral"/>
<bindingRedirect oldVersion="0.3.0.0-9999.9999.9999.9999" newVersion="0.3.0.134"/>
<bindingRedirect oldVersion="0.3.0.0-9999.9999.9999.9999" newVersion="0.3.0.135"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Extensions" publicKeyToken="951c63ca832f7094" culture="neutral"/>
Expand Down
4 changes: 2 additions & 2 deletions src/Tailviewer/Tailviewer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
<HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Metrolib, Version=0.3.0.134, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
<HintPath>..\..\packages\Metrolib.0.3.0.134\lib\net45\Metrolib.dll</HintPath>
<Reference Include="Metrolib, Version=0.3.0.135, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
<HintPath>..\..\packages\Metrolib.0.3.0.135\lib\net45\Metrolib.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="MMQ, Version=1.0.15.0, Culture=neutral, PublicKeyToken=951c63ca832f7094, processorArchitecture=MSIL">
Expand Down
2 changes: 2 additions & 0 deletions src/Tailviewer/Ui/Controls/LogView/LogViewerControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@
Padding="4"
Width="200"
RequiresExplicitSearchStart="False"
AcceptsTab="True"
Text="{Binding DataSource.SearchTerm, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ElementName=This}"
OccurenceCount="{Binding DataSource.SearchResultCount, ElementName=This}"
CurrentOccurenceIndex="{Binding DataSource.CurrentSearchResultIndex, Mode=TwoWay, ElementName=This}"
Expand All @@ -232,6 +233,7 @@
Margin="0,0,8,8"
Padding="4"
Width="200"
AcceptsTab="True"
FilterText="{Binding DataSource.FindAllSearchTerm, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ElementName=This}"
Watermark="Find all in log file (Ctrl+Shift+F)" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
x:Name="PART_Value"
Grid.Column="2"
Height="26"
AcceptsTab="True"
FilterText="{Binding Value, Mode=TwoWay, NotifyOnSourceUpdated=True}"
IsValid="{Binding IsValid, Mode=OneWay}"
Watermark="Filter log file" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
x:Name="PART_Value"
Grid.Column="1"
Height="26"
AcceptsTab="True"
FilterText="{Binding Value, Mode=TwoWay, NotifyOnSourceUpdated=True}"
IsValid="{Binding IsValid, Mode=OneWay}"
Watermark="Enter highlighted term" />
Expand Down
2 changes: 1 addition & 1 deletion src/Tailviewer/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.8" targetFramework="net45" />
<package id="Metrolib" version="0.3.0.134" targetFramework="net471" />
<package id="Metrolib" version="0.3.0.135" targetFramework="net471" />
<package id="MMQ" version="1.0.15" targetFramework="net471" />
<package id="Ookii.Dialogs.Wpf" version="1.1.0" targetFramework="net471" />
<package id="SharpRemote" version="0.6.184" targetFramework="net471" />
Expand Down

0 comments on commit 0961175

Please sign in to comment.