ADIX7/FileTime2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Search by regex, modal Enter fixes

Browse Source
This commit is contained in:
Ádám Kovács
2023-07-31 14:07:52 +02:00
parent a537277546
commit bc31b71130
38 changed files with 301 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/AppCommon/FileTime.App.Core/Services/ItemNameConverterService.cs
View File

@@ -1,4 +1,5 @@
using FileTime.App.Core.Models;
using FileTime.Core.Models;
namespace FileTime.App.Core.Services;
@@ -13,7 +14,7 @@ public class ItemNameConverterService : IItemNameConverterService
{
var nameLeft = name;
while (nameLeft.ToLower().IndexOf(searchText, StringComparison.Ordinal) is int rapidTextStart && rapidTextStart != -1)
while (nameLeft.ToLower().IndexOf(searchText, StringComparison.Ordinal) is var rapidTextStart && rapidTextStart != -1)
{
var before = rapidTextStart > 0 ? nameLeft.Substring(0, rapidTextStart) : null;
var rapidTravel = nameLeft.Substring(rapidTextStart, searchText.Length);

4
src/AppCommon/FileTime.App.Core/Services/UserCommandHandler/NavigationUserCommandHandlerService.cs
View File

@@ -310,13 +310,13 @@ public class NavigationUserCommandHandlerService : UserCommandHandlerServiceBase
private Task EnterRapidTravel()
{
_appState.SwitchViewMode(ViewMode.RapidTravel);
_appState.SwitchViewModeAsync(ViewMode.RapidTravel);
return Task.CompletedTask;
}
private Task ExitRapidTravel()
{
_appState.SwitchViewMode(ViewMode.Default);
_appState.SwitchViewModeAsync(ViewMode.Default);
return Task.CompletedTask;
}

4
src/AppCommon/FileTime.App.Core/Services/UserCommandHandler/ToolUserCommandHandlerService.cs
View File

@@ -106,10 +106,10 @@ public class ToolUserCommandHandlerService : UserCommandHandlerServiceBase
//TODO proper error message
if (string.IsNullOrWhiteSpace(searchQuery)) return;
var searchMatcher = searchCommand.SearchType switch
ISearchMatcher searchMatcher = searchCommand.SearchType switch
{
SearchType.NameContains => new NameContainsMatcher(_itemNameConverterService, searchQuery),
//SearchType.NameRegex => new NameRegexMatcher(searchQuery),
SearchType.NameRegex => new RegexMatcher(searchQuery),
_ => throw new ArgumentOutOfRangeException()
};