Merge pull request #15 from MediaBrowser/dev

Dev

15 files changed, 24 insertions, 209 deletions

diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
index f9060d184..a783910e3 100644
--- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
@@ -61,16 +61,7 @@ namespace MediaBrowser.Controller.Providers
             };
 
             //Fetch(item, metadataFile, settings, Encoding.GetEncoding("ISO-8859-1"), cancellationToken);
-
-            try
-            {
-                Fetch(item, metadataFile, settings, Encoding.UTF8, cancellationToken);
-            }
-            catch
-            {
-                Logger.Error("Error parsing xml file {0}", metadataFile);
-                throw;
-            }
+            Fetch(item, metadataFile, settings, Encoding.UTF8, cancellationToken);
         }
 
         /// <summary>
@@ -812,11 +803,7 @@ namespace MediaBrowser.Controller.Providers
                     {
                         using (var subtree = reader.ReadSubtree())
                         {
-                            var hasTags = item as IHasTags;
-                            if (hasTags != null)
-                            {
-                                FetchFromTagsNode(subtree, hasTags);
-                            }
+                            FetchFromTagsNode(subtree, item);
                         }
                         break;
                     }
@@ -825,11 +812,7 @@ namespace MediaBrowser.Controller.Providers
                     {
                         using (var subtree = reader.ReadSubtree())
                         {
-                            var hasTags = item as IHasKeywords;
-                            if (hasTags != null)
-                            {
-                                FetchFromKeywordsNode(subtree, hasTags);
-                            }
+                            FetchFromKeywordsNode(subtree, item);
                         }
                         break;
                     }
@@ -1079,7 +1062,7 @@ namespace MediaBrowser.Controller.Providers
             }
         }
 
-        private void FetchFromTagsNode(XmlReader reader, IHasTags item)
+        private void FetchFromTagsNode(XmlReader reader, BaseItem item)
         {
             reader.MoveToContent();
 
@@ -1108,7 +1091,7 @@ namespace MediaBrowser.Controller.Providers
             }
         }
 
