timothy/ersatztv
1
0
Fork 0
Code Issues 51 Pull Requests 5 Actions Packages Projects Releases 9 Wiki Activity

ignore unsupported plex guids (#246)

Browse Source
This commit is contained in:
Jason Dove
2021-06-05 15:53:38 -05:00
committed by GitHub
parent c3b33c184f
commit 8346a02747
1 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErsatzTV.Infrastructure/Plex/PlexServerApiClient.cs
+36 -15
View File
@@ -10,6 +10,7 @@ using ErsatzTV.Core.Interfaces.Plex;
using ErsatzTV.Core.Plex; using ErsatzTV.Core.Plex;
using ErsatzTV.Infrastructure.Plex.Models; using ErsatzTV.Infrastructure.Plex.Models;
using LanguageExt; using LanguageExt;
using Microsoft.Extensions.Logging;
using Refit; using Refit;
using static LanguageExt.Prelude; using static LanguageExt.Prelude;
@@ -18,9 +19,15 @@ namespace ErsatzTV.Infrastructure.Plex
public class PlexServerApiClient : IPlexServerApiClient public class PlexServerApiClient : IPlexServerApiClient
{ {
private readonly IFallbackMetadataProvider _fallbackMetadataProvider; private readonly IFallbackMetadataProvider _fallbackMetadataProvider;
private readonly ILogger<PlexServerApiClient> _logger;
public PlexServerApiClient(IFallbackMetadataProvider fallbackMetadataProvider) => public PlexServerApiClient(
IFallbackMetadataProvider fallbackMetadataProvider,
ILogger<PlexServerApiClient> logger)
{
_fallbackMetadataProvider = fallbackMetadataProvider; _fallbackMetadataProvider = fallbackMetadataProvider;
_logger = logger;
}
public async Task<Either<BaseError, List<PlexLibrary>>> GetLibraries( public async Task<Either<BaseError, List<PlexLibrary>>> GetLibraries(
PlexConnection connection, PlexConnection connection,
@@ -358,10 +365,13 @@ namespace ErsatzTV.Infrastructure.Plex
metadata.Guids = Optional(xml.Guid).Flatten().Map(g => new MetadataGuid { Guid = g.Id }).ToList(); metadata.Guids = Optional(xml.Guid).Flatten().Map(g => new MetadataGuid { Guid = g.Id }).ToList();
if (!string.IsNullOrWhiteSpace(xml.PlexGuid)) if (!string.IsNullOrWhiteSpace(xml.PlexGuid))
{ {
string normalized = NormalizeGuid(xml.PlexGuid); Option<string> normalized = NormalizeGuid(xml.PlexGuid);
if (!string.IsNullOrWhiteSpace(normalized) && metadata.Guids.All(g => g.Guid != normalized)) foreach (string guid in normalized)
{ {
metadata.Guids.Add(new MetadataGuid { Guid = normalized }); if (metadata.Guids.All(g => g.Guid != guid))
{
metadata.Guids.Add(new MetadataGuid { Guid = guid });
}
} }
} }
} }
@@ -525,10 +535,13 @@ namespace ErsatzTV.Infrastructure.Plex
metadata.Guids = Optional(xml.Guid).Flatten().Map(g => new MetadataGuid { Guid = g.Id }).ToList(); metadata.Guids = Optional(xml.Guid).Flatten().Map(g => new MetadataGuid { Guid = g.Id }).ToList();
if (!string.IsNullOrWhiteSpace(xml.PlexGuid)) if (!string.IsNullOrWhiteSpace(xml.PlexGuid))
{ {
string normalized = NormalizeGuid(xml.PlexGuid); Option<string> normalized = NormalizeGuid(xml.PlexGuid);
if (!string.IsNullOrWhiteSpace(normalized) && metadata.Guids.All(g => g.Guid != normalized)) foreach (string guid in normalized)
{ {
metadata.Guids.Add(new MetadataGuid { Guid = normalized }); if (metadata.Guids.All(g => g.Guid != guid))
{
metadata.Guids.Add(new MetadataGuid { Guid = guid });
}
} }
} }
} }
@@ -598,10 +611,13 @@ namespace ErsatzTV.Infrastructure.Plex
metadata.Guids = Optional(response.Guid).Flatten().Map(g => new MetadataGuid { Guid = g.Id }).ToList(); metadata.Guids = Optional(response.Guid).Flatten().Map(g => new MetadataGuid { Guid = g.Id }).ToList();
if (!string.IsNullOrWhiteSpace(response.PlexGuid)) if (!string.IsNullOrWhiteSpace(response.PlexGuid))
{ {
string normalized = NormalizeGuid(response.PlexGuid); Option<string> normalized = NormalizeGuid(response.PlexGuid);
if (!string.IsNullOrWhiteSpace(normalized) && metadata.Guids.All(g => g.Guid != normalized)) foreach (string guid in normalized)
{ {
metadata.Guids.Add(new MetadataGuid { Guid = normalized }); if (metadata.Guids.All(g => g.Guid != guid))
{
metadata.Guids.Add(new MetadataGuid { Guid = guid });
}
} }
} }
@@ -711,10 +727,13 @@ namespace ErsatzTV.Infrastructure.Plex
metadata.Guids = Optional(xml.Guid).Flatten().Map(g => new MetadataGuid { Guid = g.Id }).ToList(); metadata.Guids = Optional(xml.Guid).Flatten().Map(g => new MetadataGuid { Guid = g.Id }).ToList();
if (!string.IsNullOrWhiteSpace(xml.PlexGuid)) if (!string.IsNullOrWhiteSpace(xml.PlexGuid))
{ {
string normalized = NormalizeGuid(xml.PlexGuid); Option<string> normalized = NormalizeGuid(xml.PlexGuid);
if (!string.IsNullOrWhiteSpace(normalized) && metadata.Guids.All(g => g.Guid != normalized)) foreach (string guid in normalized)
{ {
metadata.Guids.Add(new MetadataGuid { Guid = normalized }); if (metadata.Guids.All(g => g.Guid != guid))
{
metadata.Guids.Add(new MetadataGuid { Guid = guid });
}
} }
} }
} }
@@ -763,7 +782,7 @@ namespace ErsatzTV.Infrastructure.Plex
return actor; return actor;
} }
private string NormalizeGuid(string guid) private Option<string> NormalizeGuid(string guid)
{ {
if (guid.StartsWith("plex://show") || if (guid.StartsWith("plex://show") ||
guid.StartsWith("plex://season") || guid.StartsWith("plex://season") ||
@@ -787,7 +806,9 @@ namespace ErsatzTV.Infrastructure.Plex
return $"tmdb://{strip2}"; return $"tmdb://{strip2}";
} }
throw new NotSupportedException(guid); _logger.LogWarning("Unsupported guid format from Plex; ignoring: {Guid}", guid);
return None;
} }
} }
} }