From 0bfb755a3895d26144a69eb7f0ea02bba655a15f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 27 Apr 2013 09:05:33 -0400 Subject: search hints progress --- .../Library/LuceneSearchEngine.cs | 156 +++++++++++++++------ 1 file changed, 110 insertions(+), 46 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs b/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs index d5675578d1..5c309a8960 100644 --- a/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs +++ b/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs @@ -97,24 +97,26 @@ namespace MediaBrowser.Server.Implementations.Library /// The search term. /// IEnumerable{SearchHintResult}. /// searchTerm - public async Task> GetSearchHints(IEnumerable inputItems, string searchTerm) + public async Task> GetSearchHints(IEnumerable inputItems, string searchTerm) { if (string.IsNullOrEmpty(searchTerm)) { throw new ArgumentNullException("searchTerm"); } - var hints = new List>(); + var terms = GetWords(searchTerm); + + var hints = new List>(); var items = inputItems.Where(i => !(i is MusicArtist)).ToList(); foreach (var item in items) { - var index = IndexOf(item.Name, searchTerm); + var index = GetIndex(item.Name, searchTerm, terms); - if (index != -1) + if (index.Item2 != -1) { - hints.Add(new Tuple(item, index)); + hints.Add(new Tuple(item, index.Item1, index.Item2)); } } @@ -127,16 +129,23 @@ namespace MediaBrowser.Server.Implementations.Library foreach (var item in artists) { - var index = IndexOf(item, searchTerm); + var index = GetIndex(item, searchTerm, terms); - if (index != -1) + if (index.Item2 != -1) { - var artist = await _libraryManager.GetArtist(item).ConfigureAwait(false); + try + { + var artist = await _libraryManager.GetArtist(item).ConfigureAwait(false); - hints.Add(new Tuple(artist, index)); + hints.Add(new Tuple(artist, index.Item1, index.Item2)); + } + catch (Exception ex) + { + _logger.ErrorException("Error getting {0}", ex, item); + } } } - + // Find genres var genres = items.SelectMany(i => i.Genres) .Where(i => !string.IsNullOrEmpty(i)) @@ -145,13 +154,20 @@ namespace MediaBrowser.Server.Implementations.Library foreach (var item in genres) { - var index = IndexOf(item, searchTerm); + var index = GetIndex(item, searchTerm, terms); - if (index != -1) + if (index.Item2 != -1) { - var genre = await _libraryManager.GetGenre(item).ConfigureAwait(false); + try + { + var genre = await _libraryManager.GetGenre(item).ConfigureAwait(false); - hints.Add(new Tuple(genre, index)); + hints.Add(new Tuple(genre, index.Item1, index.Item2)); + } + catch (Exception ex) + { + _logger.ErrorException("Error getting {0}", ex, item); + } } } @@ -163,13 +179,20 @@ namespace MediaBrowser.Server.Implementations.Library foreach (var item in studios) { - var index = IndexOf(item, searchTerm); + var index = GetIndex(item, searchTerm, terms); - if (index != -1) + if (index.Item2 != -1) { - var studio = await _libraryManager.GetStudio(item).ConfigureAwait(false); + try + { + var studio = await _libraryManager.GetStudio(item).ConfigureAwait(false); - hints.Add(new Tuple(studio, index)); + hints.Add(new Tuple(studio, index.Item1, index.Item2)); + } + catch (Exception ex) + { + _logger.ErrorException("Error getting {0}", ex, item); + } } } @@ -182,52 +205,93 @@ namespace MediaBrowser.Server.Implementations.Library foreach (var item in persons) { - var index = IndexOf(item, searchTerm); + var index = GetIndex(item, searchTerm, terms); - if (index != -1) + if (index.Item2 != -1) { - var person = await _libraryManager.GetPerson(item).ConfigureAwait(false); + try + { + var person = await _libraryManager.GetPerson(item).ConfigureAwait(false); - hints.Add(new Tuple(person, index)); + hints.Add(new Tuple(person, index.Item1, index.Item2)); + } + catch (Exception ex) + { + _logger.ErrorException("Error getting {0}", ex, item); + } } } - return hints.OrderBy(i => i.Item2).Select(i => i.Item1); - } - - /// - /// Gets the words. - /// - /// The term. - /// System.String[][]. - private string[] GetWords(string term) - { - // TODO: Improve this to be more accurate and respect culture - var words = term.Split(' '); - - return words; + return hints.OrderBy(i => i.Item3).Select(i => new SearchHintInfo + { + Item = i.Item1, + MatchedTerm = i.Item2 + }); } /// - /// Indexes the of. + /// Gets the index. /// /// The input. - /// The term. + /// The search input. + /// The search input. /// System.Int32. - private int IndexOf(string input, string term) + private Tuple GetIndex(string input, string searchInput, string[] searchWords) { - var index = 0; + if (string.Equals(input, searchInput, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple(searchInput, 0); + } + + var index = input.IndexOf(searchInput, StringComparison.OrdinalIgnoreCase); - foreach (var word in GetWords(input)) + if (index == 0) { - if (word.IndexOf(term, StringComparison.OrdinalIgnoreCase) != -1) + return new Tuple(searchInput, 1); + } + if (index > 0) + { + return new Tuple(searchInput, 2); + } + + var items = GetWords(input); + + for (var i = 0; i < searchWords.Length; i++) + { + var searchTerm = searchWords[i]; + + for (var j = 0; j < items.Length; j++) { - return index; - } + var item = items[j]; + + if (string.Equals(item, searchTerm, StringComparison.OrdinalIgnoreCase)) + { + return new Tuple(searchTerm, 3 + (i + 1) * (j + 1)); + } + + index = item.IndexOf(searchTerm, StringComparison.OrdinalIgnoreCase); - index++; + if (index == 0) + { + return new Tuple(searchTerm, 4 + (i + 1) * (j + 1)); + } + if (index > 0) + { + return new Tuple(searchTerm, 5 + (i + 1) * (j + 1)); + } + } } - return -1; + return new Tuple(null, -1); + } + + /// + /// Gets the words. + /// + /// The term. + /// System.String[][]. + private string[] GetWords(string term) + { + return term.Split().Where(i => !string.IsNullOrWhiteSpace(i)).ToArray(); } } -- cgit v1.2.3 From 40c2b73d63d275d5001db96fb3bed02c15c5bd97 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 27 Apr 2013 09:10:24 -0400 Subject: fixed subtitle offsets --- MediaBrowser.Api/Playback/BaseStreamingService.cs | 23 ++++++++++------------ MediaBrowser.Common/MediaInfo/IMediaEncoder.cs | 3 ++- .../MediaEncoder/MediaEncoder.cs | 3 ++- 3 files changed, 14 insertions(+), 15 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index cddd051971..6cc0b92414 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -290,22 +290,14 @@ namespace MediaBrowser.Api.Playback /// System.String. protected string GetTextSubtitleParam(Video video, MediaStream subtitleStream, long? startTimeTicks) { - var path = subtitleStream.IsExternal ? GetConvertedAssPath(video, subtitleStream) : GetExtractedAssPath(video, subtitleStream, startTimeTicks); + var path = subtitleStream.IsExternal ? GetConvertedAssPath(video, subtitleStream, startTimeTicks) : GetExtractedAssPath(video, subtitleStream, startTimeTicks); if (string.IsNullOrEmpty(path)) { return string.Empty; } - var param = string.Format(",ass='{0}'", path.Replace('\\', '/').Replace(":/", "\\:/")); - - if (startTimeTicks.HasValue && subtitleStream.IsExternal) - { - var seconds = Convert.ToInt32(TimeSpan.FromTicks(startTimeTicks.Value).TotalSeconds); - param += string.Format(",setpts=PTS-{0}/TB", seconds); - } - - return param; + return string.Format(",ass='{0}'", path.Replace('\\', '/').Replace(":/", "\\:/")); } /// @@ -347,16 +339,21 @@ namespace MediaBrowser.Api.Playback /// /// The video. /// The subtitle stream. + /// The start time ticks. /// System.String. - private string GetConvertedAssPath(Video video, MediaStream subtitleStream) + private string GetConvertedAssPath(Video video, MediaStream subtitleStream, long? startTimeTicks) { - var path = Kernel.Instance.FFMpegManager.GetSubtitleCachePath(video, subtitleStream.Index, null, ".ass"); + var offset = startTimeTicks.HasValue + ? TimeSpan.FromTicks(startTimeTicks.Value) + : TimeSpan.FromTicks(0); + + var path = Kernel.Instance.FFMpegManager.GetSubtitleCachePath(video, subtitleStream.Index, offset, ".ass"); if (!File.Exists(path)) { try { - var task = MediaEncoder.ConvertTextSubtitleToAss(subtitleStream.Path, path, CancellationToken.None); + var task = MediaEncoder.ConvertTextSubtitleToAss(subtitleStream.Path, path, offset, CancellationToken.None); Task.WaitAll(task); } diff --git a/MediaBrowser.Common/MediaInfo/IMediaEncoder.cs b/MediaBrowser.Common/MediaInfo/IMediaEncoder.cs index 8dc18067c6..6d606e6847 100644 --- a/MediaBrowser.Common/MediaInfo/IMediaEncoder.cs +++ b/MediaBrowser.Common/MediaInfo/IMediaEncoder.cs @@ -49,9 +49,10 @@ namespace MediaBrowser.Common.MediaInfo /// /// The input path. /// The output path. + /// The offset. /// The cancellation token. /// Task. - Task ConvertTextSubtitleToAss(string inputPath, string outputPath, CancellationToken cancellationToken); + Task ConvertTextSubtitleToAss(string inputPath, string outputPath, TimeSpan offset, CancellationToken cancellationToken); /// /// Gets the media info. diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs index eda2506d15..b52b0c93c7 100644 --- a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs +++ b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs @@ -535,13 +535,14 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder /// /// The input path. /// The output path. + /// The offset. /// The cancellation token. /// Task. /// inputPath /// or /// outputPath /// - public async Task ConvertTextSubtitleToAss(string inputPath, string outputPath, CancellationToken cancellationToken) + public async Task ConvertTextSubtitleToAss(string inputPath, string outputPath, TimeSpan offset, CancellationToken cancellationToken) { if (string.IsNullOrEmpty(inputPath)) { -- cgit v1.2.3