From 0dd304f86c65fe38a5d74186a7b6a5262d46cd50 Mon Sep 17 00:00:00 2001
From: Cody Robibero <cody@robibe.ro>
Date: Thu, 16 Dec 2021 07:54:22 -0700
Subject: [PATCH] Log warning for unknown BaseItemKind to Type mapping

---
 .../Data/SqliteItemRepository.cs              | 58 +++++++++++++++----
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 8fe0b98d0c..312f16b253 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -3611,15 +3611,32 @@ namespace Emby.Server.Implementations.Data
                         whereClauses.Add("type<>@type");
                         statement?.TryBind("@type", excludeTypeName);
                     }
+                    else
+                    {
+                        Logger.LogWarning("Undefined BaseItemKind to Type mapping: {BaseItemKind}", excludeTypes[0]);
+                    }
                 }
                 else if (excludeTypes.Length > 1)
                 {
-                    var inClause = string.Join(
-                        ',',
-                        excludeTypes
-                            .Select(i => _baseItemKindNames.TryGetValue(i, out var baseItemKindName) ? "'" + baseItemKindName + "'" : null)
-                            .Where(i => !string.IsNullOrEmpty(i)));
-                    whereClauses.Add($"type not in ({inClause})");
+                    var whereBuilder = new StringBuilder();
+                    foreach (var excludeType in excludeTypes)
+                    {
+                        if (_baseItemKindNames.TryGetValue(excludeType, out var baseItemKindName))
+                        {
+                            whereBuilder
+                                .Append('\'')
+                                .Append(baseItemKindName)
+                                .Append("',");
+                        }
+                        else
+                        {
+                            Logger.LogWarning("Undefined BaseItemKind to Type mapping: {BaseItemKind}", excludeType);
+                        }
+                    }
+
+                    // Remove trailing comma.
+                    whereBuilder.Length--;
+                    whereClauses.Add($"type not in ({whereBuilder})");
                 }
             }
             else if (includeTypes.Length == 1)
@@ -3629,15 +3646,32 @@ namespace Emby.Server.Implementations.Data
                     whereClauses.Add("type=@type");
                     statement?.TryBind("@type", includeTypeName);
                 }
+                else
+                {
+                    Logger.LogWarning("Undefined BaseItemKind to Type mapping: {BaseItemKind}", includeTypes[0]);
+                }
             }
             else if (includeTypes.Length > 1)
             {
-                var inClause = string.Join(
-                    ',',
-                    includeTypes
-                        .Select(i => _baseItemKindNames.TryGetValue(i, out var baseItemKindName) ? "'" + baseItemKindName + "'" : null)
-                        .Where(i => !string.IsNullOrEmpty(i)));
-                whereClauses.Add($"type in ({inClause})");
+                var whereBuilder = new StringBuilder();
+                foreach (var includeType in includeTypes)
+                {
+                    if (_baseItemKindNames.TryGetValue(includeType, out var baseItemKindName))
+                    {
+                        whereBuilder
+                            .Append('\'')
+                            .Append(baseItemKindName)
+                            .Append("',");
+                    }
+                    else
+                    {
+                        Logger.LogWarning("Undefined BaseItemKind to Type mapping: {BaseItemKind}", includeType);
+                    }
+                }
+
+                // Remove trailing comma.
+                whereBuilder.Length--;
+                whereClauses.Add($"type in ({whereBuilder})");
             }
 
             if (query.ChannelIds.Count == 1)