sync updates

10 files changed, 134 insertions, 64 deletions

diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
index e38aef8105..bfdbb8ccf2 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
@@ -13,8 +13,10 @@ using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Querying;
+using MoreLinq;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -64,7 +66,10 @@ namespace MediaBrowser.Server.Implementations.Channels
         {
             CleanChannelContent(cancellationToken);
 
-            var users = _userManager.Users.Select(i => i.Id.ToString("N")).ToList();
+            var users = _userManager.Users
+                .DistinctBy(GetUserDistinctValue)
+                .Select(i => i.Id.ToString("N"))
+                .ToList();
 
             var numComplete = 0;
 
@@ -88,6 +93,15 @@ namespace MediaBrowser.Server.Implementations.Channels
             progress.Report(100);
         }
 
+        public static string GetUserDistinctValue(User user)
+        {
+            var channels = user.Configuration.BlockedChannels
+                .OrderBy(i => i)
+                .ToList();
+
+            return string.Join("|", channels.ToArray());
+        }
+
         private async Task DownloadContent(string user,
             CancellationToken cancellationToken,
             IProgress<double> progress)
@@ -201,7 +215,7 @@ namespace MediaBrowser.Server.Implementations.Channels
                 if (IsSizeLimitReached(path, limit.Value))
                 {
                     return;
-                }    
+                }
             }
 
             var itemId = item.Id.ToString("N");
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index 382d0077a7..9e7679f934 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -533,10 +533,13 @@ namespace MediaBrowser.Server.Implementations.Channels
                 ? null
                 : _userManager.GetUserById(query.UserId);
 
+            var limit = query.Limit;
+
             // See below about parental control
             if (user != null)
             {
                 query.StartIndex = null;
+                query.Limit = null;
             }
 
             var internalResult = await GetLatestChannelItemsInternal(query, cancellationToken).ConfigureAwait(false);
@@ -554,7 +557,7 @@ namespace MediaBrowser.Server.Implementations.Channels
             if (user != null)
             {
                 items = items.Where(i => i.IsVisible(user))
-                    .Take(10)
+                    .Take(limit ?? 10)
                     .ToArray();
 
                 totalRecordCount = items.Length;
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
index f677661f7a..72c524ec56 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Logging;
+using MoreLinq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27,6 +28,7 @@ namespace MediaBrowser.Server.Implementations.Channels
         public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
         {
             var users = _userManager.Users
+                .DistinctBy(ChannelDownloadScheduledTask.GetUserDistinctValue)
                 .Select(i => i.Id.ToString("N"))
                 .ToList();
 
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index ed45e890bf..791cae5531 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Events;
+using System.Collections.Concurrent;
+using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
@@ -317,7 +318,8 @@ namespace MediaBrowser.Server.Implementations.Library
                 ConnectLinkType = user.ConnectLinkType,
                 ConnectUserId = user.ConnectUserId,
                 ConnectUserName = user.ConnectUserName,
-                ServerId = _appHost.SystemId
+                ServerId = _appHost.SystemId,
+                Policy = user.Policy
             };
 
             var image = user.GetImageInfo(ImageType.Primary, 0);
@@ -529,6 +531,8 @@ namespace MediaBrowser.Server.Implementations.Library
                     _logger.ErrorException("Error deleting file {0}", ex, path);
                 }
 
+                DeleteUserPolicy(user);
+
                 // Force this to be lazy loaded again
                 Users = await LoadUsers().ConfigureAwait(false);
 
@@ -715,7 +719,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
             var usersReset = new List<string>();
 
-            var valid = !string.IsNullOrWhiteSpace(_lastPin) && 
+            var valid = !string.IsNullOrWhiteSpace(_lastPin) &&
                 string.Equals(_lastPin, pin, StringComparison.OrdinalIgnoreCase) &&
                 _lastPasswordPinCreationResult != null &&
                 _lastPasswordPinCreationResult.ExpirationDate > DateTime.UtcNow;
@@ -769,14 +773,65 @@ namespace MediaBrowser.Server.Implementations.Library
             public DateTime ExpirationDate { get; set; }
         }
 
