Return DB asap

1 files changed, 70 insertions, 64 deletions

diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index 91371b833..541b23afd 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -155,94 +155,100 @@ namespace Emby.Server.Implementations.Activity
 
         public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? startIndex, int? limit)
         {
-            using (var connection = GetConnection(true))
-            {
-                var commandText = BaseActivitySelectText;
-                var whereClauses = new List<string>();
+            var commandText = BaseActivitySelectText;
+            var whereClauses = new List<string>();
 
-                if (minDate.HasValue)
+            if (minDate.HasValue)
+            {
+                whereClauses.Add("DateCreated>=@DateCreated");
+            }
+            if (hasUserId.HasValue)
+            {
+                if (hasUserId.Value)
                 {
-                    whereClauses.Add("DateCreated>=@DateCreated");
+                    whereClauses.Add("UserId not null");
                 }
-                if (hasUserId.HasValue)
+                else
                 {
-                    if (hasUserId.Value)
-                    {
-                        whereClauses.Add("UserId not null");
-                    }
-                    else
-                    {
-                        whereClauses.Add("UserId is null");
-                    }
+                    whereClauses.Add("UserId is null");
                 }
+            }
 
-                var whereTextWithoutPaging = whereClauses.Count == 0 ?
-                  string.Empty :
-                  " where " + string.Join(" AND ", whereClauses.ToArray());
-
-                if (startIndex.HasValue && startIndex.Value > 0)
-                {
-                    var pagingWhereText = whereClauses.Count == 0 ?
-                        string.Empty :
-                        " where " + string.Join(" AND ", whereClauses.ToArray());
-
-                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM ActivityLog {0} ORDER BY DateCreated DESC LIMIT {1})",
-                        pagingWhereText,
-                        startIndex.Value.ToString(_usCulture)));
-                }
+            var whereTextWithoutPaging = whereClauses.Count == 0 ?
+              string.Empty :
+              " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                var whereText = whereClauses.Count == 0 ?
+            if (startIndex.HasValue && startIndex.Value > 0)
+            {
+                var pagingWhereText = whereClauses.Count == 0 ?
                     string.Empty :
                     " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                commandText += whereText;
+                whereClauses.Add(
+                    string.Format(
+                        CultureInfo.InvariantCulture,
+                        "Id NOT IN (SELECT Id FROM ActivityLog {0} ORDER BY DateCreated DESC LIMIT {1})",
+                        pagingWhereText,
+                        startIndex.Value));
+            }
 
-                commandText += " ORDER BY DateCreated DESC";
+            var whereText = whereClauses.Count == 0 ?
+                string.Empty :
+                " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                if (limit.HasValue)
-                {
-                    commandText += " LIMIT " + limit.Value.ToString(_usCulture);
-                }
+            commandText += whereText;
 
-                var statementTexts = new List<string>();
-                statementTexts.Add(commandText);
-                statementTexts.Add("select count (Id) from ActivityLog" + whereTextWithoutPaging);
+            commandText += " ORDER BY DateCreated DESC";
 
-                return connection.RunInTransaction(db =>
-                {
-                    var list = new List<ActivityLogEntry>();
-                    var result = new QueryResult<ActivityLogEntry>();
+            if (limit.HasValue)
+            {
+                commandText += " LIMIT " + limit.Value.ToString(_usCulture);
+            }
+
+            var statementTexts = new[]
+            {
+                commandText,
+                "select count (Id) from ActivityLog" + whereTextWithoutPaging
+            };
 
-                    var statements = PrepareAll(db, statementTexts).ToList();
+            var list = new List<ActivityLogEntry>();
+            var result = new QueryResult<ActivityLogEntry>();
 
-                    using (var statement = statements[0])
+            using (var connection = GetConnection(true))
+            {
+                connection.RunInTransaction(
+                    db =>
                     {
-                        if (minDate.HasValue)
-                        {
-                            statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
-                        }
+                        var statements = PrepareAll(db, statementTexts).ToList();
 
-                        foreach (var row in statement.ExecuteQuery())
+                        using (var statement = statements[0])
                         {
-                            list.Add(GetEntry(row));
+                            if (minDate.HasValue)
+                            {
+                                statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
+                            }
+
+                            foreach (var row in statement.ExecuteQuery())
+                            {
+                                list.Add(GetEntry(row));
+                            }
                         }
-                    }
 
-                    using (var statement = statements[1])
-                    {
-                        if (minDate.HasValue)
+                        using (var statement = statements[1])
                         {
-                            statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
-                        }
+                            if (minDate.HasValue)
+                            {
+                                statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
+                            }
 
-                        result.TotalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
-                    }
-
-                    result.Items = list.ToArray();
-                    return result;
-
-                }, ReadTransactionMode);
+                            result.TotalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
+                        }
+                    },
+                    ReadTransactionMode);
             }
+
+            result.Items = list.ToArray();
+            return result;
         }
 
         private static ActivityLogEntry GetEntry(IReadOnlyList<IResultSetValue> reader)