From 49e20a17b3ff3a912f64b8d2e52e7e8576a266d9 Mon Sep 17 00:00:00 2001
From: Jason Dove <jason@jasondove.me>
Date: Sat, 20 Feb 2021 18:36:03 -0600
Subject: [PATCH] minor cleanup

---
 .../Metadata/LocalMetadataProvider.cs          | 18 +++---------------
 ErsatzTV.Core/Metadata/MovieFolderScanner.cs   |  6 +++++-
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/ErsatzTV.Core/Metadata/LocalMetadataProvider.cs b/ErsatzTV.Core/Metadata/LocalMetadataProvider.cs
index d6d03994a..1b690a09c 100644
--- a/ErsatzTV.Core/Metadata/LocalMetadataProvider.cs
+++ b/ErsatzTV.Core/Metadata/LocalMetadataProvider.cs
@@ -81,11 +81,7 @@ namespace ErsatzTV.Core.Metadata
 
         private async Task ApplyMetadataUpdate(TelevisionEpisodeMediaItem mediaItem, TelevisionEpisodeMetadata metadata)
         {
-            if (mediaItem.Metadata == null)
-            {
-                mediaItem.Metadata = new TelevisionEpisodeMetadata { TelevisionEpisodeId = mediaItem.Id };
-            }
-
+            mediaItem.Metadata ??= new TelevisionEpisodeMetadata { TelevisionEpisodeId = mediaItem.Id };
             mediaItem.Metadata.Source = metadata.Source;
             mediaItem.Metadata.LastWriteTime = metadata.LastWriteTime;
             mediaItem.Metadata.Title = metadata.Title;
@@ -100,11 +96,7 @@ namespace ErsatzTV.Core.Metadata
 
         private async Task ApplyMetadataUpdate(MovieMediaItem mediaItem, MovieMetadata metadata)
         {
-            if (mediaItem.Metadata == null)
-            {
-                mediaItem.Metadata = new MovieMetadata();
-            }
-
+            mediaItem.Metadata ??= new MovieMetadata();
             mediaItem.Metadata.Source = metadata.Source;
             mediaItem.Metadata.LastWriteTime = metadata.LastWriteTime;
             mediaItem.Metadata.Title = metadata.Title;
@@ -121,11 +113,7 @@ namespace ErsatzTV.Core.Metadata
 
         private async Task ApplyMetadataUpdate(TelevisionShow televisionShow, TelevisionShowMetadata metadata)
         {
-            if (televisionShow.Metadata == null)
-            {
-                televisionShow.Metadata = new TelevisionShowMetadata();
-            }
-
+            televisionShow.Metadata ??= new TelevisionShowMetadata();
             televisionShow.Metadata.Source = metadata.Source;
             televisionShow.Metadata.LastWriteTime = metadata.LastWriteTime;
             televisionShow.Metadata.Title = metadata.Title;
diff --git a/ErsatzTV.Core/Metadata/MovieFolderScanner.cs b/ErsatzTV.Core/Metadata/MovieFolderScanner.cs
index 23006b56f..d35fb15ab 100644
--- a/ErsatzTV.Core/Metadata/MovieFolderScanner.cs
+++ b/ErsatzTV.Core/Metadata/MovieFolderScanner.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Images;
@@ -46,7 +47,10 @@ namespace ErsatzTV.Core.Metadata
             foreach (string movieFolder in _localFileSystem.ListSubdirectories(localMediaSource.Folder))
             {
                 foreach (string file in _localFileSystem.ListFiles(movieFolder)
-                    .Filter(f => VideoFileExtensions.Contains(Path.GetExtension(f))))
+                    .Filter(f => VideoFileExtensions.Contains(Path.GetExtension(f)))
+                    .Filter(
+                        f => !ExtraFiles.Any(
+                            e => Path.GetFileNameWithoutExtension(f).EndsWith(e, StringComparison.OrdinalIgnoreCase))))
                 {
                     // TODO: figure out how to rebuild playlists
                     Either<BaseError, MovieMediaItem> maybeMovie = await _movieRepository