fix build errors and update plugin manifest location
This commit is contained in:
parent
548270772c
commit
7e3c45c917
|
@ -15,6 +15,7 @@
|
|||
- [cvium](https://github.com/cvium)
|
||||
- [wtayl0r](https://github.com/wtayl0r)
|
||||
- [TtheCreator](https://github.com/Tthecreator)
|
||||
- [dkanada](https://github.com/dkanada)
|
||||
- [LogicalPhallacy](https://github.com/LogicalPhallacy/)
|
||||
- [RazeLighter777](https://github.com/RazeLighter777)
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
using MediaBrowser.Common;
|
||||
using MediaBrowser.Common.Updates;
|
||||
using MediaBrowser.Model.Logging;
|
||||
using MediaBrowser.Model.Net;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
@ -10,6 +9,7 @@ using System.Threading;
|
|||
using System.Threading.Tasks;
|
||||
using MediaBrowser.Common.Progress;
|
||||
using MediaBrowser.Model.Tasks;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace Emby.Server.Implementations.ScheduledTasks
|
||||
{
|
||||
|
@ -65,7 +65,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
|
|||
{
|
||||
progress.Report(0);
|
||||
|
||||
var packagesToInstall = (await _installationManager.GetAvailablePluginUpdates(_appHost.ApplicationVersion, true, cancellationToken).ConfigureAwait(false)).ToList();
|
||||
var packagesToInstall = (await _installationManager.GetAvailablePluginUpdates(typeof(PluginUpdateTask).Assembly.GetName().Version, true, cancellationToken).ConfigureAwait(false)).ToList();
|
||||
|
||||
progress.Report(10);
|
||||
|
||||
|
@ -89,11 +89,11 @@ namespace Emby.Server.Implementations.ScheduledTasks
|
|||
}
|
||||
catch (HttpException ex)
|
||||
{
|
||||
_logger.ErrorException("Error downloading {0}", ex, package.name);
|
||||
_logger.LogError(ex, "Error downloading {0}", package.name);
|
||||
}
|
||||
catch (IOException ex)
|
||||
{
|
||||
_logger.ErrorException("Error updating {0}", ex, package.name);
|
||||
_logger.LogError(ex, "Error updating {0}", package.name);
|
||||
}
|
||||
|
||||
// Update progress
|
||||
|
|
|
@ -169,10 +169,8 @@ namespace Emby.Server.Implementations.Updates
|
|||
string packageType = null,
|
||||
Version applicationVersion = null)
|
||||
{
|
||||
// TODO cvium: when plugins get back this would need to be fixed
|
||||
// var packages = await GetAvailablePackagesWithoutRegistrationInfo(cancellationToken).ConfigureAwait(false);
|
||||
|
||||
return Task.FromResult(new List<PackageInfo>()); //FilterPackages(packages, packageType, applicationVersion);
|
||||
var packages = await GetAvailablePackagesWithoutRegistrationInfo(cancellationToken).ConfigureAwait(false);
|
||||
return FilterPackages(packages, packageType, applicationVersion);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -184,12 +182,10 @@ namespace Emby.Server.Implementations.Updates
|
|||
{
|
||||
using (var response = await _httpClient.SendAsync(new HttpRequestOptions
|
||||
{
|
||||
Url = "https://www.mb3admin.local/admin/service/EmbyPackages.json",
|
||||
Url = "https://repo.jellyfin.org/releases/plugin/manifest.json",
|
||||
CancellationToken = cancellationToken,
|
||||
Progress = new SimpleProgress<double>(),
|
||||
CacheLength = GetCacheLength(),
|
||||
CacheMode = CacheMode.Unconditional
|
||||
|
||||
CacheLength = GetCacheLength()
|
||||
}, "GET").ConfigureAwait(false))
|
||||
{
|
||||
using (var stream = response.Content)
|
||||
|
|
Loading…
Reference in New Issue
Block a user