From b96420b7865538439c6a96305d70fa4f16dfd591 Mon Sep 17 00:00:00 2001
From: SenorSmartyPants <senorsmartypants@gmail.com>
Date: Sun, 26 Feb 2023 13:32:46 -0600
Subject: [PATCH 1/5] Clean Extra Names

- Adds regular expression to CleanStrings to remove suffix style extra naming from the name presented in JF.
- Override Resolve for Extras to enable parsename
- remove exclusion on parsename of extratypes
---
 Emby.Naming/Common/NamingOptions.cs                   |  3 ++-
 Emby.Naming/Video/VideoResolver.cs                    |  3 +--
 .../Library/Resolvers/ExtraResolver.cs                | 11 +++++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Emby.Naming/Common/NamingOptions.cs b/Emby.Naming/Common/NamingOptions.cs
index e9161a6b7b..1406c64435 100644
--- a/Emby.Naming/Common/NamingOptions.cs
+++ b/Emby.Naming/Common/NamingOptions.cs
@@ -157,7 +157,8 @@ namespace Emby.Naming.Common
                 @"^(?<cleaned>.+?)(\[.*\])",
                 @"^\s*(?<cleaned>.+?)\WE[0-9]+(-|~)E?[0-9]+(\W|$)",
                 @"^\s*\[[^\]]+\](?!\.\w+$)\s*(?<cleaned>.+)",
-                @"^\s*(?<cleaned>.+?)\s+-\s+[0-9]+\s*$"
+                @"^\s*(?<cleaned>.+?)\s+-\s+[0-9]+\s*$",
+                @"^\s*(?<cleaned>.+?)(([-._ ](trailer|sample))|-(scene|clip|behindthescenes|deleted|deletedscene|featurette|short|interview|other|extra))$"
             };
 
             SubtitleFileExtensions = new[]
diff --git a/Emby.Naming/Video/VideoResolver.cs b/Emby.Naming/Video/VideoResolver.cs
index 858e9dd2f5..db5bfdbf94 100644
--- a/Emby.Naming/Video/VideoResolver.cs
+++ b/Emby.Naming/Video/VideoResolver.cs
@@ -87,8 +87,7 @@ namespace Emby.Naming.Video
                 name = cleanDateTimeResult.Name;
                 year = cleanDateTimeResult.Year;
 
-                if (extraResult.ExtraType is null
-                    && TryCleanString(name, namingOptions, out var newName))
+                if (TryCleanString(name, namingOptions, out var newName))
                 {
                     name = newName;
                 }
diff --git a/Emby.Server.Implementations/Library/Resolvers/ExtraResolver.cs b/Emby.Server.Implementations/Library/Resolvers/ExtraResolver.cs
index 0b255f673b..b4791b9456 100644
--- a/Emby.Server.Implementations/Library/Resolvers/ExtraResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/ExtraResolver.cs
@@ -4,6 +4,7 @@ using System.IO;
 using Emby.Naming.Common;
 using Emby.Naming.Video;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Model.Entities;
@@ -15,7 +16,7 @@ namespace Emby.Server.Implementations.Library.Resolvers
     /// <summary>
     /// Resolves a Path into a Video or Video subclass.
     /// </summary>
-    internal class ExtraResolver
+    internal class ExtraResolver : BaseVideoResolver<Video>
     {
         private readonly NamingOptions _namingOptions;
         private readonly IItemResolver[] _trailerResolvers;
@@ -28,10 +29,16 @@ namespace Emby.Server.Implementations.Library.Resolvers
         /// <param name="namingOptions">An instance of <see cref="NamingOptions"/>.</param>
         /// <param name="directoryService">The directory service.</param>
         public ExtraResolver(ILogger<ExtraResolver> logger, NamingOptions namingOptions, IDirectoryService directoryService)
+            : base(logger, namingOptions, directoryService)
         {
             _namingOptions = namingOptions;
             _trailerResolvers = new IItemResolver[] { new GenericVideoResolver<Trailer>(logger, namingOptions, directoryService) };
-            _videoResolvers = new IItemResolver[] { new GenericVideoResolver<Video>(logger, namingOptions, directoryService) };
+            _videoResolvers = new IItemResolver[] { this };
+        }
+
+        protected override Video Resolve(ItemResolveArgs args)
+        {
+            return ResolveVideo<Video>(args, true);
         }
 
         /// <summary>

From 99816b07dceeb72f437a0578172a9d488ce0fcc5 Mon Sep 17 00:00:00 2001
From: SenorSmartyPants <senorsmartypants@gmail.com>
Date: Sun, 26 Feb 2023 13:35:00 -0600
Subject: [PATCH 2/5] Enable NFO processing for Extras

- Change test to prevent owned items from using parent NFO. Test is now in MovieNFOSaver, only movie type will use movie.nfo.
---
 MediaBrowser.Providers/Manager/ProviderManager.cs | 6 ------
 MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs | 3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 81ccd86534..d8122511ee 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -404,12 +404,6 @@ namespace MediaBrowser.Providers.Manager
                 return false;
             }
 
