reduce socket activity

Emby.Dlna/Eventing/EventManager.cs

@@ -26,9 +26,11 @@ namespace Emby.Dlna.Eventing
             _logger = logger;
         }
 
-        public EventSubscriptionResponse RenewEventSubscription(string subscriptionId, string requestedTimeoutString)
+        public EventSubscriptionResponse RenewEventSubscription(string subscriptionId, string notificationType, string requestedTimeoutString, string callbackUrl)
         {
-            var subscription = GetSubscription(subscriptionId, true);
+            var subscription = GetSubscription(subscriptionId, false);
+
+            int timeoutSeconds;
 
             // Remove logging for now because some devices are sending this very frequently
             // TODO re-enable with dlna debug logging setting
@@ -37,10 +39,18 @@ namespace Emby.Dlna.Eventing
             //    timeout,
             //    subscription.CallbackUrl);
 
+            if (subscription != null)
+            {
                 subscription.TimeoutSeconds = ParseTimeout(requestedTimeoutString) ?? 300;
+                timeoutSeconds = subscription.TimeoutSeconds;
                 subscription.SubscriptionTime = DateTime.UtcNow;
+            }
+            else
+            {
+                timeoutSeconds = 300;
+            }
 
-            return GetEventSubscriptionResponse(subscriptionId, requestedTimeoutString, subscription.TimeoutSeconds);
+            return GetEventSubscriptionResponse(subscriptionId, requestedTimeoutString, timeoutSeconds);
         }
 
         public EventSubscriptionResponse CreateEventSubscription(string notificationType, string requestedTimeoutString, string callbackUrl)

Emby.Dlna/Service/BaseService.cs

@@ -24,9 +24,9 @@ namespace Emby.Dlna.Service
             return EventManager.CancelEventSubscription(subscriptionId);
         }
 
-        public EventSubscriptionResponse RenewEventSubscription(string subscriptionId, string timeoutString)
+        public EventSubscriptionResponse RenewEventSubscription(string subscriptionId, string notificationType, string timeoutString, string callbackUrl)
         {
-            return EventManager.RenewEventSubscription(subscriptionId, timeoutString);
+            return EventManager.RenewEventSubscription(subscriptionId, notificationType, timeoutString, callbackUrl);
         }
 
         public EventSubscriptionResponse CreateEventSubscription(string notificationType, string timeoutString, string callbackUrl)

Emby.Server.Implementations/IO/ManagedFileSystem.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -24,12 +25,14 @@ namespace Emby.Server.Implementations.IO
         private string _tempPath;
 
         private SharpCifsFileSystem _sharpCifsFileSystem;
+        private IEnvironmentInfo _environmentInfo;
 
         public ManagedFileSystem(ILogger logger, IEnvironmentInfo environmentInfo, string tempPath)
         {
             Logger = logger;
             _supportsAsyncFileStreams = true;
             _tempPath = tempPath;
+            _environmentInfo = environmentInfo;
 
             // On Linux, this needs to be true or symbolic links are ignored
             EnableFileSystemRequestConcat = environmentInfo.OperatingSystem != MediaBrowser.Model.System.OperatingSystem.Windows &&
@@ -1051,7 +1054,25 @@ namespace Emby.Server.Implementations.IO
 
         public virtual void SetExecutable(string path)
         {
+            if (_environmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.OSX)
+            {
+                RunProcess("chmod", "+x \"" + path + "\"", GetDirectoryName(path));
+            }
+        }
 
+        private void RunProcess(string path, string args, string workingDirectory)
+        {
+            using (var process = Process.Start(new ProcessStartInfo
+            {
+                Arguments = args,
+                FileName = path,
+                CreateNoWindow = true,
+                WorkingDirectory = workingDirectory,
+                WindowStyle = ProcessWindowStyle.Normal
+            }))
+            {
+                process.WaitForExit();
+            }
         }
     }
 }

Emby.Server.Implementations/Updates/InstallationManager.cs

