michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

use regex instead of indexof with search

Browse Source
This commit is contained in:
Luke Pulverenti 2013-04-29 13:06:13 -04:00
parent 33f4b2ed53
commit 8217bafb24
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs
View File

@ -1,4 +1,5 @@
using Lucene.Net.Analysis.Standard;
using System.Text.RegularExpressions;
using Lucene.Net.Analysis.Standard;
using Lucene.Net.Documents;
using Lucene.Net.Index;
using Lucene.Net.QueryParsers;
@ -240,15 +241,20 @@ namespace MediaBrowser.Server.Implementations.Library
return new Tuple<string, int>(searchInput, 0);
}
var index = input.IndexOf(searchInput, StringComparison.OrdinalIgnoreCase);
var match = Regex.Match(input, searchInput, RegexOptions.IgnoreCase);
if (index == 0)
if (match.Success)
{
return new Tuple<string, int>(searchInput, 1);
}
if (index > 0)
{
return new Tuple<string, int>(searchInput, 2);
var index = match.Index;
if (index == 0)
{
return new Tuple<string, int>(searchInput, 1);
}
if (index > 0)
{
return new Tuple<string, int>(searchInput, 2);
}
}
var items = GetWords(input);
@ -266,15 +272,20 @@ namespace MediaBrowser.Server.Implementations.Library
return new Tuple<string, int>(searchTerm, 3 + (i + 1) * (j + 1));
}
index = item.IndexOf(searchTerm, StringComparison.OrdinalIgnoreCase);
match = Regex.Match(item, searchTerm, RegexOptions.IgnoreCase);
if (index == 0)
if (match.Success)
{
return new Tuple<string, int>(searchTerm, 4 + (i + 1) * (j + 1));
}
if (index > 0)
{
return new Tuple<string, int>(searchTerm, 5 + (i + 1) * (j + 1));
var index = match.Index;
if (index == 0)
{
return new Tuple<string, int>(searchTerm, 4 + (i + 1) * (j + 1));
}
if (index > 0)
{
return new Tuple<string, int>(searchTerm, 5 + (i + 1) * (j + 1));
}
}
}
}

2
MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
View File

@ -645,7 +645,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
}
catch (IOException ex)
{
_logger.ErrorException("Error converted extracted subtitle {0}", ex, outputPath);
_logger.ErrorException("Error deleting converted subtitle {0}", ex, outputPath);
}
}
}