diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-01-01 13:26:31 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-01-01 13:26:31 -0500 |
| commit | b9d17c9bc765a0c59d81db6277300a6860bf8421 (patch) | |
| tree | 8a7c538cb73c27b7e06f0055ce4f0bb45175e7aa /MediaBrowser.Providers | |
| parent | 88b638fbd69ed99bde7065f66af433b015977cb7 (diff) | |
add more methods to file system interface
Diffstat (limited to 'MediaBrowser.Providers')
| -rw-r--r-- | MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Music/FanArtArtistProvider.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Music/LastfmBaseProvider.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Music/LastfmHelper.cs | 21 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Savers/AlbumXmlSaver.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Savers/ArtistXmlSaver.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Savers/BoxSetXmlSaver.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Savers/EpisodeXmlSaver.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Savers/FolderXmlSaver.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Savers/GameSystemXmlSaver.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Savers/GameXmlSaver.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Savers/MovieXmlSaver.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Savers/SeasonXmlSaver.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Savers/SeriesXmlSaver.cs | 2 |
14 files changed, 11 insertions, 49 deletions
diff --git a/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs b/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs index 5782e3e635..fd78a75656 100644 --- a/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs +++ b/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs @@ -191,7 +191,7 @@ namespace MediaBrowser.Providers.MediaInfo var filename = item.Album ?? string.Empty; filename += item.Artists.FirstOrDefault() ?? string.Empty; - filename += album == null ? item.Id.ToString("N") + item.DateModified.Ticks : album.Id.ToString("N") + album.DateModified.Ticks + "_primary"; + filename += album == null ? item.Id.ToString("N") + "_primary" + item.DateModified.Ticks : album.Id.ToString("N") + album.DateModified.Ticks + "_primary"; filename = filename.GetMD5() + ".jpg"; diff --git a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs index b248fcb40b..dc7c7c139e 100644 --- a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs +++ b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs @@ -86,15 +86,6 @@ namespace MediaBrowser.Providers.Music } /// <summary> - /// Gets a value indicating whether [save local meta]. - /// </summary> - /// <value><c>true</c> if [save local meta]; otherwise, <c>false</c>.</value> - protected virtual bool SaveLocalMeta - { - get { return ConfigurationManager.Configuration.SaveLocalMeta; } - } - - /// <summary> /// Gets a value indicating whether [refresh on version change]. /// </summary> /// <value><c>true</c> if [refresh on version change]; otherwise, <c>false</c>.</value> diff --git a/MediaBrowser.Providers/Music/LastfmBaseProvider.cs b/MediaBrowser.Providers/Music/LastfmBaseProvider.cs index 26796f7e44..cab9e7e39c 100644 --- a/MediaBrowser.Providers/Music/LastfmBaseProvider.cs +++ b/MediaBrowser.Providers/Music/LastfmBaseProvider.cs @@ -68,14 +68,6 @@ namespace MediaBrowser.Providers.Music /// <value>The HTTP client.</value> protected IHttpClient HttpClient { get; private set; } - protected virtual bool SaveLocalMeta - { - get - { - return ConfigurationManager.Configuration.SaveLocalMeta; - } - } - /// <summary> /// Gets a value indicating whether [requires internet]. /// </summary> diff --git a/MediaBrowser.Providers/Music/LastfmHelper.cs b/MediaBrowser.Providers/Music/LastfmHelper.cs index df02cee5b9..1b8d0c5f6d 100644 --- a/MediaBrowser.Providers/Music/LastfmHelper.cs +++ b/MediaBrowser.Providers/Music/LastfmHelper.cs @@ -31,11 +31,6 @@ namespace MediaBrowser.Providers.Music artist.ProductionYear = yearFormed; } - - if (data.tags != null && !artist.LockedFields.Contains(MetadataFields.Tags)) - { - AddTags(artist, data.tags); - } string imageSize; artist.LastFmImageUrl = GetImageUrl(data, out imageSize); @@ -100,11 +95,6 @@ namespace MediaBrowser.Providers.Music } } - if (data.toptags != null && !item.LockedFields.Contains(MetadataFields.Tags)) - { - AddTags(item, data.toptags); - } - var album = (MusicAlbum)item; string imageSize; @@ -112,16 +102,5 @@ namespace MediaBrowser.Providers.Music album.LastFmImageUrl = GetImageUrl(data, out imageSize); album.LastFmImageSize = imageSize; } - - private static void AddTags(BaseItem item, LastfmTags tags) - { - var itemTags = (from tag in tags.tag where !string.IsNullOrEmpty(tag.name) select tag.name).ToList(); - - var hasTags = item as IHasTags; - if (hasTags != null) - { - hasTags.Tags = itemTags; - } - } } } diff --git a/MediaBrowser.Providers/Savers/AlbumXmlSaver.cs b/MediaBrowser.Providers/Savers/AlbumXmlSaver.cs index 8dd6940c58..5e4401cfff 100644 --- a/MediaBrowser.Providers/Savers/AlbumXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/AlbumXmlSaver.cs @@ -32,7 +32,7 @@ namespace MediaBrowser.Providers.Savers var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; // If new metadata has been downloaded and save local is on - if (_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) + if (item.IsSaveLocalMetadataEnabled() && (wasMetadataEdited || wasMetadataDownloaded)) { return item is MusicAlbum; } diff --git a/MediaBrowser.Providers/Savers/ArtistXmlSaver.cs b/MediaBrowser.Providers/Savers/ArtistXmlSaver.cs index 924a5a88ea..6b801f1e26 100644 --- a/MediaBrowser.Providers/Savers/ArtistXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/ArtistXmlSaver.cs @@ -32,7 +32,7 @@ namespace MediaBrowser.Providers.Savers var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; // If new metadata has been downloaded and save local is on - if (_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) + if (item.IsSaveLocalMetadataEnabled() && (wasMetadataEdited || wasMetadataDownloaded)) { if (item is MusicArtist) { diff --git a/MediaBrowser.Providers/Savers/BoxSetXmlSaver.cs b/MediaBrowser.Providers/Savers/BoxSetXmlSaver.cs index c2e607f6a6..712276bcd6 100644 --- a/MediaBrowser.Providers/Savers/BoxSetXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/BoxSetXmlSaver.cs @@ -32,7 +32,7 @@ namespace MediaBrowser.Providers.Savers var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; // If new metadata has been downloaded and save local is on - if (_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) + if (item.IsSaveLocalMetadataEnabled() && (wasMetadataEdited || wasMetadataDownloaded)) { return item is BoxSet; } diff --git a/MediaBrowser.Providers/Savers/EpisodeXmlSaver.cs b/MediaBrowser.Providers/Savers/EpisodeXmlSaver.cs index 91e7699948..4e2139bb60 100644 --- a/MediaBrowser.Providers/Savers/EpisodeXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/EpisodeXmlSaver.cs @@ -29,7 +29,7 @@ namespace MediaBrowser.Providers.Savers var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; // If new metadata has been downloaded and save local is on - if (_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) + if (item.IsSaveLocalMetadataEnabled() && (wasMetadataEdited || wasMetadataDownloaded)) { return item is Episode; } diff --git a/MediaBrowser.Providers/Savers/FolderXmlSaver.cs b/MediaBrowser.Providers/Savers/FolderXmlSaver.cs index 9c1e6f38e0..7ad13905d6 100644 --- a/MediaBrowser.Providers/Savers/FolderXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/FolderXmlSaver.cs @@ -37,7 +37,7 @@ namespace MediaBrowser.Providers.Savers var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; // If new metadata has been downloaded and save local is on - if (_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) + if (item.IsSaveLocalMetadataEnabled() && (wasMetadataEdited || wasMetadataDownloaded)) { if (!(item is Series) && !(item is BoxSet) && !(item is MusicArtist) && !(item is MusicAlbum) && !(item is Season)) diff --git a/MediaBrowser.Providers/Savers/GameSystemXmlSaver.cs b/MediaBrowser.Providers/Savers/GameSystemXmlSaver.cs index 496bb51d0d..7089b8e1b0 100644 --- a/MediaBrowser.Providers/Savers/GameSystemXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/GameSystemXmlSaver.cs @@ -31,7 +31,7 @@ namespace MediaBrowser.Providers.Savers var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; // If new metadata has been downloaded and save local is on - if (_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) + if (item.IsSaveLocalMetadataEnabled() && (wasMetadataEdited || wasMetadataDownloaded)) { return item is GameSystem; } diff --git a/MediaBrowser.Providers/Savers/GameXmlSaver.cs b/MediaBrowser.Providers/Savers/GameXmlSaver.cs index 03c3a29165..5dd7617e09 100644 --- a/MediaBrowser.Providers/Savers/GameXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/GameXmlSaver.cs @@ -37,7 +37,7 @@ namespace MediaBrowser.Providers.Savers var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; // If new metadata has been downloaded and save local is on - if (_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) + if (item.IsSaveLocalMetadataEnabled() && (wasMetadataEdited || wasMetadataDownloaded)) { return item is Game; } diff --git a/MediaBrowser.Providers/Savers/MovieXmlSaver.cs b/MediaBrowser.Providers/Savers/MovieXmlSaver.cs index f10e24dc15..3fc4579e38 100644 --- a/MediaBrowser.Providers/Savers/MovieXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/MovieXmlSaver.cs @@ -39,7 +39,7 @@ namespace MediaBrowser.Providers.Savers var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; // If new metadata has been downloaded and save local is on - if (_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) + if (item.IsSaveLocalMetadataEnabled() && (wasMetadataEdited || wasMetadataDownloaded)) { var trailer = item as Trailer; diff --git a/MediaBrowser.Providers/Savers/SeasonXmlSaver.cs b/MediaBrowser.Providers/Savers/SeasonXmlSaver.cs index c96f71b0a9..0a9f2e4f62 100644 --- a/MediaBrowser.Providers/Savers/SeasonXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/SeasonXmlSaver.cs @@ -30,7 +30,7 @@ namespace MediaBrowser.Providers.Savers var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; // If new metadata has been downloaded and save local is on - if (_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) + if (item.IsSaveLocalMetadataEnabled() && (wasMetadataEdited || wasMetadataDownloaded)) { return item is Season; } diff --git a/MediaBrowser.Providers/Savers/SeriesXmlSaver.cs b/MediaBrowser.Providers/Savers/SeriesXmlSaver.cs index 7f37ba1ced..131d568a1c 100644 --- a/MediaBrowser.Providers/Savers/SeriesXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/SeriesXmlSaver.cs @@ -32,7 +32,7 @@ namespace MediaBrowser.Providers.Savers var wasMetadataDownloaded = (updateType & ItemUpdateType.MetadataDownload) == ItemUpdateType.MetadataDownload; // If new metadata has been downloaded and save local is on - if (_config.Configuration.SaveLocalMeta && (wasMetadataEdited || wasMetadataDownloaded)) + if (item.IsSaveLocalMetadataEnabled() && (wasMetadataEdited || wasMetadataDownloaded)) { return item is Series; } |
