diff options
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 27 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/BaseItemXmlParser.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs | 2 | ||||
| -rw-r--r-- | SharedVersion.cs | 4 |
5 files changed, 31 insertions, 15 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index a342cf0e3..da6e3e9e1 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -58,7 +58,7 @@ namespace MediaBrowser.Controller.Entities public string PreferredMetadataCountryCode { get; set; } public string PreferredMetadataLanguage { get; set; } - + public List<ItemImageInfo> ImageInfos { get; set; } /// <summary> @@ -198,7 +198,7 @@ namespace MediaBrowser.Controller.Entities /// <value>The etag.</value> [IgnoreDataMember] public string ExternalEtag { get; set; } - + [IgnoreDataMember] public virtual bool IsHidden { @@ -373,7 +373,7 @@ namespace MediaBrowser.Controller.Entities [IgnoreDataMember] public bool IsLocked { get; set; } - + /// <summary> /// Gets or sets the locked fields. /// </summary> @@ -520,7 +520,7 @@ namespace MediaBrowser.Controller.Entities } set { - + } } @@ -674,7 +674,7 @@ namespace MediaBrowser.Controller.Entities { get { - if (!string.IsNullOrEmpty(CustomRating)) + if (!string.IsNullOrWhiteSpace(CustomRating)) { return CustomRating; } @@ -717,7 +717,7 @@ namespace MediaBrowser.Controller.Entities { var files = fileSystemChildren.OfType<DirectoryInfo>() .Where(i => string.Equals(i.Name, ThemeSongsFolderName, StringComparison.OrdinalIgnoreCase)) - .SelectMany(i => directoryService.GetFiles(i.FullName)) + .SelectMany(i => directoryService.GetFiles(i.FullName)) .ToList(); // Support plex/xbmc convention @@ -753,7 +753,7 @@ namespace MediaBrowser.Controller.Entities { var files = fileSystemChildren.OfType<DirectoryInfo>() .Where(i => string.Equals(i.Name, ThemeVideosFolderName, StringComparison.OrdinalIgnoreCase)) - .SelectMany(i => directoryService.GetFiles(i.FullName)); + .SelectMany(i => directoryService.GetFiles(i.FullName)); return LibraryManager.ResolvePaths(files, directoryService, null) .OfType<Video>() @@ -1112,7 +1112,14 @@ namespace MediaBrowser.Controller.Entities // Could not determine the integer value if (!value.HasValue) { - return !GetBlockUnratedValue(user.Policy); + var isAllowed = !GetBlockUnratedValue(user.Policy); + + if (!isAllowed) + { + Logger.Debug("{0} has an unrecognized parental rating of {1}.", Name, rating); + } + + return isAllowed; } return value.Value <= maxAllowedRating.Value; @@ -1416,7 +1423,7 @@ namespace MediaBrowser.Controller.Entities /// <returns>Task.</returns> public virtual Task ChangedExternally() { - ProviderManager.QueueRefresh(Id, new MetadataRefreshOptions(FileSystem)); + ProviderManager.QueueRefresh(Id, new MetadataRefreshOptions(FileSystem)); return Task.FromResult(true); } @@ -1656,7 +1663,7 @@ namespace MediaBrowser.Controller.Entities var newImagePaths = images.Select(i => i.FullName).ToList(); var deleted = existingImages - .Where(i => i.IsLocalFile && !newImagePaths.Contains(i.Path, StringComparer.OrdinalIgnoreCase) && !FileSystem.FileExists(i.Path)) + .Where(i => i.IsLocalFile && !newImagePaths.Contains(i.Path, StringComparer.OrdinalIgnoreCase) && !FileSystem.FileExists(i.Path)) .ToList(); ImageInfos = ImageInfos.Except(deleted).ToList(); diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index c77758d25..05965e1b5 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -207,7 +207,7 @@ namespace MediaBrowser.Controller.Entities return base.OfficialRatingForComparison; } - return !string.IsNullOrEmpty(base.OfficialRatingForComparison) ? base.OfficialRatingForComparison : "None"; + return !string.IsNullOrWhiteSpace(base.OfficialRatingForComparison) ? base.OfficialRatingForComparison : "None"; } } diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs index 2efd6e5c6..3e5353812 100644 --- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs @@ -61,7 +61,16 @@ namespace MediaBrowser.Controller.Providers }; //Fetch(item, metadataFile, settings, Encoding.GetEncoding("ISO-8859-1"), cancellationToken); - Fetch(item, metadataFile, settings, Encoding.UTF8, cancellationToken); + + try + { + Fetch(item, metadataFile, settings, Encoding.UTF8, cancellationToken); + } + catch + { + Logger.Error("Error parsing xml file {0}", metadataFile); + throw; + } } /// <summary> diff --git a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs index 9a65ef660..3e5296639 100644 --- a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs +++ b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs @@ -128,7 +128,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization /// </summary> /// <param name="path">The path.</param> /// <returns>IEnumerable{FileInfo}.</returns> - private IEnumerable<FileSystemMetadata> GetFilesToOrganize(string path) + private List<FileSystemMetadata> GetFilesToOrganize(string path) { try { diff --git a/SharedVersion.cs b/SharedVersion.cs index 2467e9f87..5fc22dd53 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5768.2")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5768.3")] |