Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

3.0.5768.3

Browse Source
This commit is contained in:
Luke Pulverenti 2015-10-19 06:51:20 -04:00
parent d74ded0fd6
commit 79a7e907d4
5 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -674,7 +674,7 @@ namespace MediaBrowser.Controller.Entities
{ {
get get
{ {
if (!string.IsNullOrEmpty(CustomRating)) if (!string.IsNullOrWhiteSpace(CustomRating))
{ {
return CustomRating; return CustomRating;
} }
@ -1112,7 +1112,14 @@ namespace MediaBrowser.Controller.Entities
// Could not determine the integer value // Could not determine the integer value
if (!value.HasValue) 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; return value.Value <= maxAllowedRating.Value;

2
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -207,7 +207,7 @@ namespace MediaBrowser.Controller.Entities
return base.OfficialRatingForComparison; return base.OfficialRatingForComparison;
} }
return !string.IsNullOrEmpty(base.OfficialRatingForComparison) ? base.OfficialRatingForComparison : "None"; return !string.IsNullOrWhiteSpace(base.OfficialRatingForComparison) ? base.OfficialRatingForComparison : "None";
} }
} }

9
MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
View File

@ -61,8 +61,17 @@ namespace MediaBrowser.Controller.Providers
}; };
//Fetch(item, metadataFile, settings, Encoding.GetEncoding("ISO-8859-1"), cancellationToken); //Fetch(item, metadataFile, settings, Encoding.GetEncoding("ISO-8859-1"), cancellationToken);
try
{
Fetch(item, metadataFile, settings, Encoding.UTF8, cancellationToken); Fetch(item, metadataFile, settings, Encoding.UTF8, cancellationToken);
} }
catch
{
Logger.Error("Error parsing xml file {0}", metadataFile);
throw;
}
}
/// <summary> /// <summary>
/// Fetches the specified item. /// Fetches the specified item.

2
MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
View File

@ -128,7 +128,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
/// </summary> /// </summary>
/// <param name="path">The path.</param> /// <param name="path">The path.</param>
/// <returns>IEnumerable{FileInfo}.</returns> /// <returns>IEnumerable{FileInfo}.</returns>
private IEnumerable<FileSystemMetadata> GetFilesToOrganize(string path) private List<FileSystemMetadata> GetFilesToOrganize(string path)
{ {
try try
{ {

4
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.0.*")] //[assembly: AssemblyVersion("3.0.*")]
//[assembly: AssemblyVersion("3.0.5768.2")] [assembly: AssemblyVersion("3.0.5768.3")]