Moved TV into the main project and added Series properties to DTOBaseItem

1 files changed, 12 insertions, 29 deletions

diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 0e4f7e5fd8..f493d33002 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -8,6 +8,7 @@ using MediaBrowser.Controller.Weather;
 using MediaBrowser.Model.Authentication;

 using MediaBrowser.Model.Configuration;

 using MediaBrowser.Model.Entities;

+using MediaBrowser.Model.Entities.TV;

 using MediaBrowser.Model.Progress;

 using System;

 using System.Collections.Generic;

@@ -111,12 +112,6 @@ namespace MediaBrowser.Controller
 

             // Sort the providers by priority

             MetadataProviders = MetadataProvidersEnumerable.OrderBy(e => e.Priority).ToArray();

-

-            // Initialize the metadata providers

-            Parallel.ForEach(MetadataProviders, provider =>

-            {

-                provider.Init();

-            });

         }

 

         /// <summary>

@@ -126,17 +121,26 @@ namespace MediaBrowser.Controller
         /// </summary>

         void ItemController_PreBeginResolvePath(object sender, PreBeginResolveEventArgs e)

         {

+            // Ignore hidden files and folders

             if (e.IsHidden || e.IsSystemFile)

             {

-                // Ignore hidden files and folders

                 e.Cancel = true;

             }

 

+            // Ignore any folders named "trailers"

             else if (Path.GetFileName(e.Path).Equals("trailers", StringComparison.OrdinalIgnoreCase))

             {

-                // Ignore any folders named "trailers"

                 e.Cancel = true;

             }

+

+            // Don't try and resolve files within the season metadata folder

+            else if (Path.GetFileName(e.Path).Equals("metadata", StringComparison.OrdinalIgnoreCase) && e.IsDirectory)

+            {

+                if (e.Parent is Season || e.Parent is Series)

+                {

+                    e.Cancel = true;

+                }

+            }

         }

 

         /// <summary>

@@ -383,26 +387,5 @@ namespace MediaBrowser.Controller
                 }

             }

         }

-

-        protected override void DisposeComposableParts()

-        {

-            base.DisposeComposableParts();

-

-            DisposeProviders();

-        }

-

-        /// <summary>

-        /// Disposes all providers

-        /// </summary>

-        private void DisposeProviders()

-        {

-            if (MetadataProviders != null)

-            {

-                foreach (var provider in MetadataProviders)

-                {

-                    provider.Dispose();

-                }

-            }

-        }

     }

 }