alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-17 15:46:22 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

support xbmc -trailer suffix

Browse Source
This commit is contained in:
Luke Pulverenti
2013-05-20 13:04:39 -04:00
parent 5355ac4021
commit 9430b09ae9
3 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs
View File

@@ -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;

2
MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
View File

@@ -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;
}