alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-15 18:53:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #5005 from jellyfin/bytes

Browse Source 
JsonSerializer deserialize from bytes where possible
This commit is contained in:
dkanada
2021-02-05 11:47:06 +09:00
committed by GitHub
parent 2e9661c415 1fdd2d6e05
commit 54a3ab15a3
5 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Emby.Server.Implementations/Plugins/PluginManager.cs
View File

@@ -526,32 +526,36 @@ namespace Emby.Server.Implementations.Plugins
var metafile = Path.Combine(dir, "meta.json");
if (File.Exists(metafile))
{
// Only path where this stays null is when File.ReadAllBytes throws an IOException
byte[] data = null!;
try
{
var data = File.ReadAllText(metafile, Encoding.UTF8);
data = File.ReadAllBytes(metafile);
manifest = JsonSerializer.Deserialize<PluginManifest>(data, _jsonOptions);
}
#pragma warning disable CA1031 // Do not catch general exception types
catch (Exception ex)
#pragma warning restore CA1031 // Do not catch general exception types
catch (IOException ex)
{
_logger.LogError(ex, "Error deserializing {Path}.", dir);
_logger.LogError(ex, "Error reading file {Path}.", dir);
}
}
if (manifest != null)
{
if (!Version.TryParse(manifest.TargetAbi, out var targetAbi))
catch (JsonException ex)
{
targetAbi = _minimumVersion;
_logger.LogError(ex, "Error deserializing {Json}.", Encoding.UTF8.GetString(data!));
}
if (!Version.TryParse(manifest.Version, out version))
if (manifest != null)
{
manifest.Version = _minimumVersion.ToString();
}
if (!Version.TryParse(manifest.TargetAbi, out var targetAbi))
{
targetAbi = _minimumVersion;
}
return new LocalPlugin(dir, _appVersion >= targetAbi, manifest);
if (!Version.TryParse(manifest.Version, out version))
{
manifest.Version = _minimumVersion.ToString();
}
return new LocalPlugin(dir, _appVersion >= targetAbi, manifest);
}
}
// No metafile, so lets see if the folder is versioned.