More comments and cleanup. Added special feature provider for movies

6 files changed, 20 insertions, 18 deletions

diff --git a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs
index d45c5ee686..4166cb1526 100644
--- a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs
+++ b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs
@@ -5,8 +5,8 @@ using System.IO;
 using System.Linq;

 using System.Threading.Tasks;

 using MediaBrowser.Common.Logging;

-using MediaBrowser.Controller.Events;

 using MediaBrowser.Controller.FFMpeg;

+using MediaBrowser.Controller.Library;

 using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Controller.Providers

diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
index 5c536913ec..45cd598837 100644
--- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
+++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
@@ -1,6 +1,6 @@
 using System;

 using System.Threading.Tasks;

-using MediaBrowser.Controller.Events;

+using MediaBrowser.Controller.Library;

 using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Controller.Providers

diff --git a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
index d0bd20a47a..cdf02e90bc 100644
--- a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
+++ b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
@@ -1,12 +1,15 @@
 using System.ComponentModel.Composition;

 using System.IO;

 using System.Threading.Tasks;

-using MediaBrowser.Controller.Events;

+using MediaBrowser.Controller.Library;

 using MediaBrowser.Controller.Xml;

 using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Controller.Providers

 {

+    /// <summary>

+    /// Provides metadata for Folders and all subclasses by parsing folder.xml

+    /// </summary>

     [Export(typeof(BaseMetadataProvider))]

     public class FolderProviderFromXml : BaseMetadataProvider

     {

@@ -22,15 +25,15 @@ namespace MediaBrowser.Controller.Providers
 

         public async override Task FetchAsync(BaseEntity item, ItemResolveEventArgs args)

         {

-            await Task.Run(() => { Fetch(item, args); }).ConfigureAwait(false);

+            if (args.ContainsFile("folder.xml"))

+            {

+                await Task.Run(() => { Fetch(item, args); }).ConfigureAwait(false);

+            }

         }

 

         private void Fetch(BaseEntity item, ItemResolveEventArgs args)

         {

-            if (args.ContainsFile("folder.xml"))

-            {

-                new BaseItemXmlParser<Folder>().Fetch(item as Folder, Path.Combine(args.Path, "folder.xml"));

-            }

+            new BaseItemXmlParser<Folder>().Fetch(item as Folder, Path.Combine(args.Path, "folder.xml"));

         }

     }

 }

diff --git a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
index 59b58474fc..242a139efc 100644
--- a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
+++ b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
@@ -3,11 +3,14 @@ using System.Collections.Generic;
 using System.ComponentModel.Composition;

 using System.IO;

 using System.Threading.Tasks;

-using MediaBrowser.Controller.Events;

+using MediaBrowser.Controller.Library;

 using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Controller.Providers

 {

+    /// <summary>

+    /// Provides images for all types by looking for standard images - folder, backdrop, logo, etc.

+    /// </summary>

     [Export(typeof(BaseMetadataProvider))]

     public class ImageFromMediaLocationProvider : BaseMetadataProvider

     {

diff --git a/MediaBrowser.Controller/Providers/LocalTrailerProvider.cs b/MediaBrowser.Controller/Providers/LocalTrailerProvider.cs
index 536294c7b2..ac258ee61e 100644
--- a/MediaBrowser.Controller/Providers/LocalTrailerProvider.cs
+++ b/MediaBrowser.Controller/Providers/LocalTrailerProvider.cs
@@ -2,12 +2,15 @@
 using System.ComponentModel.Composition;

 using System.IO;

 using System.Threading.Tasks;

-using MediaBrowser.Controller.Events;

 using MediaBrowser.Controller.IO;

+using MediaBrowser.Controller.Library;

 using MediaBrowser.Model.Entities;

 

 namespace MediaBrowser.Controller.Providers

 {

+    /// <summary>

+    /// Provides local trailers by checking the trailers subfolder

+    /// </summary>

     [Export(typeof(BaseMetadataProvider))]

     public class LocalTrailerProvider : BaseMetadataProvider

     {

diff --git a/MediaBrowser.Controller/Providers/VideoInfoProvider.cs b/MediaBrowser.Controller/Providers/VideoInfoProvider.cs
index 2f8175b7e2..9b5a8933df 100644
--- a/MediaBrowser.Controller/Providers/VideoInfoProvider.cs
+++ b/MediaBrowser.Controller/Providers/VideoInfoProvider.cs
@@ -4,10 +4,9 @@ using System.ComponentModel.Composition;
 using System.Linq;

 using System.Threading.Tasks;

 using MediaBrowser.Common.Logging;

-using MediaBrowser.Controller.Events;

 using MediaBrowser.Controller.FFMpeg;

+using MediaBrowser.Controller.Library;

 using MediaBrowser.Model.Entities;

-using System.IO;

 

 namespace MediaBrowser.Controller.Providers

 {

@@ -38,12 +37,6 @@ namespace MediaBrowser.Controller.Providers
                     return;

                 }

 

-                // For now

-                if (Path.GetExtension(video.Path).EndsWith("iso", StringComparison.OrdinalIgnoreCase))

-                {

-                    return;

-                }

-

                 if (CanSkip(video))

                 {

                     return;