update sync menus
This commit is contained in:
parent
a0e7cdd2dc
commit
cdf573c921
|
@ -151,7 +151,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
|
||||||
|
|
||||||
Id = channel.Path.GetMD5().ToString("N"),
|
Id = channel.Path.GetMD5().ToString("N"),
|
||||||
IsInfiniteStream = true,
|
IsInfiniteStream = true,
|
||||||
IsRemote = true
|
IsRemote = true,
|
||||||
|
|
||||||
|
IgnoreDts = true
|
||||||
};
|
};
|
||||||
|
|
||||||
mediaSource.InferTotalBitrate();
|
mediaSource.InferTotalBitrate();
|
||||||
|
|
|
@ -71,8 +71,6 @@ namespace Emby.Server.Implementations.ScheduledTasks
|
||||||
// Create a progress object for the update check
|
// Create a progress object for the update check
|
||||||
var updateInfo = await _appHost.CheckForApplicationUpdate(cancellationToken, new SimpleProgress<double>()).ConfigureAwait(false);
|
var updateInfo = await _appHost.CheckForApplicationUpdate(cancellationToken, new SimpleProgress<double>()).ConfigureAwait(false);
|
||||||
|
|
||||||
progress.Report(10);
|
|
||||||
|
|
||||||
if (!updateInfo.IsUpdateAvailable)
|
if (!updateInfo.IsUpdateAvailable)
|
||||||
{
|
{
|
||||||
Logger.Debug("No application update available.");
|
Logger.Debug("No application update available.");
|
||||||
|
@ -87,15 +85,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
|
||||||
{
|
{
|
||||||
Logger.Info("Update Revision {0} available. Updating...", updateInfo.AvailableVersion);
|
Logger.Info("Update Revision {0} available. Updating...", updateInfo.AvailableVersion);
|
||||||
|
|
||||||
EventHandler<double> innerProgressHandler = (sender, e) => progress.Report(e * .9 + .1);
|
await _appHost.UpdateApplication(updateInfo.Package, cancellationToken, progress).ConfigureAwait(false);
|
||||||
|
|
||||||
var innerProgress = new SimpleProgress<double>();
|
|
||||||
innerProgress.ProgressChanged += innerProgressHandler;
|
|
||||||
|
|
||||||
await _appHost.UpdateApplication(updateInfo.Package, cancellationToken, innerProgress).ConfigureAwait(false);
|
|
||||||
|
|
||||||
// Release the event handler
|
|
||||||
innerProgress.ProgressChanged -= innerProgressHandler;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,6 +17,7 @@ using System.Threading.Tasks;
|
||||||
|
|
||||||
using MediaBrowser.Controller.Dto;
|
using MediaBrowser.Controller.Dto;
|
||||||
using MediaBrowser.Controller.IO;
|
using MediaBrowser.Controller.IO;
|
||||||
|
using MediaBrowser.Controller.LiveTv;
|
||||||
using MediaBrowser.Model.IO;
|
using MediaBrowser.Model.IO;
|
||||||
using MediaBrowser.Model.Services;
|
using MediaBrowser.Model.Services;
|
||||||
|
|
||||||
|
@ -567,7 +568,9 @@ namespace MediaBrowser.Api.Images
|
||||||
|
|
||||||
}).ToList() : new List<IImageEnhancer>();
|
}).ToList() : new List<IImageEnhancer>();
|
||||||
|
|
||||||
var cropwhitespace = request.Type == ImageType.Logo || request.Type == ImageType.Art;
|
var cropwhitespace = request.Type == ImageType.Logo ||
|
||||||
|
request.Type == ImageType.Art
|
||||||
|
|| (request.Type == ImageType.Primary && item is LiveTvChannel);
|
||||||
|
|
||||||
if (request.CropWhitespace.HasValue)
|
if (request.CropWhitespace.HasValue)
|
||||||
{
|
{
|
||||||
|
|
|
@ -90,6 +90,8 @@ namespace MediaBrowser.Controller.Sync
|
||||||
/// </summary>
|
/// </summary>
|
||||||
IEnumerable<SyncTarget> GetSyncTargets(string userId);
|
IEnumerable<SyncTarget> GetSyncTargets(string userId);
|
||||||
|
|
||||||
|
IEnumerable<SyncTarget> GetSyncTargets(string userId, bool? supportsRemoteSync);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Supportses the synchronize.
|
/// Supportses the synchronize.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -11,6 +11,8 @@ namespace MediaBrowser.Controller.Sync
|
||||||
/// <value>The name.</value>
|
/// <value>The name.</value>
|
||||||
string Name { get; }
|
string Name { get; }
|
||||||
|
|
||||||
|
bool SupportsRemoteSync { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the synchronize targets.
|
/// Gets the synchronize targets.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -27,6 +29,6 @@ namespace MediaBrowser.Controller.Sync
|
||||||
|
|
||||||
public interface IHasUniqueTargetIds
|
public interface IHasUniqueTargetIds
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>MediaBrowser.Common</id>
|
<id>MediaBrowser.Common</id>
|
||||||
<version>3.0.705</version>
|
<version>3.0.707</version>
|
||||||
<title>Emby.Common</title>
|
<title>Emby.Common</title>
|
||||||
<authors>Emby Team</authors>
|
<authors>Emby Team</authors>
|
||||||
<owners>ebr,Luke,scottisafool</owners>
|
<owners>ebr,Luke,scottisafool</owners>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>MediaBrowser.Server.Core</id>
|
<id>MediaBrowser.Server.Core</id>
|
||||||
<version>3.0.705</version>
|
<version>3.0.707</version>
|
||||||
<title>Emby.Server.Core</title>
|
<title>Emby.Server.Core</title>
|
||||||
<authors>Emby Team</authors>
|
<authors>Emby Team</authors>
|
||||||
<owners>ebr,Luke,scottisafool</owners>
|
<owners>ebr,Luke,scottisafool</owners>
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
<description>Contains core components required to build plugins for Emby Server.</description>
|
<description>Contains core components required to build plugins for Emby Server.</description>
|
||||||
<copyright>Copyright © Emby 2013</copyright>
|
<copyright>Copyright © Emby 2013</copyright>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency id="MediaBrowser.Common" version="3.0.705" />
|
<dependency id="MediaBrowser.Common" version="3.0.707" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</metadata>
|
</metadata>
|
||||||
<files>
|
<files>
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.25.4")]
|
[assembly: AssemblyVersion("3.2.25.5")]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user