3.0.5306.42925

3 files changed, 19 insertions, 9 deletions

diff --git a/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs b/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
index c3d1796f99..aac8cda2eb 100644
--- a/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
+++ b/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
@@ -31,6 +31,6 @@ namespace MediaBrowser.Controller.Configuration
         /// Sets the preferred metadata service.
         /// </summary>
         /// <param name="service">The service.</param>
-        void SetPreferredMetadataService(string service);
+        void DisableMetadataService(string service);
     }
 }
diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
index 42178c44c1..ff94ceff36 100644
--- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
+++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
@@ -15,6 +15,21 @@ namespace MediaBrowser.Controller.Resolvers
     public static class EntityResolutionHelper
     {
         /// <summary>
+        /// Any folder named in this list will be ignored - can be added to at runtime for extensibility
+        /// </summary>
+        public static readonly List<string> IgnoreFolders = new List<string>
+        {
+                "metadata",
+                "ps3_update",
+                "ps3_vprm",
+                "extrafanart",
+                "extrathumbs",
+                ".actors",
+                ".wd_tv"
+
+        };
+
+        /// <summary>
         /// Any extension in this list is considered a video file - can be added to at runtime for extensibility
         /// </summary>
         public static List<string> VideoFileExtensions = new List<string>
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index c8ae0e6a75..e37a139233 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -218,6 +218,7 @@ namespace MediaBrowser.Controller.Session
         /// <param name="deviceId">The device identifier.</param>
         /// <param name="deviceName">Name of the device.</param>
         /// <param name="remoteEndPoint">The remote end point.</param>
+        /// <param name="isLocal">if set to <c>true</c> [is local].</param>
         /// <returns>Task{SessionInfo}.</returns>
         Task<AuthenticationResult> AuthenticateNewSession(string username, 
             string password, 
@@ -225,7 +226,8 @@ namespace MediaBrowser.Controller.Session
             string appVersion, 
             string deviceId, 
             string deviceName, 
-            string remoteEndPoint);
+            string remoteEndPoint,
+            bool isLocal);
 
         /// <summary>
         /// Reports the capabilities.
@@ -282,12 +284,5 @@ namespace MediaBrowser.Controller.Session
         /// <param name="id">The identifier.</param>
         /// <returns>Task.</returns>
         Task RevokeToken(string id);
-        
-        /// <summary>
-        /// Determines whether the specified remote endpoint is local.
-        /// </summary>
-        /// <param name="remoteEndpoint">The remote endpoint.</param>
-        /// <returns><c>true</c> if the specified remote endpoint is local; otherwise, <c>false</c>.</returns>
-        bool IsInLocalNetwork(string remoteEndpoint);
     }
 }
\ No newline at end of file