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

17
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.Documents;
using Lucene.Net.Index; using Lucene.Net.Index;
using Lucene.Net.QueryParsers; using Lucene.Net.QueryParsers;
@ -240,7 +241,11 @@ namespace MediaBrowser.Server.Implementations.Library
return new Tuple<string, int>(searchInput, 0); return new Tuple<string, int>(searchInput, 0);
} }
var index = input.IndexOf(searchInput, StringComparison.OrdinalIgnoreCase); var match = Regex.Match(input, searchInput, RegexOptions.IgnoreCase);
if (match.Success)
{
var index = match.Index;
if (index == 0) if (index == 0)
{ {
@ -250,6 +255,7 @@ namespace MediaBrowser.Server.Implementations.Library
{ {
return new Tuple<string, int>(searchInput, 2); return new Tuple<string, int>(searchInput, 2);
} }
}
var items = GetWords(input); var items = GetWords(input);
@ -266,7 +272,11 @@ namespace MediaBrowser.Server.Implementations.Library
return new Tuple<string, int>(searchTerm, 3 + (i + 1) * (j + 1)); 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 (match.Success)
{
var index = match.Index;
if (index == 0) if (index == 0)
{ {
@ -278,6 +288,7 @@ namespace MediaBrowser.Server.Implementations.Library
} }
} }
} }
}
return new Tuple<string, int>(null, -1); return new Tuple<string, int>(null, -1);
} }

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

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