From dbf214883c0199be4a7a1bc02145c014fc029c0e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 1 Jun 2013 18:18:27 -0400 Subject: don't allow theme songs to get mixed in with children --- MediaBrowser.Controller/Entities/BaseItem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index e4e3debe96..ef1efd8af9 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -52,6 +52,7 @@ namespace MediaBrowser.Controller.Entities /// public const string TrailerFolderName = "trailers"; public const string ThemeSongsFolderName = "theme-music"; + public const string ThemeSongFilename = "theme"; public const string ThemeVideosFolderName = "backdrops"; public const string XbmcTrailerFileSuffix = "-trailer"; @@ -822,7 +823,7 @@ namespace MediaBrowser.Controller.Entities // Support plex/xbmc convention files.AddRange(resolveArgs.FileSystemChildren - .Where(i => string.Equals(System.IO.Path.GetFileNameWithoutExtension(i.FullName), "theme", StringComparison.OrdinalIgnoreCase) && EntityResolutionHelper.IsAudioFile(i.FullName)) + .Where(i => string.Equals(System.IO.Path.GetFileNameWithoutExtension(i.FullName), ThemeSongFilename, StringComparison.OrdinalIgnoreCase) && EntityResolutionHelper.IsAudioFile(i.FullName)) ); return LibraryManager.ResolvePaths(files, null).Select(audio => -- cgit v1.2.3