The Free Software Media System - Server Backend & API
Merge remote-tracking branch 'upstream/master' into perf-rebased
Shadowghoste71bb7e90477
diff --cc Emby.Server.Implementations/Library/Validators/ArtistsValidator.csindex 02998cbff7,ef20ae9bca..fa7112eb90--- a/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs+++ b/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs@@@ -65,19 -62,13 +65,21 @@@ public class ArtistsValidato{try{- var item = _libraryManager.GetArtist(name);+ MusicArtist? item = null;+ if (existingArtists.TryGetValue(name, out var artists) && artists.Length > 0)+ {+ item = artists.OrderBy(i => i.IsAccessedByName ? 1 : 0).First();+ }++ // Fall back to GetArtist if not found (creates new item if needed)+ item ??= _libraryManager.GetArtist(name);+ var isNew = !existingArtistIds.Contains(item.Id);+ var neverRefreshed = item.DateLastRefreshed == default;- if (!existingArtistIds.Contains(item.Id))+ if (isNew || neverRefreshed){await item.RefreshMetadata(cancellationToken).ConfigureAwait(false);+ refreshed++;}}catch (OperationCanceledException)diff --cc src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/SqliteDatabaseProvider.csindex 7f42623c3d,2b52abcb5b..044fd0131f--- a/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/SqliteDatabaseProvider.cs+++ b/src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/SqliteDatabaseProvider.cs@@@ -60,13 -60,11 +60,13 @@@ public sealed class SqliteDatabaseProvivar customOptions = databaseConfiguration.CustomProviderOptions?.Options;- var sqliteConnectionBuilder = new SqliteConnectionStringBuilder();- sqliteConnectionBuilder.DataSource = GetOption(customOptions, "path", e => e, () => Path.Combine(_applicationPaths.DataPath, "jellyfin.db"));- sqliteConnectionBuilder.Cache = GetOption(customOptions, "cache", Enum.Parse<SqliteCacheMode>, () => SqliteCacheMode.Default);- sqliteConnectionBuilder.Pooling = GetOption(customOptions, "pooling", e => e.Equals(bool.TrueString, StringComparison.OrdinalIgnoreCase), () => true);- sqliteConnectionBuilder.DefaultTimeout = GetOption(customOptions, "command-timeout", int.Parse, () => 30);+ var sqliteConnectionBuilder = new SqliteConnectionStringBuilder+ {- DataSource = Path.Combine(_applicationPaths.DataPath, "jellyfin.db"),++ DataSource = GetOption(customOptions, "path", e => e, () => Path.Combine(_applicationPaths.DataPath, "jellyfin.db")),+ Cache = GetOption(customOptions, "cache", Enum.Parse<SqliteCacheMode>, () => SqliteCacheMode.Default),+ Pooling = GetOption(customOptions, "pooling", e => e.Equals(bool.TrueString, StringComparison.OrdinalIgnoreCase), () => true),+ DefaultTimeout = GetOption(customOptions, "command-timeout", int.Parse, () => 60)+ };var connectionString = sqliteConnectionBuilder.ToString();