From 9430b09ae9fee8ce2a802019479558cc423eff11 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 20 May 2013 13:04:39 -0400 Subject: support xbmc -trailer suffix --- .../Library/Resolvers/LocalTrailerResolver.cs | 6 ++++++ .../Library/Resolvers/Movies/MovieResolver.cs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'MediaBrowser.Server.Implementations/Library/Resolvers') diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs index f8e9f32b5..ba7590e7f 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs @@ -31,6 +31,12 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers { return base.Resolve(args); } + + // Support xbmc local trailer convention, but only when looking for local trailers (hence the parent == null check) + if (args.Parent == null && Path.GetFileNameWithoutExtension(args.Path).EndsWith(BaseItem.XbmcTrailerFileSuffix, StringComparison.OrdinalIgnoreCase)) + { + return base.Resolve(args); + } } return null; diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs index a8b8359d8..33071080d 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs @@ -158,7 +158,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies } // Don't misidentify xbmc trailers as a movie - if (child.Name.IndexOf("-trailer", StringComparison.OrdinalIgnoreCase) != -1) + if (child.Name.IndexOf(BaseItem.XbmcTrailerFileSuffix, StringComparison.OrdinalIgnoreCase) != -1) { continue; } -- cgit v1.2.3