added more image providers

21 files changed, 124 insertions, 68 deletions

diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index 139d8c6fb..836874db9 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -10,7 +10,7 @@ namespace MediaBrowser.Controller.Entities.Audio
     /// <summary>
     /// Class Audio
     /// </summary>
-    public class Audio : BaseItem, IHasMediaStreams, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasLookupInfo<SongInfo>
+    public class Audio : BaseItem, IHasMediaStreams, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasLookupInfo<SongInfo>, IHasSeries
     {
         public Audio()
         {
@@ -51,6 +51,15 @@ namespace MediaBrowser.Controller.Entities.Audio
             }
         }
 
+        [IgnoreDataMember]
+        public string SeriesName
+        {
+            get
+            {
+                return Album;
+            }
+        }
+
         /// <summary>
         /// Gets or sets the artist.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index 8b8c1a6ff..51c8a8727 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -11,7 +11,7 @@ namespace MediaBrowser.Controller.Entities.Audio
     /// <summary>
     /// Class MusicAlbum
     /// </summary>
-    public class MusicAlbum : Folder, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasTags, IHasLookupInfo<AlbumInfo>
+    public class MusicAlbum : Folder, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasTags, IHasLookupInfo<AlbumInfo>, IHasSeries
     {
         public List<Guid> SoundtrackIds { get; set; }
 
@@ -50,6 +50,15 @@ namespace MediaBrowser.Controller.Entities.Audio
             }
         }
 
+        [IgnoreDataMember]
+        public string SeriesName
+        {
+            get
+            {
+                return AlbumArtist;
+            }
+        }
+
         /// <summary>
         /// Override this to true if class should be grouped under a container in indicies
         /// The container class should be defined via IndexContainer
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 01e8741af..b3b6361a7 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -256,7 +256,7 @@ namespace MediaBrowser.Controller.Entities
 
         private string _sortName;
         /// <summary>
-        /// Gets or sets the name of the sort.
+        /// Gets the name of the sort.
         /// </summary>
         /// <value>The name of the sort.</value>
         [IgnoreDataMember]
diff --git a/MediaBrowser.Controller/Entities/Book.cs b/MediaBrowser.Controller/Entities/Book.cs
index 211067f9d..85cf60c52 100644
--- a/MediaBrowser.Controller/Entities/Book.cs
+++ b/MediaBrowser.Controller/Entities/Book.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace MediaBrowser.Controller.Entities
 {
-    public class Book : BaseItem, IHasTags, IHasPreferredMetadataLanguage, IHasLookupInfo<BookInfo>
+    public class Book : BaseItem, IHasTags, IHasPreferredMetadataLanguage, IHasLookupInfo<BookInfo>, IHasSeries
     {
         public override string MediaType
         {
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 101244d45..25197be67 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -518,7 +518,7 @@ namespace MediaBrowser.Controller.Entities
 
             foreach (var child in children)
             {
-                if (tasks.Count > 3)
+                if (tasks.Count > 5)
                 {
                     await Task.WhenAll(tasks).ConfigureAwait(false);
                     tasks.Clear();
@@ -549,7 +549,7 @@ namespace MediaBrowser.Controller.Entities
                 }
                 else
                 {
-                    tasks.Add(RefreshChildMetadata(child, refreshOptions, recursive, innerProgress, cancellationToken));
+                    tasks.Add(RefreshChildMetadata(child, refreshOptions, false, innerProgress, cancellationToken));
                 }
             }
 
diff --git a/MediaBrowser.Controller/Entities/IHasImages.cs b/MediaBrowser.Controller/Entities/IHasImages.cs
index d260950bd..62ef0a85a 100644
--- a/MediaBrowser.Controller/Entities/IHasImages.cs
+++ b/MediaBrowser.Controller/Entities/IHasImages.cs
@@ -129,6 +129,12 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="images">The images.</param>
         /// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
         bool AddImages(ImageType imageType, IEnumerable<FileInfo> images);
+
+        /// <summary>
+        /// Determines whether [is save local metadata enabled].
+        /// </summary>
+        /// <returns><c>true</c> if [is save local metadata enabled]; otherwise, <c>false</c>.</returns>
+        bool IsSaveLocalMetadataEnabled();
     }
 
     public static class HasImagesExtensions
diff --git a/MediaBrowser.Controller/Entities/IHasMetadata.cs b/MediaBrowser.Controller/Entities/IHasMetadata.cs
index 6466e18ce..1a1956c56 100644
--- a/MediaBrowser.Controller/Entities/IHasMetadata.cs
+++ b/MediaBrowser.Controller/Entities/IHasMetadata.cs
@@ -1,5 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Entities
@@ -34,15 +37,17 @@ namespace MediaBrowser.Controller.Entities
         DateTime DateLastSaved { get; set; }
 
         /// <summary>
-        /// Determines whether [is save local metadata enabled].
-        /// </summary>
-        /// <returns><c>true</c> if [is save local metadata enabled]; otherwise, <c>false</c>.</returns>
-        bool IsSaveLocalMetadataEnabled();
-
-        /// <summary>
         /// Gets a value indicating whether this instance is in mixed folder.
         /// </summary>
         /// <value><c>true</c> if this instance is in mixed folder; otherwise, <c>false</c>.</value>
         bool IsInMixedFolder { get; }
+
+        /// <summary>
+        /// Updates to repository.
+        /// </summary>
+        /// <param name="updateReason">The update reason.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task UpdateToRepository(ItemUpdateType updateReason, CancellationToken cancellationToken);
     }
 }
