Merge pull request #2189 from MediaBrowser/dev

update network share settings

MediaBrowser.Api/StartupWizardService.cs

@@ -148,12 +148,6 @@ namespace MediaBrowser.Api
         {
             var user = _userManager.Users.First();
 
-            // TODO: This should be handled internally by xbmc metadata
-            const string metadataKey = "xbmcmetadata";
-            var metadata = _config.GetConfiguration<XbmcMetadataOptions>(metadataKey);
-            metadata.UserId = user.Id.ToString("N");
-            _config.SaveConfiguration(metadataKey, metadata);
-
             user.Name = request.Name;
             await _userManager.UpdateUser(user).ConfigureAwait(false);
 

MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -318,7 +318,6 @@
     <Compile Include="Providers\SongInfo.cs" />
     <Compile Include="Providers\TrailerInfo.cs" />
     <Compile Include="Providers\VideoContentType.cs" />
-    <Compile Include="RelatedMedia\IRelatedMediaProvider.cs" />
     <Compile Include="Security\AuthenticationInfo.cs" />
     <Compile Include="Security\AuthenticationInfoQuery.cs" />
     <Compile Include="Security\IAuthenticationRepository.cs" />

MediaBrowser.Controller/RelatedMedia/IRelatedMediaProvider.cs

@@ -1,11 +0,0 @@
-namespace MediaBrowser.Controller.RelatedMedia
-{
-    public interface IRelatedMediaProvider
-    {
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        string Name { get; }
-    }
-}

MediaBrowser.Dlna/PlayTo/Device.cs

@@ -474,7 +474,7 @@ namespace MediaBrowser.Dlna.PlayTo
                 if (_disposed)
                     return;
 
-                _logger.ErrorException("Error updating device info for {0}", ex, Properties.Name);
+                //_logger.ErrorException("Error updating device info for {0}", ex, Properties.Name);
 
                 _successiveStopCount++;
                 _connectFailureCount++;

MediaBrowser.Server.Implementations/Library/LibraryManager.cs

@@ -2829,6 +2829,16 @@ namespace MediaBrowser.Server.Implementations.Library
                 throw new DirectoryNotFoundException("The path does not exist.");
             }
 
+            if (!string.IsNullOrWhiteSpace(pathInfo.NetworkPath) && !_fileSystem.DirectoryExists(pathInfo.NetworkPath))
+            {
+                throw new DirectoryNotFoundException("The network path does not exist.");
+            }
+
+            if (!string.IsNullOrWhiteSpace(pathInfo.NetworkPath) && !_fileSystem.DirectoryExists(pathInfo.NetworkPath))
+            {
+                throw new DirectoryNotFoundException("The network path does not exist.");
+            }
+
             var rootFolderPath = ConfigurationManager.ApplicationPaths.DefaultUserViewsPath;
             var virtualFolderPath = Path.Combine(rootFolderPath, virtualFolderName);
 
@@ -2850,6 +2860,8 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 var libraryOptions = CollectionFolder.GetLibraryOptions(virtualFolderPath);
 
+                SyncLibraryOptionsToLocations(virtualFolderPath, libraryOptions);
+
                 var list = libraryOptions.PathInfos.ToList();
                 list.Add(pathInfo);
                 libraryOptions.PathInfos = list.ToArray();
@@ -2865,11 +2877,18 @@ namespace MediaBrowser.Server.Implementations.Library
                 throw new ArgumentNullException("path");
             }
 
+            if (!string.IsNullOrWhiteSpace(pathInfo.NetworkPath) && !_fileSystem.DirectoryExists(pathInfo.NetworkPath))
+            {
+                throw new DirectoryNotFoundException("The network path does not exist.");
+            }
+
             var rootFolderPath = ConfigurationManager.ApplicationPaths.DefaultUserViewsPath;
             var virtualFolderPath = Path.Combine(rootFolderPath, virtualFolderName);
 
             var libraryOptions = CollectionFolder.GetLibraryOptions(virtualFolderPath);
 
