michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrections as recommended.

Browse Source
This commit is contained in:
Greenback 2020-12-16 22:36:25 +00:00
parent ebbb57efc3
commit 1ed25ebd9a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,7 @@ namespace Emby.Server.Implementations.Updates
_httpClientFactory = httpClientFactory;
_config = config;
_zipClient = zipClient;
_jsonSerializerOptions = JsonDefaults.GetCamelCaseOptions();
_jsonSerializerOptions = JsonDefaults.GetOptions();
_pluginManager = pluginManager;
}
@ -104,8 +104,7 @@ namespace Emby.Server.Implementations.Updates
{
try
{
List<PackageInfo>? packages;
packages = await _httpClientFactory.CreateClient(NamedClient.Default)
List<PackageInfo>? packages = await _httpClientFactory.CreateClient(NamedClient.Default)
.GetFromJsonAsync<List<PackageInfo>>(new Uri(manifest), _jsonSerializerOptions, cancellationToken).ConfigureAwait(false);
if (packages == null)

16
Jellyfin.Api/Controllers/PluginsController.cs
View File

@ -217,8 +217,13 @@ namespace Jellyfin.Api.Controllers
plugin = plugins.OrderBy(p => p.Manifest.Status).FirstOrDefault();
}
_installationManager.UninstallPlugin(plugin!);
return NoContent();
if (plugin != null)
{
_installationManager.UninstallPlugin(plugin!);
return NoContent();
}
return NotFound();
}
/// <summary>
@ -303,10 +308,7 @@ namespace Jellyfin.Api.Controllers
|| plugin.Manifest.ImageUrl == null
|| !System.IO.File.Exists(imgPath))
{
// Use a blank image.
var type = GetType();
var stream = type.Assembly.GetManifestResourceStream(type.Namespace + ".Plugins.blank.png");
return File(stream, "image/png");
return NotFound();
}
imgPath = Path.Combine(plugin.Path, plugin.Manifest.ImageUrl);
@ -333,7 +335,7 @@ namespace Jellyfin.Api.Controllers
if (plugin != null)
{
return Ok(plugin.Manifest);
return plugin.Manifest;
}
return NotFound();