lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2050 from Bond-009/nullref

Browse Source 
Fix possible nullref when updating packages
This commit is contained in:
dkanada 2019-12-05 15:23:48 +09:00 committed by GitHub
commit a7ef1aa7ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Emby.Server.Implementations/Emby.Server.Implementations.csproj
View File

@ -37,6 +37,7 @@
<PackageReference Include="ServiceStack.Text.Core" Version="5.7.0" /> <PackageReference Include="ServiceStack.Text.Core" Version="5.7.0" />
<PackageReference Include="sharpcompress" Version="0.24.0" /> <PackageReference Include="sharpcompress" Version="0.24.0" />
<PackageReference Include="SQLitePCL.pretty.netstandard" Version="2.0.1" /> <PackageReference Include="SQLitePCL.pretty.netstandard" Version="2.0.1" />
<PackageReference Include="System.Interactive.Async" Version="4.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
View File

@ -52,7 +52,9 @@ namespace Emby.Server.Implementations.ScheduledTasks
{ {
progress.Report(0); progress.Report(0);
var packagesToInstall = (await _installationManager.GetAvailablePluginUpdates(cancellationToken).ConfigureAwait(false)).ToList(); var packagesToInstall = await _installationManager.GetAvailablePluginUpdates(cancellationToken)
.ToListAsync(cancellationToken)
.ConfigureAwait(false);
progress.Report(10); progress.Report(10);

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

@ -180,7 +180,7 @@ namespace Emby.Server.Implementations.Updates
// Package not found. // Package not found.
if (package == null) if (package == null)
{ {
return null; return Enumerable.Empty<PackageVersionInfo>();
} }
return GetCompatibleVersions( return GetCompatibleVersions(
@ -190,19 +190,23 @@ namespace Emby.Server.Implementations.Updates
} }
/// <inheritdoc /> /// <inheritdoc />
public async Task<IEnumerable<PackageVersionInfo>> GetAvailablePluginUpdates(CancellationToken cancellationToken = default) public async IAsyncEnumerable<PackageVersionInfo> GetAvailablePluginUpdates(CancellationToken cancellationToken = default)
{ {
var catalog = await GetAvailablePackages(cancellationToken).ConfigureAwait(false); var catalog = await GetAvailablePackages(cancellationToken).ConfigureAwait(false);
var systemUpdateLevel = _applicationHost.SystemUpdateLevel; var systemUpdateLevel = _applicationHost.SystemUpdateLevel;
// Figure out what needs to be installed // Figure out what needs to be installed
return _applicationHost.Plugins.Select(x => foreach (var plugin in _applicationHost.Plugins)
{ {
var compatibleversions = GetCompatibleVersions(catalog, x.Name, x.Id, x.Version, systemUpdateLevel); var compatibleversions = GetCompatibleVersions(catalog, plugin.Name, plugin.Id, plugin.Version, systemUpdateLevel);
return compatibleversions.FirstOrDefault(y => y.Version > x.Version); var version = compatibleversions.FirstOrDefault(y => y.Version > plugin.Version);
}).Where(x => x != null) if (version != null
.Where(x => !CompletedInstallations.Any(y => string.Equals(y.AssemblyGuid, x.guid, StringComparison.OrdinalIgnoreCase))); && !CompletedInstallations.Any(x => string.Equals(x.AssemblyGuid, version.guid, StringComparison.OrdinalIgnoreCase)))
{
yield return version;
}
}
} }
/// <inheritdoc /> /// <inheritdoc />

2
MediaBrowser.Common/Updates/IInstallationManager.cs
View File

@ -92,7 +92,7 @@ namespace MediaBrowser.Common.Updates
/// </summary> /// </summary>
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>The available plugin updates.</returns> /// <returns>The available plugin updates.</returns>
Task<IEnumerable<PackageVersionInfo>> GetAvailablePluginUpdates(CancellationToken cancellationToken = default); IAsyncEnumerable<PackageVersionInfo> GetAvailablePluginUpdates(CancellationToken cancellationToken = default);
/// <summary> /// <summary>
/// Installs the package. /// Installs the package.