diff --git a/MediaBrowser.Controller/Entities/IHasSeries.cs b/MediaBrowser.Controller/Entities/IHasSeries.cs
new file mode 100644
index 000000000..64c33a376
--- /dev/null
+++ b/MediaBrowser.Controller/Entities/IHasSeries.cs
@@ -0,0 +1,12 @@
+
+namespace MediaBrowser.Controller.Entities
+{
+    public interface IHasSeries
+    {
+        /// <summary>
+        /// Gets the name of the series.
+        /// </summary>
+        /// <value>The name of the series.</value>
+        string SeriesName { get; }
+    }
+}
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index 4d01c6a96..7214f0f6f 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Controller.Entities.Movies
     /// <summary>
     /// Class Movie
     /// </summary>
-    public class Movie : Video, IHasCriticRating, IHasSoundtracks, IHasBudget, IHasKeywords, IHasTrailers, IHasThemeMedia, IHasTaglines, IHasTags, IHasPreferredMetadataLanguage, IHasAwards, IHasMetascore, IHasLookupInfo<MovieInfo>
+    public class Movie : Video, IHasCriticRating, IHasSoundtracks, IHasBudget, IHasKeywords, IHasTrailers, IHasThemeMedia, IHasTaglines, IHasPreferredMetadataLanguage, IHasAwards, IHasMetascore, IHasLookupInfo<MovieInfo>
     {
         public List<Guid> SpecialFeatureIds { get; set; }
 
@@ -39,7 +39,6 @@ namespace MediaBrowser.Controller.Entities.Movies
             ThemeSongIds = new List<Guid>();
             ThemeVideoIds = new List<Guid>();
             Taglines = new List<string>();
-            Tags = new List<string>();
             Keywords = new List<string>();
         }
 
@@ -53,12 +52,6 @@ namespace MediaBrowser.Controller.Entities.Movies
         public List<MediaUrl> RemoteTrailers { get; set; }
 
         /// <summary>
-        /// Gets or sets the tags.
-        /// </summary>
-        /// <value>The tags.</value>
-        public List<string> Tags { get; set; }
-
-        /// <summary>
         /// Gets or sets the taglines.
         /// </summary>
         /// <value>The taglines.</value>
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 515f802e9..5413aa885 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -10,7 +10,7 @@ namespace MediaBrowser.Controller.Entities.TV
     /// <summary>
     /// Class Episode
     /// </summary>
-    public class Episode : Video, IHasLookupInfo<EpisodeInfo>
+    public class Episode : Video, IHasLookupInfo<EpisodeInfo>, IHasSeries
     {
         /// <summary>
         /// Gets the season in which it aired.
@@ -138,6 +138,16 @@ namespace MediaBrowser.Controller.Entities.TV
             get { return FindParent<Season>(); }
         }
 
+        [IgnoreDataMember]
+        public string SeriesName
+        {
+            get
+            {
+                var series = Series;
+                return series == null ? null : series.Name;
+            }
+        }
+
         /// <summary>
         /// Creates the name of the sort.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index bc7e75b72..d266f1fde 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -1,11 +1,8 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
+using MediaBrowser.Controller.Localization;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
-using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
 
@@ -14,7 +11,7 @@ namespace MediaBrowser.Controller.Entities.TV
     /// <summary>
     /// Class Season
     /// </summary>
-    public class Season : Folder
+    public class Season : Folder, IHasSeries
     {
 
         /// <summary>
@@ -218,7 +215,7 @@ namespace MediaBrowser.Controller.Entities.TV
             {
                 episodes = episodes.Where(i => !i.IsVirtualUnaired);
             }
-            
+
             return LibraryManager
                 .Sort(episodes, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending)
                 .Cast<Episode>();
@@ -234,5 +231,15 @@ namespace MediaBrowser.Controller.Entities.TV
             // Don't block. Let either the entire series rating or episode rating determine it
             return false;
         }