-        public UserPolicy GetUserPolicy(string userId)
+        public UserPolicy GetUserPolicy(User user)
+        {
+            var path = GetPolifyFilePath(user);
+
+            try
+            {
+                lock (_policySyncLock)
+                {
+                    return (UserPolicy)_xmlSerializer.DeserializeFromFile(typeof(UserPolicy), path);
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error reading policy file: {0}", ex, path);
+
+                return new UserPolicy
+                {
+                    EnableSync = !user.ConnectLinkType.HasValue || user.ConnectLinkType.Value != UserLinkType.Guest
+                };
+            }
+        }
+
+        private readonly object _policySyncLock = new object();
+        public async Task UpdateUserPolicy(string userId, UserPolicy userPolicy)
+        {
+            var user = GetUserById(userId);
+            var path = GetPolifyFilePath(user);
+
+            lock (_policySyncLock)
+            {
+                _xmlSerializer.SerializeToFile(userPolicy, path);
+                user.Policy = userPolicy;
+            }
+        }
+
+        private void DeleteUserPolicy(User user)
         {
-            throw new NotImplementedException();
+            var path = GetPolifyFilePath(user);
+
+            try
+            {
+                lock (_policySyncLock)
+                {
+                    File.Delete(path);
+                }
+            }
+            catch (IOException)
+            {
+
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error deleting policy file", ex);
+            }
         }
 
-        public Task UpdateUserPolicy(string userId, UserPolicy userPolicy)
+        private string GetPolifyFilePath(User user)
         {
-            throw new NotImplementedException();
+            return Path.Combine(user.ConfigurationDirectoryPath, "policy.xml");
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/UserViewPostScanTask.cs b/MediaBrowser.Server.Implementations/Library/Validators/UserViewPostScanTask.cs
deleted file mode 100644
index 30ebcc3b82..0000000000
--- a/MediaBrowser.Server.Implementations/Library/Validators/UserViewPostScanTask.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Library;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Server.Implementations.Library.Validators
-{
-    public class UserViewPostScanTask : ILibraryPostScanTask
-    {
-        private readonly IUserManager _userManager;
-        private readonly IUserViewManager _userViewManager;
-
-        public UserViewPostScanTask(IUserManager userManager, IUserViewManager userViewManager)
-        {
-            _userManager = userManager;
-            _userViewManager = userViewManager;
-        }
-
-        public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
-        {
-            foreach (var user in _userManager.Users)
-            {
-                foreach (var view in await _userViewManager.GetUserViews(new UserViewQuery
-                {
-                    UserId = user.Id.ToString("N")
-
-                }, cancellationToken).ConfigureAwait(false))
-                {
-                    await view.RefreshMetadata(cancellationToken).ConfigureAwait(false);
-                }
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 6bb24be2b3..09cd286b43 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -232,10 +232,10 @@
     "HeaderFeatureAccess": "Feature Access",
     "OptionAllowMediaPlayback": "Allow media playback",
     "OptionAllowBrowsingLiveTv": "Allow browsing of live tv",
-    "OptionAllowDeleteLibraryContent": "Allow this user to delete library content",
+    "OptionAllowDeleteLibraryContent": "Allow deletion of library content",
     "OptionAllowManageLiveTv": "Allow management of live tv recordings",
-    "OptionAllowRemoteControlOthers": "Allow this user to remote control other users",
-    "OptionAllowRemoteSharedDevices": "Allow this user to remote control shared devices",
+    "OptionAllowRemoteControlOthers": "Allow remote control of other users",
+    "OptionAllowRemoteSharedDevices": "Allow remote control of shared devices",
     "OptionAllowRemoteSharedDevicesHelp": "Dlna devices are considered shared until a user begins controlling it.",
     "HeaderRemoteControl": "Remote Control",
     "OptionMissingTmdbId": "Missing Tmdb Id",
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 84d62df3ae..7d0a751e14 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -215,7 +215,6 @@
     <Compile Include="Library\Validators\PeopleValidator.cs" />
     <Compile Include="Library\Validators\StudiosPostScanTask.cs" />
     <Compile Include="Library\Validators\StudiosValidator.cs" />
-    <Compile Include="Library\Validators\UserViewPostScanTask.cs" />
     <Compile Include="Library\Validators\YearsPostScanTask.cs" />
     <Compile Include="LiveTv\ChannelImageProvider.cs" />
     <Compile Include="LiveTv\CleanDatabaseScheduledTask.cs" />
diff --git a/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
index d2ace23a9a..4a64d37532 100644
--- a/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
+++ b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
@@ -25,6 +25,7 @@ namespace MediaBrowser.Server.Implementations.Session
         private readonly string _postUrl;
 
         private Timer _pingTimer;
+        private DateTime _lastPingTime;
 
         public HttpSessionController(IHttpClient httpClient,
             IJsonSerializer json,
@@ -68,10 +69,23 @@ namespace MediaBrowser.Server.Implementations.Session
             try
             {
                 await SendMessage("Ping", CancellationToken.None).ConfigureAwait(false);
+
+                _lastPingTime = DateTime.UtcNow;
             }
             catch
             {
-                ReportSessionEnded();
+                var lastActivityDate = new[] { _lastPingTime, Session.LastActivityDate }
+                    .Max();
+
+                var timeSinceLastPing = DateTime.UtcNow - lastActivityDate;
+
+                // We don't want to stop the session due to one single request failure
+                // At the same time, we don't want the timeout to be too long because it will
+                // be sitting in active sessions available for remote control, when it's not
+                if (timeSinceLastPing >= TimeSpan.FromMinutes(5))
+                {
+                    ReportSessionEnded();
+                }
             }
         }
 
@@ -90,6 +104,8 @@ namespace MediaBrowser.Server.Implementations.Session
         {
             if (_pingTimer != null)
             {
+                _lastPingTime = DateTime.UtcNow;
+
                 var period = TimeSpan.FromSeconds(60);
 
                 _pingTimer.Change(period, period);
@@ -101,8 +117,8 @@ namespace MediaBrowser.Server.Implementations.Session
             return SendMessage(name, new Dictionary<string, string>(), cancellationToken);
         }
 
-        private async Task SendMessage(string name, 
-            Dictionary<string, string> args, 
+        private async Task SendMessage(string name,
+            Dictionary<string, string> args,
             CancellationToken cancellationToken)
         {
             var url = PostUrl + "/" + name + ToQueryString(args);
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index f72b1541a7..c2f004f0b3 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -47,7 +47,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             var processor = new SyncJobProcessor(_libraryManager, _repo, this, _logger, _userManager);
 
             var user = _userManager.GetUserById(request.UserId);
-            
+
             var items = processor
                 .GetItemsForSync(request.ItemIds, user)
                 .ToList();
@@ -85,7 +85,9 @@ namespace MediaBrowser.Server.Implementations.Sync
                 DateLastModified = DateTime.UtcNow,
                 SyncNewContent = request.SyncNewContent,
                 ItemCount = items.Count,
-                Quality = request.Quality
+                Quality = request.Quality,
+                Category = request.Category,
+                ParentId = request.ParentId
             };
 
             // It's just a static list
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
index 3e54111b0f..a9e319cc46 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
@@ -35,13 +35,13 @@ namespace MediaBrowser.Server.Implementations.Sync
 
         public async Task Initialize()
         {
-            var dbFile = Path.Combine(_appPaths.DataPath, "sync5.db");
+            var dbFile = Path.Combine(_appPaths.DataPath, "sync6.db");
 
             _connection = await SqliteExtensions.ConnectToDb(dbFile, _logger).ConfigureAwait(false);
 
             string[] queries = {
 
-                                "create table if not exists SyncJobs (Id GUID PRIMARY KEY, TargetId TEXT NOT NULL, Name TEXT NOT NULL, Quality TEXT NOT NULL, Status TEXT NOT NULL, Progress FLOAT, UserId TEXT NOT NULL, ItemIds TEXT NOT NULL, UnwatchedOnly BIT, ItemLimit INT, SyncNewContent BIT, DateCreated DateTime, DateLastModified DateTime, ItemCount int)",
+                                "create table if not exists SyncJobs (Id GUID PRIMARY KEY, TargetId TEXT NOT NULL, Name TEXT NOT NULL, Quality TEXT NOT NULL, Status TEXT NOT NULL, Progress FLOAT, UserId TEXT NOT NULL, ItemIds TEXT NOT NULL, Category TEXT, ParentId TEXT, UnwatchedOnly BIT, ItemLimit INT, SyncNewContent BIT, DateCreated DateTime, DateLastModified DateTime, ItemCount int)",
                                 "create index if not exists idx_SyncJobs on SyncJobs(Id)",
 
                                 "create table if not exists SyncJobItems (Id GUID PRIMARY KEY, ItemId TEXT, JobId TEXT, OutputPath TEXT, Status TEXT, TargetId TEXT, DateCreated DateTime, Progress FLOAT)",
@@ -65,7 +65,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             _deleteJobCommand.Parameters.Add(_deleteJobCommand, "@Id");
 
             _saveJobCommand = _connection.CreateCommand();
-            _saveJobCommand.CommandText = "replace into SyncJobs (Id, TargetId, Name, Quality, Status, Progress, UserId, ItemIds, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount) values (@Id, @TargetId, @Name, @Quality, @Status, @Progress, @UserId, @ItemIds, @UnwatchedOnly, @ItemLimit, @SyncNewContent, @DateCreated, @DateLastModified, @ItemCount)";
+            _saveJobCommand.CommandText = "replace into SyncJobs (Id, TargetId, Name, Quality, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount) values (@Id, @TargetId, @Name, @Quality, @Status, @Progress, @UserId, @ItemIds, @Category, @ParentId, @UnwatchedOnly, @ItemLimit, @SyncNewContent, @DateCreated, @DateLastModified, @ItemCount)";
 
             _saveJobCommand.Parameters.Add(_saveJobCommand, "@Id");
             _saveJobCommand.Parameters.Add(_saveJobCommand, "@TargetId");
@@ -75,6 +75,8 @@ namespace MediaBrowser.Server.Implementations.Sync
             _saveJobCommand.Parameters.Add(_saveJobCommand, "@Progress");
             _saveJobCommand.Parameters.Add(_saveJobCommand, "@UserId");
             _saveJobCommand.Parameters.Add(_saveJobCommand, "@ItemIds");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@Category");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@ParentId");
             _saveJobCommand.Parameters.Add(_saveJobCommand, "@UnwatchedOnly");
             _saveJobCommand.Parameters.Add(_saveJobCommand, "@ItemLimit");
             _saveJobCommand.Parameters.Add(_saveJobCommand, "@SyncNewContent");
@@ -95,7 +97,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             _saveJobItemCommand.Parameters.Add(_saveJobCommand, "@Progress");
         }
 
-        private const string BaseJobSelectText = "select Id, TargetId, Name, Quality, Status, Progress, UserId, ItemIds, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount from SyncJobs";
+        private const string BaseJobSelectText = "select Id, TargetId, Name, Quality, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount from SyncJobs";
         private const string BaseJobItemSelectText = "select Id, ItemId, JobId, OutputPath, Status, TargetId, DateCreated, Progress from SyncJobItems";
 
         public SyncJob GetJob(string id)
@@ -166,19 +168,29 @@ namespace MediaBrowser.Server.Implementations.Sync
 
             if (!reader.IsDBNull(8))
             {
-                info.UnwatchedOnly = reader.GetBoolean(8);
+                info.Category = (SyncCategory)Enum.Parse(typeof(SyncCategory), reader.GetString(8), true);
             }
 
             if (!reader.IsDBNull(9))
             {
-                info.ItemLimit = reader.GetInt32(9);
+                info.ParentId = reader.GetString(9);
             }
 
-            info.SyncNewContent = reader.GetBoolean(10);
+            if (!reader.IsDBNull(10))
+            {
+                info.UnwatchedOnly = reader.GetBoolean(10);
+            }
+
+            if (!reader.IsDBNull(11))
+            {
+                info.ItemLimit = reader.GetInt32(11);
+            }
+
+            info.SyncNewContent = reader.GetBoolean(12);
 
-            info.DateCreated = reader.GetDateTime(11).ToUniversalTime();
-            info.DateLastModified = reader.GetDateTime(12).ToUniversalTime();
-            info.ItemCount = reader.GetInt32(13);
+            info.DateCreated = reader.GetDateTime(13).ToUniversalTime();
+            info.DateLastModified = reader.GetDateTime(14).ToUniversalTime();
+            info.ItemCount = reader.GetInt32(15);
 
             return info;
         }
@@ -213,6 +225,8 @@ namespace MediaBrowser.Server.Implementations.Sync
                 _saveJobCommand.GetParameter(index++).Value = job.Progress;
                 _saveJobCommand.GetParameter(index++).Value = job.UserId;
                 _saveJobCommand.GetParameter(index++).Value = string.Join(",", job.RequestedItemIds.ToArray());
+                _saveJobCommand.GetParameter(index++).Value = job.Category;
+                _saveJobCommand.GetParameter(index++).Value = job.ParentId;
                 _saveJobCommand.GetParameter(index++).Value = job.UnwatchedOnly;
                 _saveJobCommand.GetParameter(index++).Value = job.ItemLimit;
                 _saveJobCommand.GetParameter(index++).Value = job.SyncNewContent;