From ac7d6256f460ce459a5b5c824e1b32d23e120901 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 28 Jun 2013 10:11:09 -0400 Subject: [PATCH] made xml saver methods a little cleaner --- MediaBrowser.Providers/Savers/AlbumXmlSaver.cs | 6 ++++-- MediaBrowser.Providers/Savers/BoxSetXmlSaver.cs | 6 ++++-- MediaBrowser.Providers/Savers/EpisodeXmlSaver.cs | 6 ++++-- MediaBrowser.Providers/Savers/FolderXmlSaver.cs | 9 +++++---- MediaBrowser.Providers/Savers/MovieXmlSaver.cs | 6 ++++-- MediaBrowser.Providers/Savers/PersonXmlSaver.cs | 7 ++++--- MediaBrowser.Providers/Savers/SeasonXmlSaver.cs | 7 ++++--- MediaBrowser.Providers/Savers/SeriesXmlSaver.cs | 6 ++++-- 8 files changed, 33 insertions(+), 20 deletions(-) diff --git a/MediaBrowser.Providers/Savers/AlbumXmlSaver.cs b/MediaBrowser.Providers/Savers/AlbumXmlSaver.cs index 3848f68bf5..e6195c03e4 100644 --- a/MediaBrowser.Providers/Savers/AlbumXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/AlbumXmlSaver.cs @@ -28,9 +28,11 @@ namespace MediaBrowser.Providers.Savers /// true if [is enabled for] [the specified item]; otherwise, false. public bool IsEnabledFor(BaseItem item, ItemUpdateType updateType) { + var wasMetadataEdited = (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit; + var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; + // If new metadata has been downloaded and save local is on, OR metadata was manually edited, proceed - if ((_config.Configuration.SaveLocalMeta && (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload) - || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit) + if ((_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) || wasMetadataEdited) { return item is MusicAlbum; } diff --git a/MediaBrowser.Providers/Savers/BoxSetXmlSaver.cs b/MediaBrowser.Providers/Savers/BoxSetXmlSaver.cs index 5f8d207f2f..091548e176 100644 --- a/MediaBrowser.Providers/Savers/BoxSetXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/BoxSetXmlSaver.cs @@ -26,9 +26,11 @@ namespace MediaBrowser.Providers.Savers /// true if [is enabled for] [the specified item]; otherwise, false. public bool IsEnabledFor(BaseItem item, ItemUpdateType updateType) { + var wasMetadataEdited = (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit; + var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; + // If new metadata has been downloaded and save local is on, OR metadata was manually edited, proceed - if ((_config.Configuration.SaveLocalMeta && (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload) - || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit) + if ((_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) || wasMetadataEdited) { return item is BoxSet; } diff --git a/MediaBrowser.Providers/Savers/EpisodeXmlSaver.cs b/MediaBrowser.Providers/Savers/EpisodeXmlSaver.cs index 778c59c203..2ed840f580 100644 --- a/MediaBrowser.Providers/Savers/EpisodeXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/EpisodeXmlSaver.cs @@ -24,9 +24,11 @@ namespace MediaBrowser.Providers.Savers /// true if [is enabled for] [the specified item]; otherwise, false. public bool IsEnabledFor(BaseItem item, ItemUpdateType updateType) { + var wasMetadataEdited = (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit; + var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; + // If new metadata has been downloaded and save local is on, OR metadata was manually edited, proceed - if ((_config.Configuration.SaveLocalMeta && (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload) - || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit) + if ((_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) || wasMetadataEdited) { return item is Episode; } diff --git a/MediaBrowser.Providers/Savers/FolderXmlSaver.cs b/MediaBrowser.Providers/Savers/FolderXmlSaver.cs index 885cff674d..46a91befd5 100644 --- a/MediaBrowser.Providers/Savers/FolderXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/FolderXmlSaver.cs @@ -33,9 +33,11 @@ namespace MediaBrowser.Providers.Savers return false; } + var wasMetadataEdited = (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit; + var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; + // If new metadata has been downloaded and save local is on, OR metadata was manually edited, proceed - if ((_config.Configuration.SaveLocalMeta && (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload) - || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit) + if ((_config.Configuration.SaveLocalMeta && wasMetadataDownloaded) || wasMetadataEdited) { if (!(item is Series) && !(item is BoxSet) && !(item is MusicArtist) && !(item is MusicAlbum) && !(item is Season)) @@ -45,8 +47,7 @@ namespace MediaBrowser.Providers.Savers } // If new metadata has been downloaded or metadata was manually edited, proceed - if ((updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload - || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit) + if (wasMetadataDownloaded || wasMetadataEdited) { if (item is AggregateFolder || item is UserRootFolder || item is CollectionFolder) { diff --git a/MediaBrowser.Providers/Savers/MovieXmlSaver.cs b/MediaBrowser.Providers/Savers/MovieXmlSaver.cs index e4850e1cb9..fec6e4958d 100644 --- a/MediaBrowser.Providers/Savers/MovieXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/MovieXmlSaver.cs @@ -31,9 +31,11 @@ namespace MediaBrowser.Providers.Savers /// true if [is enabled for] [the specified item]; otherwise, false. public bool IsEnabledFor(BaseItem item, ItemUpdateType updateType) { + var wasMetadataEdited = (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit; + var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; + // If new metadata has been downloaded and save local is on, OR metadata was manually edited, proceed - if ((_config.Configuration.SaveLocalMeta && (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload) - || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit) + if ((_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) || wasMetadataEdited) { var trailer = item as Trailer; diff --git a/MediaBrowser.Providers/Savers/PersonXmlSaver.cs b/MediaBrowser.Providers/Savers/PersonXmlSaver.cs index 53bb32fef1..f0be42be3d 100644 --- a/MediaBrowser.Providers/Savers/PersonXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/PersonXmlSaver.cs @@ -1,6 +1,5 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; using MediaBrowser.Providers.Movies; using System; using System.IO; @@ -22,9 +21,11 @@ namespace MediaBrowser.Providers.Savers /// true if [is enabled for] [the specified item]; otherwise, false. public bool IsEnabledFor(BaseItem item, ItemUpdateType updateType) { + var wasMetadataEdited = (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit; + var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; + // If new metadata has been downloaded or metadata was manually edited, proceed - if ((updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload - || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit) + if ((wasMetadataEdited || wasMetadataDownloaded)) { return item is Person; } diff --git a/MediaBrowser.Providers/Savers/SeasonXmlSaver.cs b/MediaBrowser.Providers/Savers/SeasonXmlSaver.cs index 429275537b..c67eb2a568 100644 --- a/MediaBrowser.Providers/Savers/SeasonXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/SeasonXmlSaver.cs @@ -2,7 +2,6 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; using System.IO; using System.Text; using System.Threading; @@ -26,9 +25,11 @@ namespace MediaBrowser.Providers.Savers /// true if [is enabled for] [the specified item]; otherwise, false. public bool IsEnabledFor(BaseItem item, ItemUpdateType updateType) { + var wasMetadataEdited = (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit; + var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; + // If new metadata has been downloaded and save local is on, OR metadata was manually edited, proceed - if ((_config.Configuration.SaveLocalMeta && (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload) - || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit) + if ((_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) || wasMetadataEdited) { return item is Season; } diff --git a/MediaBrowser.Providers/Savers/SeriesXmlSaver.cs b/MediaBrowser.Providers/Savers/SeriesXmlSaver.cs index 2affbd91f4..b16d378f7f 100644 --- a/MediaBrowser.Providers/Savers/SeriesXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/SeriesXmlSaver.cs @@ -29,9 +29,11 @@ namespace MediaBrowser.Providers.Savers /// true if [is enabled for] [the specified item]; otherwise, false. public bool IsEnabledFor(BaseItem item, ItemUpdateType updateType) { + var wasMetadataEdited = (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit; + var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; + // If new metadata has been downloaded and save local is on, OR metadata was manually edited, proceed - if ((_config.Configuration.SaveLocalMeta && (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload) - || (updateType & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit) + if ((_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) || wasMetadataEdited) { return item is Series; }