+
+        [IgnoreDataMember]
+        public string SeriesName
+        {
+            get
+            {
+                var series = Series;
+                return series == null ? null : series.Name;
+            }
+        }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Trailer.cs b/MediaBrowser.Controller/Entities/Trailer.cs
index 9b3104037..d655c275d 100644
--- a/MediaBrowser.Controller/Entities/Trailer.cs
+++ b/MediaBrowser.Controller/Entities/Trailer.cs
@@ -10,7 +10,7 @@ namespace MediaBrowser.Controller.Entities
     /// <summary>
     /// Class Trailer
     /// </summary>
-    public class Trailer : Video, IHasCriticRating, IHasSoundtracks, IHasBudget, IHasTrailers, IHasKeywords, IHasTaglines, IHasTags, IHasPreferredMetadataLanguage, IHasMetascore, IHasLookupInfo<TrailerInfo>
+    public class Trailer : Video, IHasCriticRating, IHasSoundtracks, IHasBudget, IHasTrailers, IHasKeywords, IHasTaglines, IHasPreferredMetadataLanguage, IHasMetascore, IHasLookupInfo<TrailerInfo>
     {
         public List<Guid> SoundtrackIds { get; set; }
 
@@ -28,7 +28,6 @@ namespace MediaBrowser.Controller.Entities
             Taglines = new List<string>();
             SoundtrackIds = new List<Guid>();
             LocalTrailerIds = new List<Guid>();
-            Tags = new List<string>();
             Keywords = new List<string>();
         }
 
@@ -41,12 +40,6 @@ namespace MediaBrowser.Controller.Entities
         public List<string> Keywords { get; set; }
         
         /// <summary>
-        /// Gets or sets the tags.
-        /// </summary>
-        /// <value>The tags.</value>
-        public List<string> Tags { get; set; }
-
-        /// <summary>
         /// Gets or sets the taglines.
         /// </summary>
         /// <value>The taglines.</value>
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 6aa3ae819..e7bee35f5 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -16,7 +16,7 @@ namespace MediaBrowser.Controller.Entities
     /// <summary>
     /// Class Video
     /// </summary>
-    public class Video : BaseItem, IHasMediaStreams, IHasAspectRatio
+    public class Video : BaseItem, IHasMediaStreams, IHasAspectRatio, IHasTags
     {
         public bool IsMultiPart { get; set; }
 
@@ -26,6 +26,7 @@ namespace MediaBrowser.Controller.Entities
         {
             PlayableStreamFileNames = new List<string>();
             AdditionalPartIds = new List<Guid>();
+            Tags = new List<string>();
         }
 
         /// <summary>
@@ -35,6 +36,12 @@ namespace MediaBrowser.Controller.Entities
         public bool HasSubtitles { get; set; }
 
         /// <summary>
+        /// Gets or sets the tags.
+        /// </summary>
+        /// <value>The tags.</value>
+        public List<string> Tags { get; set; }
+        
+        /// <summary>
         /// Gets or sets the video bit rate.
         /// </summary>
         /// <value>The video bit rate.</value>
diff --git a/MediaBrowser.Controller/IServerApplicationPaths.cs b/MediaBrowser.Controller/IServerApplicationPaths.cs
index e163ac31d..05f681597 100644
--- a/MediaBrowser.Controller/IServerApplicationPaths.cs
+++ b/MediaBrowser.Controller/IServerApplicationPaths.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Configuration;
+using System;
+using MediaBrowser.Common.Configuration;
 
 namespace MediaBrowser.Controller
 {
@@ -101,9 +102,16 @@ namespace MediaBrowser.Controller
         string TranscodingTempPath { get; }
 
         /// <summary>
-        /// Gets the downloaded images data path.
+        /// Gets the internal metadata path.
         /// </summary>
-        /// <value>The downloaded images data path.</value>
-        string DownloadedImagesDataPath { get; }
+        /// <value>The internal metadata path.</value>
+        string InternalMetadataPath { get; }
+
+        /// <summary>
+        /// Gets the internal metadata path.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>System.String.</returns>
+        string GetInternalMetadataPath(Guid id);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 00e84177c..41e737300 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -94,6 +94,7 @@
     <Compile Include="Entities\IHasPreferredMetadataLanguage.cs" />
     <Compile Include="Entities\IHasProductionLocations.cs" />
     <Compile Include="Entities\IHasScreenshots.cs" />
+    <Compile Include="Entities\IHasSeries.cs" />
     <Compile Include="Entities\IHasSoundtracks.cs" />
     <Compile Include="Entities\IHasTaglines.cs" />
     <Compile Include="Entities\IHasTags.cs" />
diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
index dbb8c1edf..928e95833 100644
--- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
@@ -247,7 +247,10 @@ namespace MediaBrowser.Controller.Providers
                     {
                         var val = reader.ReadElementContentAsString();
 
-
+                        if (!string.IsNullOrWhiteSpace(val))
+                        {
+                            item.ForcedSortName = val;
+                        }
                         break;
                     }
 
diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
index 6818fa52b..f8580244a 100644
--- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
+++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
@@ -40,8 +40,6 @@ namespace MediaBrowser.Controller.Providers
 
         protected static readonly Task<bool> FalseTaskResult = Task.FromResult(false);
 
-        protected static readonly SemaphoreSlim XmlParsingResourcePool = new SemaphoreSlim(4, 4);
-
         /// <summary>
         /// Supportses the specified item.
         /// </summary>
diff --git a/MediaBrowser.Controller/Providers/BaseProviderInfo.cs b/MediaBrowser.Controller/Providers/BaseProviderInfo.cs
index 829dd34c8..3a33924f0 100644
--- a/MediaBrowser.Controller/Providers/BaseProviderInfo.cs
+++ b/MediaBrowser.Controller/Providers/BaseProviderInfo.cs
@@ -38,14 +38,14 @@ namespace MediaBrowser.Controller.Providers
         /// <summary>
         /// The success
         /// </summary>
-        Success,
-        /// <summary>
-        /// The failure
-        /// </summary>
-        Failure,
+        Success = 0,
         /// <summary>
         /// The completed with errors
         /// </summary>
-        CompletedWithErrors
-    }
+        CompletedWithErrors = 1,
+         /// <summary>
+        /// The failure
+        /// </summary>
+        Failure = 2
+   }
 }
