lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -48,6 +48,7 @@ namespace MediaBrowser.Controller.Entities
public const string TrailerFolderName = "trailers"; public const string TrailerFolderName = "trailers";
public const string ThemeSongsFolderName = "theme-music"; public const string ThemeSongsFolderName = "theme-music";
public const string ThemeVideosFolderName = "backdrops"; public const string ThemeVideosFolderName = "backdrops";
public const string XbmcTrailerFileSuffix = "-trailer";
private string _name; private string _name;
/// <summary> /// <summary>
@ -707,27 +708,38 @@ namespace MediaBrowser.Controller.Entities
return new List<Trailer>(); return new List<Trailer>();
} }
var files = new List<FileSystemInfo>();
var folder = resolveArgs.GetFileSystemEntryByName(TrailerFolderName); var folder = resolveArgs.GetFileSystemEntryByName(TrailerFolderName);
// Path doesn't exist. No biggie // Path doesn't exist. No biggie
if (folder == null) if (folder != null)
{ {
return new List<Trailer>(); try
{
files.AddRange(new DirectoryInfo(folder.FullName).EnumerateFiles());
}
catch (IOException ex)
{
Logger.ErrorException("Error loading trailers for {0}", ex, Name);
}
} }
IEnumerable<FileSystemInfo> files; // Support xbmc trailers (-trailer suffix on video file names)
files.AddRange(resolveArgs.FileSystemChildren.Where(i =>
try
{ {
files = new DirectoryInfo(folder.FullName).EnumerateFiles(); if (!i.Attributes.HasFlag(FileAttributes.Directory))
} {
catch (IOException ex) if (System.IO.Path.GetFileNameWithoutExtension(i.Name).EndsWith(XbmcTrailerFileSuffix, StringComparison.OrdinalIgnoreCase) && !string.Equals(Path, i.FullName, StringComparison.OrdinalIgnoreCase))
{ {
Logger.ErrorException("Error loading trailers for {0}", ex, Name); return true;
return new List<Trailer>(); }
} }
return LibraryManager.ResolvePaths<Trailer>(files, null).Select(video => return false;
}));
var trailers= LibraryManager.ResolvePaths<Trailer>(files, null).Select(video =>
{ {
// Try to retrieve it from the db. If we don't find it, use the resolved version // Try to retrieve it from the db. If we don't find it, use the resolved version
var dbItem = LibraryManager.RetrieveItem(video.Id) as Trailer; var dbItem = LibraryManager.RetrieveItem(video.Id) as Trailer;
@ -740,6 +752,8 @@ namespace MediaBrowser.Controller.Entities
return video; return video;
}).ToList(); }).ToList();
return trailers;
} }
/// <summary> /// <summary>

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

@ -31,6 +31,12 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
{ {
return base.Resolve(args); 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; 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 // 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; continue;
} }