-        private void FetchFromKeywordsNode(XmlReader reader, IHasKeywords item)
+        private void FetchFromKeywordsNode(XmlReader reader, BaseItem item)
         {
             reader.MoveToContent();
 
diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index c057c9707..e7e3323c2 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -102,6 +102,12 @@ namespace MediaBrowser.Controller.Providers
         {
             var directory = Path.GetDirectoryName(path);
 
+            if (string.IsNullOrWhiteSpace(directory))
+            {
+                _logger.Debug("Parent path is null for {0}", path);
+                return null;
+            }
+
             var dict = GetFileSystemDictionary(directory, false);
 
             FileSystemMetadata entry;
diff --git a/MediaBrowser.Controller/Providers/EpisodeInfo.cs b/MediaBrowser.Controller/Providers/EpisodeInfo.cs
index 28abd636a..b879040f8 100644
--- a/MediaBrowser.Controller/Providers/EpisodeInfo.cs
+++ b/MediaBrowser.Controller/Providers/EpisodeInfo.cs
@@ -10,6 +10,9 @@ namespace MediaBrowser.Controller.Providers
         public int? IndexNumberEnd { get; set; }
         public int? AnimeSeriesIndex { get; set; }
 
+        public bool IsMissingEpisode { get; set; }
+        public bool IsVirtualUnaired { get; set; }
+
         public EpisodeInfo()
         {
             SeriesProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
diff --git a/MediaBrowser.Controller/Providers/IHasItemChangeMonitor.cs b/MediaBrowser.Controller/Providers/IHasItemChangeMonitor.cs
index 4c7069dd6..9441c3ecd 100644
--- a/MediaBrowser.Controller/Providers/IHasItemChangeMonitor.cs
+++ b/MediaBrowser.Controller/Providers/IHasItemChangeMonitor.cs
@@ -8,9 +8,8 @@ namespace MediaBrowser.Controller.Providers
         /// Determines whether the specified item has changed.
         /// </summary>
         /// <param name="item">The item.</param>
-        /// <param name="status">The status.</param>
         /// <param name="directoryService">The directory service.</param>
         /// <returns><c>true</c> if the specified item has changed; otherwise, <c>false</c>.</returns>
-        bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService);
+        bool HasChanged(IHasMetadata item, IDirectoryService directoryService);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Providers/IItemIdentityConverter.cs b/MediaBrowser.Controller/Providers/IItemIdentityConverter.cs
deleted file mode 100644
index bfdd1dbf3..000000000
--- a/MediaBrowser.Controller/Providers/IItemIdentityConverter.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace MediaBrowser.Controller.Providers
-{
-    public interface IItemIdentityConverter { }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Providers/IItemIdentityProvider.cs b/MediaBrowser.Controller/Providers/IItemIdentityProvider.cs
deleted file mode 100644
index 6b403bb55..000000000
--- a/MediaBrowser.Controller/Providers/IItemIdentityProvider.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace MediaBrowser.Controller.Providers
-{
-    public interface IItemIdentityProvider { }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Providers/IProviderManager.cs b/MediaBrowser.Controller/Providers/IProviderManager.cs
index 57e4ff320..3eefa9647 100644
--- a/MediaBrowser.Controller/Providers/IProviderManager.cs
+++ b/MediaBrowser.Controller/Providers/IProviderManager.cs
@@ -97,13 +97,11 @@ namespace MediaBrowser.Controller.Providers
         /// </summary>
         /// <param name="imageProviders">The image providers.</param>
         /// <param name="metadataServices">The metadata services.</param>
-        /// <param name="identityProviders">The identity providers.</param>
-        /// <param name="identityConverters">The identity converters.</param>
         /// <param name="metadataProviders">The metadata providers.</param>
         /// <param name="savers">The savers.</param>
         /// <param name="imageSavers">The image savers.</param>
         /// <param name="externalIds">The external ids.</param>
-        void AddParts(IEnumerable<IImageProvider> imageProviders, IEnumerable<IMetadataService> metadataServices, IEnumerable<IItemIdentityProvider> identityProviders, IEnumerable<IItemIdentityConverter> identityConverters, IEnumerable<IMetadataProvider> metadataProviders,
+        void AddParts(IEnumerable<IImageProvider> imageProviders, IEnumerable<IMetadataService> metadataServices, IEnumerable<IMetadataProvider> metadataProviders,
             IEnumerable<IMetadataSaver> savers,
             IEnumerable<IImageSaver> imageSavers,
             IEnumerable<IExternalId> externalIds);
@@ -135,7 +133,7 @@ namespace MediaBrowser.Controller.Providers
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>IEnumerable{ExternalUrl}.</returns>
-        IEnumerable<ExternalUrl> GetExternalUrls(IHasProviderIds item);
+        IEnumerable<ExternalUrl> GetExternalUrls(BaseItem item);
 
         /// <summary>
         /// Gets the external identifier infos.
@@ -190,21 +188,5 @@ namespace MediaBrowser.Controller.Providers
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{HttpResponseInfo}.</returns>
         Task<HttpResponseInfo> GetSearchImage(string providerName, string url, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Gets the item identity providers.
-        /// </summary>
-        /// <typeparam name="TLookupInfo">The type of the t lookup information.</typeparam>
-        /// <returns>IEnumerable&lt;IItemIdentityProvider&lt;TLookupInfo, TIdentity&gt;&gt;.</returns>
-        IEnumerable<IItemIdentityProvider<TLookupInfo>> GetItemIdentityProviders<TLookupInfo>()
-            where TLookupInfo : ItemLookupInfo;
-
-        /// <summary>
-        /// Gets the item identity converters.
-        /// </summary>
-        /// <typeparam name="TLookupInfo">The type of the t lookup information.</typeparam>
-        /// <returns>IEnumerable&lt;IItemIdentityConverter&lt;TIdentity&gt;&gt;.</returns>
-        IEnumerable<IItemIdentityConverter<TLookupInfo>> GetItemIdentityConverters<TLookupInfo>()
-            where TLookupInfo : ItemLookupInfo;
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Providers/IProviderRepository.cs b/MediaBrowser.Controller/Providers/IProviderRepository.cs
deleted file mode 100644
index 1f77d0ca1..000000000
--- a/MediaBrowser.Controller/Providers/IProviderRepository.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using MediaBrowser.Controller.Persistence;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Controller.Providers
-{
-    public interface IProviderRepository : IRepository
-    {
-        /// <summary>
-        /// Gets the metadata status.
-        /// </summary>
-        /// <param name="itemId">The item identifier.</param>
-        /// <returns>MetadataStatus.</returns>
-        MetadataStatus GetMetadataStatus(Guid itemId);
-
-        /// <summary>
-        /// Saves the metadata status.
-        /// </summary>
-        /// <param name="status">The status.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        Task SaveMetadataStatus(MetadataStatus status, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Initializes this instance.
-        /// </summary>
-        /// <returns>Task.</returns>
-        Task Initialize();
-    }
-}
diff --git a/MediaBrowser.Controller/Providers/ISeriesOrderManager.cs b/MediaBrowser.Controller/Providers/ISeriesOrderManager.cs
deleted file mode 100644
index 970f7a7be..000000000
--- a/MediaBrowser.Controller/Providers/ISeriesOrderManager.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Controller.Providers
-{
-    public interface ISeriesOrderManager
-    {
-        Task<int?> FindSeriesIndex(string orderType, string seriesName);
-        void AddParts(IEnumerable<ISeriesOrderProvider> orderProviders);
-    }
-}
diff --git a/MediaBrowser.Controller/Providers/ISeriesOrderProvider.cs b/MediaBrowser.Controller/Providers/ISeriesOrderProvider.cs
deleted file mode 100644
index ee0f3c197..000000000
--- a/MediaBrowser.Controller/Providers/ISeriesOrderProvider.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Controller.Providers
-{
-    public interface ISeriesOrderProvider
-    {
-        string OrderType { get; }
-        Task<int?> FindSeriesIndex(string seriesName);
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Providers/ItemIdentifier.cs b/MediaBrowser.Controller/Providers/ItemIdentifier.cs
deleted file mode 100644
index bbc6dd76c..000000000
--- a/MediaBrowser.Controller/Providers/ItemIdentifier.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Controller.Providers
-{
-    public static class ItemIdentifier<TLookupInfo>
-        where TLookupInfo : ItemLookupInfo
-    {
-        public static async Task FindIdentities(TLookupInfo item, IProviderManager providerManager, CancellationToken cancellationToken)
-        {
-            var providers = providerManager.GetItemIdentityProviders<TLookupInfo>();
-            var converters = providerManager.GetItemIdentityConverters<TLookupInfo>().ToList();
-            
-            foreach (var provider in providers)
-            {
-                await provider.Identify(item);
-            }
-
-            bool changesMade = true;
-
-            while (changesMade)
-            {
-                changesMade = false;
-
-                foreach (var converter in converters)
-                {
-                    if (await converter.Convert(item))
-                    {
-                        changesMade = true;
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Providers/ItemIdentities.cs b/MediaBrowser.Controller/Providers/ItemIdentities.cs
deleted file mode 100644
index 48316d0f4..000000000
--- a/MediaBrowser.Controller/Providers/ItemIdentities.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Controller.Providers
-{
-    public interface IItemIdentityProvider<in TLookupInfo> : IItemIdentityProvider
-        where TLookupInfo : ItemLookupInfo
-    {
-        Task Identify(TLookupInfo info);
-    }
-
-    public interface IItemIdentityConverter<in TLookupInfo> : IItemIdentityConverter
-        where TLookupInfo : ItemLookupInfo
-    {
-        Task<bool> Convert(TLookupInfo info);
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Providers/ItemInfo.cs b/MediaBrowser.Controller/Providers/ItemInfo.cs
index d16a73028..63cc48058 100644
--- a/MediaBrowser.Controller/Providers/ItemInfo.cs
+++ b/MediaBrowser.Controller/Providers/ItemInfo.cs
@@ -1,3 +1,4 @@
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Entities;
 
@@ -5,10 +6,6 @@ namespace MediaBrowser.Controller.Providers
 {
     public class ItemInfo
     {
-        public ItemInfo()
-        {
-        }
-
         public ItemInfo(IHasMetadata item)
         {
             Path = item.Path;
@@ -21,8 +18,11 @@ namespace MediaBrowser.Controller.Providers
                 VideoType = video.VideoType;
                 IsPlaceHolder = video.IsPlaceHolder;
             }
+
+            ItemType = item.GetType();
         }
 
+        public Type ItemType { get; set; }
         public string Path { get; set; }
         public string ContainingFolderPath { get; set; }
         public VideoType VideoType { get; set; }
diff --git a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
index 29f4feb3d..9427b2afd 100644
--- a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
+++ b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using CommonIO;
+using MediaBrowser.Model.Providers;
 
 namespace MediaBrowser.Controller.Providers
 {
@@ -13,6 +14,7 @@ namespace MediaBrowser.Controller.Providers
         public bool IsPostRecursiveRefresh { get; set; }
 
         public MetadataRefreshMode MetadataRefreshMode { get; set; }
+        public RemoteSearchResult SearchResult { get; set; }
 
         public bool ForceSave { get; set; }
 
@@ -37,6 +39,7 @@ namespace MediaBrowser.Controller.Providers
             ImageRefreshMode = copy.ImageRefreshMode;
             ReplaceAllImages = copy.ReplaceAllImages;
             ReplaceImages = copy.ReplaceImages.ToList();
+            SearchResult = copy.SearchResult;
         }
     }
 }
diff --git a/MediaBrowser.Controller/Providers/MetadataStatus.cs b/MediaBrowser.Controller/Providers/MetadataStatus.cs
deleted file mode 100644
index b19377a68..000000000
--- a/MediaBrowser.Controller/Providers/MetadataStatus.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-
-namespace MediaBrowser.Controller.Providers
-{
-    public class MetadataStatus
-    {
-        /// <summary>
-        /// Gets or sets the item identifier.
-        /// </summary>
-        /// <value>The item identifier.</value>
-        public Guid ItemId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the date last metadata refresh.
-        /// </summary>
-        /// <value>The date last metadata refresh.</value>
-        public DateTime? DateLastMetadataRefresh { get; set; }
-
-        /// <summary>
-        /// Gets or sets the date last images refresh.
-        /// </summary>
-        /// <value>The date last images refresh.</value>
-        public DateTime? DateLastImagesRefresh { get; set; }
-
-        public DateTime? ItemDateModified { get; set; }
-
-        public bool IsDirty { get; private set; }
-
-        public void SetDateLastMetadataRefresh(DateTime? date)
-        {
-            if (date != DateLastMetadataRefresh)
-            {
-                IsDirty = true;
-            }
-
-            DateLastMetadataRefresh = date;
-        }
-
-        public void SetDateLastImagesRefresh(DateTime? date)
-        {
-            if (date != DateLastImagesRefresh)
-            {
-                IsDirty = true;
-            }
-
-            DateLastImagesRefresh = date;
-        }
-    }
-}