@@ -442,11 +442,6 @@ namespace Emby.Server.Implementations.Updates
         /// <returns>Task{IEnumerable{PackageVersionInfo}}.</returns>
         public async Task<IEnumerable<PackageVersionInfo>> GetAvailablePluginUpdates(Version applicationVersion, bool withAutoUpdateEnabled, CancellationToken cancellationToken)
         {
-            if (!_config.CommonConfiguration.EnableAutoUpdate)
-            {
-                return new PackageVersionInfo[] { };
-            }
-
             var catalog = await GetAvailablePackagesWithoutRegistrationInfo(cancellationToken).ConfigureAwait(false);
 
             var systemUpdateLevel = GetSystemUpdateLevel();

MediaBrowser.Api/Dlna/DlnaServerService.cs

@@ -246,7 +246,7 @@ namespace MediaBrowser.Api.Dlna
 
                 if (string.IsNullOrEmpty(notificationType))
                 {
-                    return GetSubscriptionResponse(eventManager.RenewEventSubscription(subscriptionId, timeoutString));
+                    return GetSubscriptionResponse(eventManager.RenewEventSubscription(subscriptionId, notificationType, timeoutString, callback));
                 }
 
                 return GetSubscriptionResponse(eventManager.CreateEventSubscription(notificationType, timeoutString, callback));

MediaBrowser.Api/MediaBrowser.Api.csproj

@@ -40,7 +40,6 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
-    <Compile Include="BasePeriodicWebSocketListener.cs" />
     <Compile Include="BrandingService.cs" />
     <Compile Include="ChannelService.cs" />
     <Compile Include="Devices\DeviceService.cs" />

MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs

@@ -4,6 +4,7 @@ using MediaBrowser.Model.Tasks;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Threading;
 
 namespace MediaBrowser.Api.ScheduledTasks

MediaBrowser.Api/System/ActivityLogWebSocketListener.cs

@@ -3,6 +3,7 @@ using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Logging;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Threading;
 
 namespace MediaBrowser.Api.System

MediaBrowser.Api/UserLibrary/ItemsService.cs

@@ -117,7 +117,9 @@ namespace MediaBrowser.Api.UserLibrary
                 IsVirtualItem = false,
                 CollapseBoxSetItems = false,
                 EnableTotalRecordCount = request.EnableTotalRecordCount,
-                AncestorIds = ancestorIds.ToArray()
+                AncestorIds = ancestorIds.ToArray(),
+                IncludeItemTypes = request.GetIncludeItemTypes(),
+                ExcludeItemTypes = request.GetExcludeItemTypes()
             });
 
             var returnItems = _dtoService.GetBaseItemDtos(itemsResult.Items, options, user);

MediaBrowser.Controller/Dlna/IEventManager.cs

@@ -12,7 +12,7 @@ namespace MediaBrowser.Controller.Dlna
         /// <summary>
         /// Renews the event subscription.
         /// </summary>
-        EventSubscriptionResponse RenewEventSubscription(string subscriptionId, string requestedTimeoutString);
+        EventSubscriptionResponse RenewEventSubscription(string subscriptionId, string notificationType, string requestedTimeoutString, string callbackUrl);
 
         /// <summary>
         /// Creates the event subscription.

MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -176,6 +176,7 @@
     <Compile Include="MediaEncoding\MediaStreamSelector.cs" />
     <Compile Include="Net\AuthenticatedAttribute.cs" />
     <Compile Include="Net\AuthorizationInfo.cs" />
+    <Compile Include="Net\BasePeriodicWebSocketListener.cs" />
     <Compile Include="Net\IAuthorizationContext.cs" />
     <Compile Include="Net\IAuthService.cs" />
     <Compile Include="Net\IHasResultFactory.cs" />

MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs

@@ -4,12 +4,11 @@ using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Threading;
 
-namespace MediaBrowser.Api
+namespace MediaBrowser.Controller.Net
 {
     /// <summary>
     /// Starts sending data over a web socket periodically when a message is received, and then stops when a corresponding stop message is received
@@ -93,7 +92,7 @@ namespace MediaBrowser.Api
         {
             get
             {
-                return true;
+                return false;
             }
         }
 

MediaBrowser.WebDashboard/Api/PackageCreator.cs

@@ -265,7 +265,7 @@ namespace MediaBrowser.WebDashboard.Api
                 builder.AppendFormat("window.appMode='{0}';", mode);
             }
 
-            if (string.IsNullOrWhiteSpace(mode))
+            else
             {
                 builder.AppendFormat("window.dashboardVersion='{0}';", version);
             }