beta fixes

11 files changed, 73 insertions, 43 deletions

diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index be0b32548..a7f8717a7 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -150,7 +150,7 @@ namespace MediaBrowser.Server.Implementations.Connect
 
             if (string.IsNullOrWhiteSpace(wanApiAddress))
             {
-                _logger.Warn("Cannot update Media Browser Connect information without a WanApiAddress");
+                _logger.Warn("Cannot update Emby Connect information without a WanApiAddress");
                 return;
             }
 
@@ -411,7 +411,7 @@ namespace MediaBrowser.Server.Implementations.Connect
 
             if (!connectUser.IsActive)
             {
-                throw new ArgumentException("The Media Browser account has been disabled.");
+                throw new ArgumentException("The Emby account has been disabled.");
             }
 
             var user = GetUser(userId);
@@ -517,7 +517,7 @@ namespace MediaBrowser.Server.Implementations.Connect
 
                 if (!connectUser.IsActive)
                 {
-                    throw new ArgumentException("The Media Browser account has been disabled.");
+                    throw new ArgumentException("The Emby account has been disabled.");
                 }
 
                 connectUserId = connectUser.Id;
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
index f6a35973b..bc995d62a 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
@@ -389,7 +389,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
             var notification = new NotificationRequest
             {
                 UserIds = new List<string> { e.Argument.Id.ToString("N") },
-                Name = "Welcome to Media Browser!",
+                Name = "Welcome to Emby!",
                 Description = "Check back here for more notifications."
             };
 
diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs
index 1bbe9893b..c8278dc54 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs
@@ -28,7 +28,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
             if (!string.IsNullOrWhiteSpace(authorization.Token))
             {
                 var auth = GetTokenInfo(requestContext);
-                return _sessionManager.GetSessionByAuthenticationToken(auth, authorization.DeviceId, requestContext.RemoteIp, authorization.Version);
+                if (auth != null)
+                {
+                    return _sessionManager.GetSessionByAuthenticationToken(auth, authorization.DeviceId, requestContext.RemoteIp, authorization.Version);
+                }
             }
 
             var session = _sessionManager.GetSession(authorization.DeviceId, authorization.Client, authorization.Version);
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 075451146..aff801516 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1111,13 +1111,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             var numComplete = 0;
 
-            foreach (var program in list)
+            foreach (var programId in list)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                if (!currentIdList.Contains(program.Id))
+                if (!currentIdList.Contains(new Guid(programId)))
                 {
-                    await _libraryManager.DeleteItem(program).ConfigureAwait(false);
+                    var program = _libraryManager.GetItemById(programId);
+
+                    if (program != null)
+                    {
+                        await _libraryManager.DeleteItem(program).ConfigureAwait(false);
+                    }
                 }
 
                 numComplete++;
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index c2a115df4..8681eb7c8 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -16,7 +16,7 @@
     "LabelNext": "Next",
     "LabelYoureDone": "You're Done!",
     "WelcomeToMediaBrowser": "Welcome to Media Browser!",
-    "TitleMediaBrowser": "Media Browser",
+    "TitleMediaBrowser": "Emby",
     "ThisWizardWillGuideYou": "This wizard will help guide you through the setup process. To begin, please select your preferred language.",
     "TellUsAboutYourself": "Tell us about yourself",
     "ButtonQuickStartGuide": "Quick start guide",
diff --git a/MediaBrowser.Server.Implementations/Notifications/CoreNotificationTypes.cs b/MediaBrowser.Server.Implementations/Notifications/CoreNotificationTypes.cs
index a33fe2147..98d3672fa 100644
--- a/MediaBrowser.Server.Implementations/Notifications/CoreNotificationTypes.cs
+++ b/MediaBrowser.Server.Implementations/Notifications/CoreNotificationTypes.cs
@@ -27,7 +27,7 @@ namespace MediaBrowser.Server.Implementations.Notifications
                 {
                      Type = NotificationType.ApplicationUpdateInstalled.ToString(),
                      DefaultDescription = "{ReleaseNotes}",
-                     DefaultTitle = "A new version of Media Browser Server has been installed.",
+                     DefaultTitle = "A new version of Emby Server has been installed.",
                      Variables = new List<string>{"Version"}
                 },
 
@@ -71,7 +71,7 @@ namespace MediaBrowser.Server.Implementations.Notifications
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.ServerRestartRequired.ToString(),
-                     DefaultTitle = "Please restart Media Browser Server to finish updating."
+                     DefaultTitle = "Please restart Emby Server to finish updating."
                 },
 
                 new NotificationTypeInfo
@@ -158,7 +158,7 @@ namespace MediaBrowser.Server.Implementations.Notifications
                 knownTypes.Add(new NotificationTypeInfo
                 {
                     Type = NotificationType.ApplicationUpdateAvailable.ToString(),
-                    DefaultTitle = "A new version of Media Browser Server is available for download."
+                    DefaultTitle = "A new version of Emby Server is available for download."
                 });
             }
 
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 3ffe31ed1..4c45d5b83 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -522,7 +522,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             }
         }
         
