From 2a041803c96c4e61a3e5a5e8ae66cd5e31b24049 Mon Sep 17 00:00:00 2001
From: Jason Dove <jason@jasondove.me>
Date: Fri, 26 Feb 2021 14:29:50 -0600
Subject: [PATCH] fix scanner tests

---
 ErsatzTV.Core/Metadata/MovieFolderScanner.cs      | 5 +++--
 ErsatzTV.Core/Metadata/TelevisionFolderScanner.cs | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ErsatzTV.Core/Metadata/MovieFolderScanner.cs b/ErsatzTV.Core/Metadata/MovieFolderScanner.cs
index 0c0e05b53..732f756a8 100644
--- a/ErsatzTV.Core/Metadata/MovieFolderScanner.cs
+++ b/ErsatzTV.Core/Metadata/MovieFolderScanner.cs
@@ -96,7 +96,8 @@ namespace ErsatzTV.Core.Metadata
                 await LocateNfoFile(movie).Match(
                     async nfoFile =>
                     {
-                        bool shouldUpdate = movie.MovieMetadata.HeadOrNone().Match(
+                        
+                        bool shouldUpdate = Optional(movie.MovieMetadata).Flatten().HeadOrNone().Match(
                             m => m.MetadataKind == MetadataKind.Fallback ||
                                  m.DateUpdated < _localFileSystem.GetLastWriteTime(nfoFile),
                             true);
@@ -109,7 +110,7 @@ namespace ErsatzTV.Core.Metadata
                     },
                     async () =>
                     {
-                        if (!movie.MovieMetadata.Any())
+                        if (!Optional(movie.MovieMetadata).Flatten().Any())
                         {
                             _logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", movie.Path);
                             await _localMetadataProvider.RefreshFallbackMetadata(movie);
diff --git a/ErsatzTV.Core/Metadata/TelevisionFolderScanner.cs b/ErsatzTV.Core/Metadata/TelevisionFolderScanner.cs
index 673c1ed43..3a5320941 100644
--- a/ErsatzTV.Core/Metadata/TelevisionFolderScanner.cs
+++ b/ErsatzTV.Core/Metadata/TelevisionFolderScanner.cs
@@ -138,7 +138,7 @@ namespace ErsatzTV.Core.Metadata
                 await LocateNfoFileForShow(showFolder).Match(
                     async nfoFile =>
                     {
-                        bool shouldUpdate = show.ShowMetadata.HeadOrNone().Match(
+                        bool shouldUpdate = Optional(show.ShowMetadata).Flatten().HeadOrNone().Match(
                             m => m.MetadataKind == MetadataKind.Fallback ||
                                  m.DateUpdated < _localFileSystem.GetLastWriteTime(nfoFile),
                             true);
@@ -151,7 +151,7 @@ namespace ErsatzTV.Core.Metadata
                     },
                     async () =>
                     {
-                        if (!show.ShowMetadata.Any())
+                        if (!Optional(show.ShowMetadata).Flatten().Any())
                         {
                             _logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", showFolder);
                             await _localMetadataProvider.RefreshFallbackMetadata(show, showFolder);
@@ -174,7 +174,7 @@ namespace ErsatzTV.Core.Metadata
                 await LocateNfoFile(episode).Match(
                     async nfoFile =>
                     {
-                        bool shouldUpdate = episode.EpisodeMetadata.HeadOrNone().Match(
+                        bool shouldUpdate = Optional(episode.EpisodeMetadata).Flatten().HeadOrNone().Match(
                             m => m.MetadataKind == MetadataKind.Fallback ||
                                  m.DateUpdated < _localFileSystem.GetLastWriteTime(nfoFile),
                             true);
@@ -187,7 +187,7 @@ namespace ErsatzTV.Core.Metadata
                     },
                     async () =>
                     {
-                        if (!episode.EpisodeMetadata.Any())
+                        if (!Optional(episode.EpisodeMetadata).Flatten().Any())
                         {
                             _logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", episode.Path);
                             await _localMetadataProvider.RefreshFallbackMetadata(episode);