Merge pull request #2911 from MediaBrowser/dev

Dev
This commit is contained in:
Luke 2017-09-23 21:10:16 -04:00 committed by GitHub
commit 65878a72da
6 changed files with 35 additions and 17 deletions

View File

@ -2211,6 +2211,8 @@ namespace Emby.Server.Implementations
TimeSpan.FromHours(12) : TimeSpan.FromHours(12) :
TimeSpan.FromMinutes(5); TimeSpan.FromMinutes(5);
try
{
var result = await new GithubUpdater(HttpClient, JsonSerializer).CheckForUpdateResult("MediaBrowser", var result = await new GithubUpdater(HttpClient, JsonSerializer).CheckForUpdateResult("MediaBrowser",
"Emby", "Emby",
ApplicationVersion, ApplicationVersion,
@ -2225,6 +2227,21 @@ namespace Emby.Server.Implementations
return result; return result;
} }
catch (HttpException ex)
{
// users are overreacting to this occasionally failing
if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.Forbidden)
{
HasUpdateAvailable = false;
return new CheckForUpdateResult
{
IsUpdateAvailable = false
};
}
throw;
}
}
protected virtual string UpdateTargetFileName protected virtual string UpdateTargetFileName
{ {

View File

@ -3750,7 +3750,7 @@ namespace Emby.Server.Implementations.Data
if (query.MinDateLastSaved.HasValue) if (query.MinDateLastSaved.HasValue)
{ {
whereClauses.Add("DateLastSaved>=@MinDateLastSaved"); whereClauses.Add("(DateLastSaved not null and DateLastSaved>=@MinDateLastSavedForUser)");
if (statement != null) if (statement != null)
{ {
statement.TryBind("@MinDateLastSaved", query.MinDateLastSaved.Value); statement.TryBind("@MinDateLastSaved", query.MinDateLastSaved.Value);
@ -3759,7 +3759,7 @@ namespace Emby.Server.Implementations.Data
if (query.MinDateLastSavedForUser.HasValue) if (query.MinDateLastSavedForUser.HasValue)
{ {
whereClauses.Add("DateLastSaved>=@MinDateLastSavedForUser"); whereClauses.Add("(DateLastSaved not null and DateLastSaved>=@MinDateLastSavedForUser)");
if (statement != null) if (statement != null)
{ {
statement.TryBind("@MinDateLastSavedForUser", query.MinDateLastSavedForUser.Value); statement.TryBind("@MinDateLastSavedForUser", query.MinDateLastSavedForUser.Value);

View File

@ -533,7 +533,7 @@ namespace Emby.Server.Implementations.HttpServer
{ {
stream.Dispose(); stream.Dispose();
return GetHttpResult(new byte[] { }, contentType, true); return GetHttpResult(new byte[] { }, contentType, true, responseHeaders);
} }
var hasHeaders = new StreamWriter(stream, contentType, _logger) var hasHeaders = new StreamWriter(stream, contentType, _logger)

View File

@ -25,7 +25,8 @@ namespace MediaBrowser.Model.Configuration
EnableThrottling = true; EnableThrottling = true;
ThrottleDelaySeconds = 180; ThrottleDelaySeconds = 180;
EncodingThreadCount = -1; EncodingThreadCount = -1;
VaapiDevice = "/dev/dri/card0"; // This is a DRM device that is almost guaranteed to be there on every intel platform, plus it's the default one in ffmpeg if you don't specify anything
VaapiDevice = "/dev/dri/renderD128";
H264Crf = 23; H264Crf = 23;
EnableHardwareEncoding = true; EnableHardwareEncoding = true;
EnableSubtitleExtraction = true; EnableSubtitleExtraction = true;

View File

@ -26,7 +26,7 @@ namespace MediaBrowser.Server.Mono
get get
{ {
// A restart script must be provided // A restart script must be provided
return StartupOptions.ContainsOption("-restartpath"); return false;
} }
} }

View File

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