-        public IEnumerable<BaseItem> GetItemsOfType(Type type)
+        public IEnumerable<string> GetItemsOfType(Type type)
         {
             if (type == null)
             {
@@ -533,7 +533,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             
             using (var cmd = _connection.CreateCommand())
             {
-                cmd.CommandText = "select type,data from TypedBaseItems where type = @type";
+                cmd.CommandText = "select guid from TypedBaseItems where type = @type";
 
                 cmd.Parameters.Add(cmd, "@type", DbType.String).Value = type.FullName;
 
@@ -541,12 +541,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 {
                     while (reader.Read())
                     {
-                        var item = GetItem(reader);
-
-                        if (item != null)
-                        {
-                            yield return item;
-                        }
+                        yield return reader.GetString(0);
                     }
                 }
             }
diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs
index 231a98b4a..fa3cd6be7 100644
--- a/MediaBrowser.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs
@@ -108,7 +108,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
             }
             else
             {
-                Logger.Info("A new version of Media Browser is available.");
+                Logger.Info("A new version of " + _appHost.Name + " is available.");
             }
 
             progress.Report(100);
diff --git a/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
index 4d5c40853..9a7fb33df 100644
--- a/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
+++ b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
@@ -43,6 +43,10 @@ namespace MediaBrowser.Server.Implementations.Session
             ResetPingTimer();
         }
 
+        public void OnActivity()
+        {
+        }
+
         private string PostUrl
         {
             get
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 5ea970426..f88e21aea 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -236,34 +236,44 @@ namespace MediaBrowser.Server.Implementations.Session
             }
 
             var activityDate = DateTime.UtcNow;
-
             var session = await GetSessionInfo(appName, appVersion, deviceId, deviceName, remoteEndPoint, user).ConfigureAwait(false);
-
+            var lastActivityDate = session.LastActivityDate;
             session.LastActivityDate = activityDate;
 
-            if (user == null)
+            if (user != null)
             {
-                return session;
-            }
-
-            var lastActivityDate = user.LastActivityDate;
+                var userLastActivityDate = user.LastActivityDate ?? DateTime.MinValue;
+                user.LastActivityDate = activityDate;
 
-            user.LastActivityDate = activityDate;
+                // Don't log in the db anymore frequently than 10 seconds
+                if ((activityDate - userLastActivityDate).TotalSeconds > 10)
+                {
+                    try
+                    {
+                        // Save this directly. No need to fire off all the events for this.
+                        await _userRepository.SaveUser(user, CancellationToken.None).ConfigureAwait(false);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.ErrorException("Error updating user", ex);
+                    }
+                }
+            }
 
-            // Don't log in the db anymore frequently than 10 seconds
-            if (lastActivityDate.HasValue && (activityDate - lastActivityDate.Value).TotalSeconds < 10)
+            if ((activityDate - lastActivityDate).TotalSeconds > 10)
             {
-                return session;
-            }
+                EventHelper.FireEventIfNotNull(SessionActivity, this, new SessionEventArgs
+                {
+                    SessionInfo = session
 
-            // Save this directly. No need to fire off all the events for this.
-            await _userRepository.SaveUser(user, CancellationToken.None).ConfigureAwait(false);
+                }, _logger);
+            }
 
-            EventHelper.FireEventIfNotNull(SessionActivity, this, new SessionEventArgs
+            var controller = session.SessionController;
+            if (controller != null)
             {
-                SessionInfo = session
-
-            }, _logger);
+                controller.OnActivity();
+            }
 
             return session;
         }
@@ -1680,7 +1690,7 @@ namespace MediaBrowser.Server.Implementations.Session
                 deviceId = info.DeviceId;
             }
 
-            return GetSessionInfo(appName, appVersion, deviceId, deviceName, remoteEndpoint, user);
+            return LogSessionActivity(appName, appVersion, deviceId, deviceName, remoteEndpoint, user);
         }
 
         public Task<SessionInfo> GetSessionByAuthenticationToken(string token, string deviceId, string remoteEndpoint)
diff --git a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
index f51998fea..d4ecd9572 100644
--- a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
+++ b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
@@ -30,17 +30,28 @@ namespace MediaBrowser.Server.Implementations.Session
             Sockets = new List<IWebSocketConnection>();
         }
 
+        private bool HasOpenSockets
+        {
+            get { return GetActiveSockets().Any(); }
+        }
+
+        public bool SupportsMediaControl
+        {
+            get { return HasOpenSockets; }
+        }
+
+        private bool _isActive;
         public bool IsSessionActive
         {
             get
             {
-                return Sockets.Any(i => i.State == WebSocketState.Open);
+                return _isActive;
             }
         }
 
-        public bool SupportsMediaControl
+        public void OnActivity()
         {
-            get { return GetActiveSockets().Any(); }
+            _isActive = true;
         }
 
         private IEnumerable<IWebSocketConnection> GetActiveSockets()
@@ -64,6 +75,8 @@ namespace MediaBrowser.Server.Implementations.Session
         {
             if (!GetActiveSockets().Any())
             {
+                _isActive = false;
+
                 try
                 {
                     _sessionManager.ReportSessionEnded(Session.Id);