+            SyncLibraryOptionsToLocations(virtualFolderPath, libraryOptions);
+
             var list = libraryOptions.PathInfos.ToList();
             foreach (var originalPathInfo in list)
             {
@@ -2879,11 +2898,36 @@ namespace MediaBrowser.Server.Implementations.Library
                     break;
                 }
             }
+
             libraryOptions.PathInfos = list.ToArray();
 
             CollectionFolder.SaveLibraryOptions(virtualFolderPath, libraryOptions);
         }
 
+        private void SyncLibraryOptionsToLocations(string virtualFolderPath, LibraryOptions options)
+        {
+            var topLibraryFolders = GetUserRootFolder().Children.ToList();
+            var info = GetVirtualFolderInfo(virtualFolderPath, topLibraryFolders);
+
+            if (info.Locations.Count > 0 && info.Locations.Count != options.PathInfos.Length)
+            {
+                var list = options.PathInfos.ToList();
+
+                foreach (var location in info.Locations)
+                {
+                    if (!list.Any(i => string.Equals(i.Path, location, StringComparison.Ordinal)))
+                    {
+                        list.Add(new MediaPathInfo
+                        {
+                            Path = location
+                        });
+                    }
+                }
+
+                options.PathInfos = list.ToArray();
+            }
+        }
+
         public void RemoveVirtualFolder(string name, bool refreshLibrary)
         {
             if (string.IsNullOrWhiteSpace(name))

MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs

@@ -2855,20 +2855,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 }
             }
 
-            if (string.Equals(feature, "dvr", StringComparison.OrdinalIgnoreCase))
-            {
-                var config = GetConfiguration();
-                if (config.TunerHosts.Count(i => i.IsEnabled) > 0 &&
-                    config.ListingProviders.Count(i => (i.EnableAllTuners || i.EnabledTuners.Length > 0) && string.Equals(i.Type, SchedulesDirect.TypeName, StringComparison.OrdinalIgnoreCase)) > 0)
-                {
-                    return Task.FromResult(new MBRegistrationRecord
-                    {
-                        IsRegistered = true,
-                        IsValid = true
-                    });
-                }
-            }
-
             return _security.GetRegistrationStatus(feature);
         }
 

MediaBrowser.Server.Implementations/Session/SessionManager.cs

@@ -294,11 +294,9 @@ namespace MediaBrowser.Server.Implementations.Session
                     var key = GetSessionKey(session.Client, session.DeviceId);
 
                     SessionInfo removed;
+                    _activeConnections.TryRemove(key, out removed);
 
-                    if (_activeConnections.TryRemove(key, out removed))
-                    {
-                        OnSessionEnded(removed);
-                    }
+                    OnSessionEnded(session);
                 }
             }
             finally

MediaBrowser.Server.Mono/app.config

@@ -8,7 +8,7 @@
   </nlog>
   <appSettings>
     <add key="DebugProgramDataPath" value="ProgramData-Server"/>
-    <add key="ReleaseProgramDataPath" value="ProgramData-Server"/>
+    <add key="ReleaseProgramDataPath" value="%ApplicationData%/emby"/>
   </appSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

MediaBrowser.Server.Startup.Common/ApplicationPathHelper.cs

@@ -18,10 +18,16 @@ namespace MediaBrowser.Server.Startup.Common
             useDebugPath = true;
 #endif
 
-            var programDataPath = useDebugPath ? ConfigurationManager.AppSettings["DebugProgramDataPath"] : ConfigurationManager.AppSettings["ReleaseProgramDataPath"];
+            var programDataPath = useDebugPath ? 
+                ConfigurationManager.AppSettings["DebugProgramDataPath"] : 
+                ConfigurationManager.AppSettings["ReleaseProgramDataPath"];
 
             programDataPath = programDataPath.Replace("%ApplicationData%", Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
 
+            programDataPath = programDataPath
+                .Replace('/', Path.DirectorySeparatorChar)
+                .Replace('\\', Path.DirectorySeparatorChar);
+
             // If it's a relative path, e.g. "..\"
             if (!Path.IsPathRooted(programDataPath))
             {