-            // Prevent owned items from reading the same local metadata file as their owner
-            if (!item.OwnerId.Equals(default) && provider is ILocalMetadataProvider)
-            {
-                return false;
-            }
-
             if (includeDisabled)
             {
                 return true;
diff --git a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
index 21e7e2335b..28cf9f7438 100644
--- a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
@@ -62,7 +62,8 @@ namespace MediaBrowser.XbmcMetadata.Savers
             {
                 yield return Path.ChangeExtension(item.Path, ".nfo");
 
-                if (!item.IsInMixedFolder)
+                // only allow movie object to read movie.nfo, not owned videos (which will be itemtype video, not movie)
+                if (!item.IsInMixedFolder && item.ItemType.Equals(typeof(Movie)))
                 {
                     yield return Path.Combine(item.ContainingFolderPath, "movie.nfo");
                 }

From 04f23a0e735b29376ced0f6c78aa762f11b8b475 Mon Sep 17 00:00:00 2001
From: SenorSmartyPants <senorsmartypants@gmail.com>
Date: Sun, 26 Feb 2023 14:13:21 -0600
Subject: [PATCH 3/5] Change test to allow owned items to run local providers

I need more information about the need for this test, to make sure I am not introducing an issue.
---
 .../Jellyfin.Providers.Tests/Manager/ProviderManagerTests.cs  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Jellyfin.Providers.Tests/Manager/ProviderManagerTests.cs b/tests/Jellyfin.Providers.Tests/Manager/ProviderManagerTests.cs
index 5ca59f0ede..400e30bd63 100644
--- a/tests/Jellyfin.Providers.Tests/Manager/ProviderManagerTests.cs
+++ b/tests/Jellyfin.Providers.Tests/Manager/ProviderManagerTests.cs
@@ -368,8 +368,8 @@ namespace Jellyfin.Providers.Tests.Manager
         [Theory]
         [InlineData(nameof(ICustomMetadataProvider), true)]
         [InlineData(nameof(IRemoteMetadataProvider), true)]
-        [InlineData(nameof(ILocalMetadataProvider), false)]
-        public void GetMetadataProviders_CanRefreshMetadataOwned_WhenNotLocal(string providerType, bool expected)
+        [InlineData(nameof(ILocalMetadataProvider), true)]
+        public void GetMetadataProviders_CanRefreshMetadataOwned(string providerType, bool expected)
         {
             GetMetadataProviders_CanRefreshMetadata_Tester(providerType, expected, ownedItem: true);
         }

From 4f0615452b2ae25927ffb80102f1fc91cf95d49c Mon Sep 17 00:00:00 2001
From: SenorSmartyPants <senorsmartypants@gmail.com>
Date: Mon, 27 Feb 2023 12:01:29 -0600
Subject: [PATCH 4/5] Update MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs

Apply code review

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
index 28cf9f7438..82e1dc860d 100644
--- a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
@@ -63,7 +63,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
                 yield return Path.ChangeExtension(item.Path, ".nfo");
 
                 // only allow movie object to read movie.nfo, not owned videos (which will be itemtype video, not movie)
-                if (!item.IsInMixedFolder && item.ItemType.Equals(typeof(Movie)))
+                if (!item.IsInMixedFolder && item.ItemType == typeof(Movie))
                 {
                     yield return Path.Combine(item.ContainingFolderPath, "movie.nfo");
                 }

From b9f7e3971e453e9faa136de38fe45edd52df253e Mon Sep 17 00:00:00 2001
From: SenorSmartyPants <senorsmartypants@gmail.com>
Date: Sat, 18 Mar 2023 21:52:04 -0500
Subject: [PATCH 5/5] Add test for cleaning extra names

---
 .../Library/LibraryManager/FindExtrasTests.cs | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
index 5995990711..562711337f 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/LibraryManager/FindExtrasTests.cs
@@ -79,6 +79,35 @@ public class FindExtrasTests
         Assert.Equal(ExtraType.Sample, extras[2].ExtraType);
     }
 
+    [Fact]
+    public void FindExtras_SeparateMovieFolder_CleanExtraNames()
+    {
+        var owner = new Movie { Name = "Up", Path = "/movies/Up/Up.mkv" };
+        var paths = new List<string>
+        {
+            "/movies/Up/Up.mkv",
+            "/movies/Up/Recording the audio[Bluray]-behindthescenes.mkv",
+            "/movies/Up/Interview with the dog-interview.mkv",
+            "/movies/Up/shorts/Balloons[1080p].mkv"
+        };
+
+        var files = paths.Select(p => new FileSystemMetadata
+        {
+            FullName = p,
+            IsDirectory = false
+        }).ToList();
+
+        var extras = _libraryManager.FindExtras(owner, files, new DirectoryService(_fileSystemMock.Object)).OrderBy(e => e.ExtraType).ToList();
+
+        Assert.Equal(3, extras.Count);
+        Assert.Equal(ExtraType.BehindTheScenes, extras[0].ExtraType);
+        Assert.Equal("Recording the audio", extras[0].Name);
+        Assert.Equal(ExtraType.Interview, extras[1].ExtraType);
+        Assert.Equal("Interview with the dog", extras[1].Name);
+        Assert.Equal(ExtraType.Short, extras[2].ExtraType);
+        Assert.Equal("Balloons", extras[2].Name);
+    }
+
     [Fact]
     public void FindExtras_SeparateMovieFolderWithMixedExtras_FindsCorrectExtras()
     {