diff --git a/MediaBrowser.Controller/Providers/ILocalImageProvider.cs b/MediaBrowser.Controller/Providers/ILocalImageProvider.cs
index d1ef68ce2..6b97a552d 100644
--- a/MediaBrowser.Controller/Providers/ILocalImageProvider.cs
+++ b/MediaBrowser.Controller/Providers/ILocalImageProvider.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Controller.Providers
     {
     }
 
-    public interface IImageFileProvider : ILocalImageProvider
+    public interface ILocalImageFileProvider : ILocalImageProvider
     {
         List<LocalImageInfo> GetImages(IHasImages item);
     }
diff --git a/MediaBrowser.Controller/Providers/IProviderRepository.cs b/MediaBrowser.Controller/Providers/IProviderRepository.cs
index 1c0ad2cd7..3cd2c3f31 100644
--- a/MediaBrowser.Controller/Providers/IProviderRepository.cs
+++ b/MediaBrowser.Controller/Providers/IProviderRepository.cs
@@ -9,22 +9,6 @@ namespace MediaBrowser.Controller.Providers
     public interface IProviderRepository : IRepository
     {
         /// <summary>
-        /// Gets the provider history.
-        /// </summary>
-        /// <param name="itemId">The item identifier.</param>
-        /// <returns>IEnumerable{BaseProviderInfo}.</returns>
-        IEnumerable<BaseProviderInfo> GetProviderHistory(Guid itemId);
-
-        /// <summary>
-        /// Saves the provider history.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <param name="history">The history.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        Task SaveProviderHistory(Guid id, IEnumerable<BaseProviderInfo> history, CancellationToken cancellationToken);
-
-        /// <summary>
         /// Gets the metadata status.
         /// </summary>
         /// <param name="itemId">The item identifier.</param>
diff --git a/MediaBrowser.Controller/Providers/MetadataStatus.cs b/MediaBrowser.Controller/Providers/MetadataStatus.cs
index 834d8ec35..adfae54f5 100644
--- a/MediaBrowser.Controller/Providers/MetadataStatus.cs
+++ b/MediaBrowser.Controller/Providers/MetadataStatus.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MediaBrowser.Common.Extensions;
 
 namespace MediaBrowser.Controller.Providers
 {
@@ -14,6 +13,18 @@ namespace MediaBrowser.Controller.Providers
         public Guid ItemId { get; set; }
 
         /// <summary>
+        /// Gets or sets the name of the item.
+        /// </summary>
+        /// <value>The name of the item.</value>
+        public string ItemName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the series.
+        /// </summary>
+        /// <value>The name of the series.</value>
+        public string SeriesName { get; set; }
+
+        /// <summary>
         /// Gets or sets the date last metadata refresh.
         /// </summary>
         /// <value>The date last metadata refresh.</value>