aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUtku Ozdemir <uoz@protonmail.com>2022-06-05 02:38:22 +0200
committerUtku Ozdemir <uoz@protonmail.com>2022-06-30 13:36:46 +0200
commit9ec42f8cf5cc4727f704f6a9b8e4e1c4aa8df04f (patch)
tree04de4afa25c763f7f65c104a3e31ddbe0cb9eb6d
parent2c9b24a1e76449697abdaae6c4ccdb515d2d1337 (diff)
fix: single video folder during photos lib scan
Prevent a directory with a single video file to be detected as a movie directory when the library type is "Photos". Closes jellyfin/jellyfin#7825 Signed-off-by: Utku Ozdemir <uoz@protonmail.com>
-rw-r--r--Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index fe4ccd6ac..a60251dac 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -464,7 +464,9 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
var result = ResolveVideos<T>(parent, fileSystemEntries, SupportsMultiVersion, collectionType, parseName) ??
new MultiItemResolverResult();
- if (result.Items.Count == 1)
+ var isPhotosCollection = string.Equals(collectionType, CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase)
+ || string.Equals(collectionType, CollectionType.Photos, StringComparison.OrdinalIgnoreCase);
+ if (!isPhotosCollection && result.Items.Count == 1)
{
var videoPath = result.Items[0].Path;
var hasPhotos = photos.Any(i => !PhotoResolver.IsOwnedByResolvedMedia(videoPath, i.Name));