Merge pull request #2750 from MediaBrowser/dev

Dev
This commit is contained in:
Luke 2017-07-10 03:38:15 -04:00 committed by GitHub
commit 5199fea8e6
6 changed files with 42 additions and 9 deletions

View File

@ -169,14 +169,15 @@ namespace Emby.Common.Implementations
{
_deviceId = new DeviceId(ApplicationPaths, LogManager.GetLogger("SystemId"), FileSystemManager);
}
return _deviceId.Value;
}
}
public PackageVersionClass SystemUpdateLevel
{
get {
get
{
#if BETA
return PackageVersionClass.Beta;
@ -216,7 +217,7 @@ namespace Emby.Common.Implementations
// hack alert, until common can target .net core
BaseExtensions.CryptographyProvider = CryptographyProvider;
XmlSerializer = new MyXmlSerializer(fileSystem, logManager.GetLogger("XmlSerializer"));
FailedAssemblies = new List<string>();
@ -565,7 +566,10 @@ namespace Emby.Common.Implementations
try
{
return assembly.GetTypes();
// This null checking really shouldn't be needed but adding it due to some
// unhandled exceptions in mono 5.0 that are a little hard to hunt down
var types = assembly.GetTypes() ?? new Type[] { };
return types.Where(t => t != null);
}
catch (ReflectionTypeLoadException ex)
{
@ -578,7 +582,14 @@ namespace Emby.Common.Implementations
}
// If it fails we can still get a list of the Types it was able to resolve
return ex.Types.Where(t => t != null);
var types = ex.Types ?? new Type[] { };
return types.Where(t => t != null);
}
catch (Exception ex)
{
Logger.ErrorException("Error loading types from assembly", ex);
return new List<Type>();
}
}

View File

@ -0,0 +1,5 @@
ES-A,1
ES-7,3
ES-12,6
ES-16,8
ES-18,11

View File

@ -57,6 +57,22 @@ namespace MediaBrowser.Controller.Entities
{
get
{
var extraType = ExtraType;
if (extraType.HasValue)
{
if (extraType.Value == Model.Entities.ExtraType.Sample)
{
return false;
}
if (extraType.Value == Model.Entities.ExtraType.ThemeVideo)
{
return false;
}
if (extraType.Value == Model.Entities.ExtraType.Trailer)
{
return false;
}
}
return true;
}
}

View File

@ -59,7 +59,7 @@ namespace MediaBrowser.Model.Sync
/// Gets or sets the status.
/// </summary>
/// <value>The status.</value>
public SyncJobStatus Status { get; set; }
public SyncJobStatus Status { get; set; }
/// <summary>
/// Gets or sets the user identifier.
/// </summary>
@ -105,9 +105,12 @@ namespace MediaBrowser.Model.Sync
public string PrimaryImageItemId { get; set; }
public string PrimaryImageTag { get; set; }
public bool EnableAutomaticResync { get; set; }
public SyncJob()
{
RequestedItemIds = new List<string>();
EnableAutomaticResync = true;
}
}
}

View File

@ -196,8 +196,6 @@ namespace MediaBrowser.Providers.TV
}
catch (HttpException ex)
{
Logger.Error("No metadata found for {0}", seasonNumber.Value);
if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.NotFound)
{
return result;

View File

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.23.1")]
[assembly: AssemblyVersion("3.2.24.1")]