Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-08-11 09:13:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Apply review suggestions

Browse Source
This commit is contained in:
Shadowghost 2022-10-07 11:12:16 +02:00
parent 4649e0e425
commit ff18586beb
1 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
MediaBrowser.Providers/Music/AlbumMetadataService.cs
View File

@ -98,13 +98,16 @@ namespace MediaBrowser.Providers.Music
.ToArray(); .ToArray();
var musicbrainzAlbumArtistId = item.GetProviderId(MetadataProvider.MusicBrainzAlbumArtist); var musicbrainzAlbumArtistId = item.GetProviderId(MetadataProvider.MusicBrainzAlbumArtist);
var firstMusicbrainzAlbumArtistId = musicbrainzAlbumArtistIds[0]; if (musicbrainzAlbumArtistIds.Any())
if (!string.IsNullOrEmpty(firstMusicbrainzAlbumArtistId) &&
(string.IsNullOrEmpty(musicbrainzAlbumArtistId)
|| !musicbrainzAlbumArtistId.Equals(firstMusicbrainzAlbumArtistId, StringComparison.OrdinalIgnoreCase)))
{ {
item.SetProviderId(MetadataProvider.MusicBrainzAlbumArtist, firstMusicbrainzAlbumArtistId); var firstMusicbrainzAlbumArtistId = musicbrainzAlbumArtistIds[0];
updateType |= ItemUpdateType.MetadataEdit; if (!string.IsNullOrEmpty(firstMusicbrainzAlbumArtistId)
&& (string.IsNullOrEmpty(musicbrainzAlbumArtistId)
|| !musicbrainzAlbumArtistId.Equals(firstMusicbrainzAlbumArtistId, StringComparison.OrdinalIgnoreCase)))
{
item.SetProviderId(MetadataProvider.MusicBrainzAlbumArtist, firstMusicbrainzAlbumArtistId);
updateType |= ItemUpdateType.MetadataEdit;
}
} }
if (!item.AlbumArtists.SequenceEqual(albumArtists, StringComparer.OrdinalIgnoreCase)) if (!item.AlbumArtists.SequenceEqual(albumArtists, StringComparer.OrdinalIgnoreCase))
@ -148,12 +151,16 @@ namespace MediaBrowser.Providers.Music
.ToArray(); .ToArray();
var musicbrainzAlbumId = item.GetProviderId(MetadataProvider.MusicBrainzAlbum); var musicbrainzAlbumId = item.GetProviderId(MetadataProvider.MusicBrainzAlbum);
if (!String.IsNullOrEmpty(musicbrainzAlbumIds[0]) if (musicbrainzAlbumIds.Any())
&& (String.IsNullOrEmpty(musicbrainzAlbumId)
|| !musicbrainzAlbumId.Equals(musicbrainzAlbumIds[0], StringComparison.OrdinalIgnoreCase)))
{ {
item.SetProviderId(MetadataProvider.MusicBrainzAlbum, musicbrainzAlbumIds[0]!); var firstMusicbrainzAlbumId = musicbrainzAlbumIds[0];
updateType |= ItemUpdateType.MetadataEdit; if (!string.IsNullOrEmpty(firstMusicbrainzAlbumId)
&& (string.IsNullOrEmpty(musicbrainzAlbumId)
|| !musicbrainzAlbumId.Equals(firstMusicbrainzAlbumId, StringComparison.OrdinalIgnoreCase)))
{
item.SetProviderId(MetadataProvider.MusicBrainzAlbum, firstMusicbrainzAlbumId);
updateType |= ItemUpdateType.MetadataEdit;
}
} }
var musicbrainzReleaseGroupIds = songs var musicbrainzReleaseGroupIds = songs
@ -164,12 +171,16 @@ namespace MediaBrowser.Providers.Music
.ToArray(); .ToArray();
var musicbrainzReleaseGroupId = item.GetProviderId(MetadataProvider.MusicBrainzReleaseGroup); var musicbrainzReleaseGroupId = item.GetProviderId(MetadataProvider.MusicBrainzReleaseGroup);
if (!String.IsNullOrEmpty(musicbrainzReleaseGroupIds[0]) if (musicbrainzReleaseGroupIds.Any())
&& (String.IsNullOrEmpty(musicbrainzReleaseGroupId)
|| !musicbrainzReleaseGroupId.Equals(musicbrainzReleaseGroupIds[0], StringComparison.OrdinalIgnoreCase)))
{ {
item.SetProviderId(MetadataProvider.MusicBrainzReleaseGroup, musicbrainzReleaseGroupIds[0]!); var firstMusicbrainzReleaseGroupId = musicbrainzReleaseGroupIds[0];
updateType |= ItemUpdateType.MetadataEdit; if (!string.IsNullOrEmpty(firstMusicbrainzReleaseGroupId)
&& (string.IsNullOrEmpty(musicbrainzReleaseGroupId)
|| !musicbrainzReleaseGroupId.Equals(firstMusicbrainzReleaseGroupId, StringComparison.OrdinalIgnoreCase)))
{
item.SetProviderId(MetadataProvider.MusicBrainzReleaseGroup, firstMusicbrainzReleaseGroupId);
updateType |= ItemUpdateType.MetadataEdit;
}
} }
return updateType; return updateType;
@ -228,41 +239,29 @@ namespace MediaBrowser.Providers.Music
if (replaceData || string.IsNullOrEmpty(targetItem.GetProviderId(MetadataProvider.MusicBrainzAlbumArtist))) if (replaceData || string.IsNullOrEmpty(targetItem.GetProviderId(MetadataProvider.MusicBrainzAlbumArtist)))
{ {
var targetAlbumArtistId = targetItem.GetProviderId(MetadataProvider.MusicBrainzAlbumArtist); setProviderId(sourceItem, targetItem, MetadataProvider.MusicBrainzAlbumArtist);
var sourceAlbumArtistId = sourceItem.GetProviderId(MetadataProvider.MusicBrainzAlbumArtist);
if (!string.IsNullOrEmpty(sourceAlbumArtistId)
&& (string.IsNullOrEmpty(targetAlbumArtistId)
|| !targetAlbumArtistId.Equals(sourceAlbumArtistId, StringComparison.Ordinal)))
{
targetItem.SetProviderId(MetadataProvider.MusicBrainzAlbumArtist, sourceAlbumArtistId);
}
} }
if (replaceData || string.IsNullOrEmpty(targetItem.GetProviderId(MetadataProvider.MusicBrainzAlbum))) if (replaceData || string.IsNullOrEmpty(targetItem.GetProviderId(MetadataProvider.MusicBrainzAlbum)))
{ {
var targetAlbumId = targetItem.GetProviderId(MetadataProvider.MusicBrainzAlbum); setProviderId(sourceItem, targetItem, MetadataProvider.MusicBrainzAlbum);
var sourceAlbumId = sourceItem.GetProviderId(MetadataProvider.MusicBrainzAlbum);
if (!string.IsNullOrEmpty(sourceAlbumId)
&& (string.IsNullOrEmpty(targetAlbumId)
|| !targetAlbumId.Equals(sourceAlbumId, StringComparison.Ordinal)))
{
targetItem.SetProviderId(MetadataProvider.MusicBrainzAlbum, sourceAlbumId);
}
} }
if (replaceData || string.IsNullOrEmpty(targetItem.GetProviderId(MetadataProvider.MusicBrainzReleaseGroup))) if (replaceData || string.IsNullOrEmpty(targetItem.GetProviderId(MetadataProvider.MusicBrainzReleaseGroup)))
{ {
var targetReleaseGroupId = targetItem.GetProviderId(MetadataProvider.MusicBrainzReleaseGroup); setProviderId(sourceItem, targetItem, MetadataProvider.MusicBrainzReleaseGroup);
var sourceReleaseGroupId = sourceItem.GetProviderId(MetadataProvider.MusicBrainzReleaseGroup); }
}
if (!string.IsNullOrEmpty(sourceReleaseGroupId) private void setProviderId(MusicAlbum sourceItem, MusicAlbum targetItem, MetadataProvider provider)
&& (string.IsNullOrEmpty(targetReleaseGroupId) {
|| !targetReleaseGroupId.Equals(sourceItem))) var source = sourceItem.GetProviderId(provider);
{ var target = targetItem.GetProviderId(provider);
targetItem.SetProviderId(MetadataProvider.MusicBrainzReleaseGroup, sourceReleaseGroupId); if (!string.IsNullOrEmpty(source)
} && (string.IsNullOrEmpty(target)
|| !target.Equals(source, StringComparison.Ordinal)))
{
targetItem.SetProviderId(provider, source);
} }
} }
} }