Browse Source

fix scanner tests

pull/31/head
Jason Dove 6 years ago
parent
commit
2a041803c9
  1. 5
      ErsatzTV.Core/Metadata/MovieFolderScanner.cs
  2. 8
      ErsatzTV.Core/Metadata/TelevisionFolderScanner.cs

5
ErsatzTV.Core/Metadata/MovieFolderScanner.cs

@ -96,7 +96,8 @@ namespace ErsatzTV.Core.Metadata
await LocateNfoFile(movie).Match( await LocateNfoFile(movie).Match(
async nfoFile => async nfoFile =>
{ {
bool shouldUpdate = movie.MovieMetadata.HeadOrNone().Match(
bool shouldUpdate = Optional(movie.MovieMetadata).Flatten().HeadOrNone().Match(
m => m.MetadataKind == MetadataKind.Fallback || m => m.MetadataKind == MetadataKind.Fallback ||
m.DateUpdated < _localFileSystem.GetLastWriteTime(nfoFile), m.DateUpdated < _localFileSystem.GetLastWriteTime(nfoFile),
true); true);
@ -109,7 +110,7 @@ namespace ErsatzTV.Core.Metadata
}, },
async () => async () =>
{ {
if (!movie.MovieMetadata.Any()) if (!Optional(movie.MovieMetadata).Flatten().Any())
{ {
_logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", movie.Path); _logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", movie.Path);
await _localMetadataProvider.RefreshFallbackMetadata(movie); await _localMetadataProvider.RefreshFallbackMetadata(movie);

8
ErsatzTV.Core/Metadata/TelevisionFolderScanner.cs

@ -138,7 +138,7 @@ namespace ErsatzTV.Core.Metadata
await LocateNfoFileForShow(showFolder).Match( await LocateNfoFileForShow(showFolder).Match(
async nfoFile => async nfoFile =>
{ {
bool shouldUpdate = show.ShowMetadata.HeadOrNone().Match( bool shouldUpdate = Optional(show.ShowMetadata).Flatten().HeadOrNone().Match(
m => m.MetadataKind == MetadataKind.Fallback || m => m.MetadataKind == MetadataKind.Fallback ||
m.DateUpdated < _localFileSystem.GetLastWriteTime(nfoFile), m.DateUpdated < _localFileSystem.GetLastWriteTime(nfoFile),
true); true);
@ -151,7 +151,7 @@ namespace ErsatzTV.Core.Metadata
}, },
async () => async () =>
{ {
if (!show.ShowMetadata.Any()) if (!Optional(show.ShowMetadata).Flatten().Any())
{ {
_logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", showFolder); _logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", showFolder);
await _localMetadataProvider.RefreshFallbackMetadata(show, showFolder); await _localMetadataProvider.RefreshFallbackMetadata(show, showFolder);
@ -174,7 +174,7 @@ namespace ErsatzTV.Core.Metadata
await LocateNfoFile(episode).Match( await LocateNfoFile(episode).Match(
async nfoFile => async nfoFile =>
{ {
bool shouldUpdate = episode.EpisodeMetadata.HeadOrNone().Match( bool shouldUpdate = Optional(episode.EpisodeMetadata).Flatten().HeadOrNone().Match(
m => m.MetadataKind == MetadataKind.Fallback || m => m.MetadataKind == MetadataKind.Fallback ||
m.DateUpdated < _localFileSystem.GetLastWriteTime(nfoFile), m.DateUpdated < _localFileSystem.GetLastWriteTime(nfoFile),
true); true);
@ -187,7 +187,7 @@ namespace ErsatzTV.Core.Metadata
}, },
async () => async () =>
{ {
if (!episode.EpisodeMetadata.Any()) if (!Optional(episode.EpisodeMetadata).Flatten().Any())
{ {
_logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", episode.Path); _logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", episode.Path);
await _localMetadataProvider.RefreshFallbackMetadata(episode); await _localMetadataProvider.RefreshFallbackMetadata(episode);

Loading…
Cancel
Save