Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-31 20:24:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix build errors and update plugin manifest location

Browse Source
This commit is contained in:
dkanada 2019-01-31 03:16:31 +09:00
parent 548270772c
commit 7e3c45c917
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS.md
View File

@ -15,6 +15,7 @@
- [cvium](https://github.com/cvium) - [cvium](https://github.com/cvium)
- [wtayl0r](https://github.com/wtayl0r) - [wtayl0r](https://github.com/wtayl0r)
- [TtheCreator](https://github.com/Tthecreator) - [TtheCreator](https://github.com/Tthecreator)
- [dkanada](https://github.com/dkanada)
- [LogicalPhallacy](https://github.com/LogicalPhallacy/) - [LogicalPhallacy](https://github.com/LogicalPhallacy/)
- [RazeLighter777](https://github.com/RazeLighter777) - [RazeLighter777](https://github.com/RazeLighter777)

8
Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
View File

@ -1,6 +1,5 @@
using MediaBrowser.Common; using MediaBrowser.Common;
using MediaBrowser.Common.Updates; using MediaBrowser.Common.Updates;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net; using MediaBrowser.Model.Net;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -10,6 +9,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Common.Progress; using MediaBrowser.Common.Progress;
using MediaBrowser.Model.Tasks; using MediaBrowser.Model.Tasks;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.ScheduledTasks namespace Emby.Server.Implementations.ScheduledTasks
{ {
@ -65,7 +65,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
{ {
progress.Report(0); 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); progress.Report(10);
@ -89,11 +89,11 @@ namespace Emby.Server.Implementations.ScheduledTasks
} }
catch (HttpException ex) catch (HttpException ex)
{ {
_logger.ErrorException("Error downloading {0}", ex, package.name); _logger.LogError(ex, "Error downloading {0}", package.name);
} }
catch (IOException ex) catch (IOException ex)
{ {
_logger.ErrorException("Error updating {0}", ex, package.name); _logger.LogError(ex, "Error updating {0}", package.name);
} }
// Update progress // Update progress

12
Emby.Server.Implementations/Updates/InstallationManager.cs
View File

@ -169,10 +169,8 @@ namespace Emby.Server.Implementations.Updates
string packageType = null, string packageType = null,
Version applicationVersion = null) Version applicationVersion = null)
{ {
// TODO cvium: when plugins get back this would need to be fixed var packages = await GetAvailablePackagesWithoutRegistrationInfo(cancellationToken).ConfigureAwait(false);
// var packages = await GetAvailablePackagesWithoutRegistrationInfo(cancellationToken).ConfigureAwait(false); return FilterPackages(packages, packageType, applicationVersion);
return Task.FromResult(new List<PackageInfo>()); //FilterPackages(packages, packageType, applicationVersion);
} }
/// <summary> /// <summary>
@ -184,12 +182,10 @@ namespace Emby.Server.Implementations.Updates
{ {
using (var response = await _httpClient.SendAsync(new HttpRequestOptions 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, CancellationToken = cancellationToken,
Progress = new SimpleProgress<double>(), Progress = new SimpleProgress<double>(),
CacheLength = GetCacheLength(), CacheLength = GetCacheLength()
CacheMode = CacheMode.Unconditional
}, "GET").ConfigureAwait(false)) }, "GET").ConfigureAwait(false))
{ {
using (var stream = response.Content) using (var stream = response.Content)