From 99c991f001d99d441c3b3188a3bf5affb2e4c14b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 14 Mar 2015 21:42:09 -0400 Subject: [PATCH] save appVersion with device record --- MediaBrowser.Api/Sync/SyncService.cs | 4 ++ .../Devices/IDeviceManager.cs | 3 +- .../Security/AuthenticationInfo.cs | 6 ++ .../Session/ISessionManager.cs | 4 +- MediaBrowser.Controller/Sync/ISyncManager.cs | 7 +++ MediaBrowser.Model/Devices/DeviceInfo.cs | 5 ++ MediaBrowser.Model/LiveTv/LiveTvOptions.cs | 5 ++ MediaBrowser.Model/Sync/SyncDialogOptions.cs | 8 ++- MediaBrowser.Model/Sync/SyncJob.cs | 5 ++ .../Devices/DeviceManager.cs | 3 +- .../Persistence/SqliteExtensions.cs | 34 ++++++++++- .../Security/AuthenticationRepository.cs | 31 ++++++---- .../Session/SessionManager.cs | 35 ++++++----- .../Sync/AppSyncProvider.cs | 15 +++-- .../Sync/IHasSyncQuality.cs | 10 +++- .../Sync/SyncManager.cs | 59 +++++++++++++++---- .../Sync/SyncRepository.cs | 47 +++++++++------ 17 files changed, 213 insertions(+), 68 deletions(-) diff --git a/MediaBrowser.Api/Sync/SyncService.cs b/MediaBrowser.Api/Sync/SyncService.cs index 7c81f24c40..bcadb4c081 100644 --- a/MediaBrowser.Api/Sync/SyncService.cs +++ b/MediaBrowser.Api/Sync/SyncService.cs @@ -238,6 +238,10 @@ namespace MediaBrowser.Api.Sync result.QualityOptions = _syncManager .GetQualityOptions(request.TargetId) .ToList(); + + result.ProfileOptions = _syncManager + .GetProfileOptions(request.TargetId) + .ToList(); } if (request.Category.HasValue) diff --git a/MediaBrowser.Controller/Devices/IDeviceManager.cs b/MediaBrowser.Controller/Devices/IDeviceManager.cs index 78eebd9942..2846bcfc64 100644 --- a/MediaBrowser.Controller/Devices/IDeviceManager.cs +++ b/MediaBrowser.Controller/Devices/IDeviceManager.cs @@ -25,9 +25,10 @@ namespace MediaBrowser.Controller.Devices /// The reported identifier. /// The name. /// Name of the application. + /// The application version. /// The used by user identifier. /// Task. - Task RegisterDevice(string reportedId, string name, string appName, string usedByUserId); + Task RegisterDevice(string reportedId, string name, string appName, string appVersion, string usedByUserId); /// /// Saves the capabilities. diff --git a/MediaBrowser.Controller/Security/AuthenticationInfo.cs b/MediaBrowser.Controller/Security/AuthenticationInfo.cs index dd5eec1f92..c2d4a39d1b 100644 --- a/MediaBrowser.Controller/Security/AuthenticationInfo.cs +++ b/MediaBrowser.Controller/Security/AuthenticationInfo.cs @@ -28,6 +28,12 @@ namespace MediaBrowser.Controller.Security /// The name of the application. public string AppName { get; set; } + /// + /// Gets or sets the application version. + /// + /// The application version. + public string AppVersion { get; set; } + /// /// Gets or sets the name of the device. /// diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs index bddc035e08..80025171dc 100644 --- a/MediaBrowser.Controller/Session/ISessionManager.cs +++ b/MediaBrowser.Controller/Session/ISessionManager.cs @@ -74,7 +74,7 @@ namespace MediaBrowser.Controller.Session /// /// Logs the user activity. /// - /// Type of the client. + /// Type of the client. /// The app version. /// The device id. /// Name of the device. @@ -82,7 +82,7 @@ namespace MediaBrowser.Controller.Session /// The user. /// Task. /// user - Task LogSessionActivity(string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint, User user); + Task LogSessionActivity(string appName, string appVersion, string deviceId, string deviceName, string remoteEndPoint, User user); /// /// Used to report that playback has started for an item diff --git a/MediaBrowser.Controller/Sync/ISyncManager.cs b/MediaBrowser.Controller/Sync/ISyncManager.cs index dea0ff9727..69548ea3bb 100644 --- a/MediaBrowser.Controller/Sync/ISyncManager.cs +++ b/MediaBrowser.Controller/Sync/ISyncManager.cs @@ -166,5 +166,12 @@ namespace MediaBrowser.Controller.Sync /// The target identifier. /// IEnumerable<SyncQualityOption>. IEnumerable GetQualityOptions(string targetId); + + /// + /// Gets the profile options. + /// + /// The target identifier. + /// IEnumerable<SyncQualityOption>. + IEnumerable GetProfileOptions(string targetId); } } diff --git a/MediaBrowser.Model/Devices/DeviceInfo.cs b/MediaBrowser.Model/Devices/DeviceInfo.cs index e5efe9f605..726e9d6e52 100644 --- a/MediaBrowser.Model/Devices/DeviceInfo.cs +++ b/MediaBrowser.Model/Devices/DeviceInfo.cs @@ -46,6 +46,11 @@ namespace MediaBrowser.Model.Devices /// The name of the application. public string AppName { get; set; } /// + /// Gets or sets the application version. + /// + /// The application version. + public string AppVersion { get; set; } + /// /// Gets or sets the last user identifier. /// /// The last user identifier. diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs index 0cd5eda0c1..c6f6ed84ce 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs @@ -4,5 +4,10 @@ { public int? GuideDays { get; set; } public bool EnableMovieProviders { get; set; } + + public LiveTvOptions() + { + EnableMovieProviders = true; + } } } \ No newline at end of file diff --git a/MediaBrowser.Model/Sync/SyncDialogOptions.cs b/MediaBrowser.Model/Sync/SyncDialogOptions.cs index 080f7f2a86..2b8672d76e 100644 --- a/MediaBrowser.Model/Sync/SyncDialogOptions.cs +++ b/MediaBrowser.Model/Sync/SyncDialogOptions.cs @@ -19,12 +19,18 @@ namespace MediaBrowser.Model.Sync /// /// The quality options. public List QualityOptions { get; set; } - + /// + /// Gets or sets the profile options. + /// + /// The profile options. + public List ProfileOptions { get; set; } + public SyncDialogOptions() { Targets = new List(); Options = new List(); QualityOptions = new List(); + ProfileOptions = new List(); } } } diff --git a/MediaBrowser.Model/Sync/SyncJob.cs b/MediaBrowser.Model/Sync/SyncJob.cs index 6610ad610d..1282c01db5 100644 --- a/MediaBrowser.Model/Sync/SyncJob.cs +++ b/MediaBrowser.Model/Sync/SyncJob.cs @@ -26,6 +26,11 @@ namespace MediaBrowser.Model.Sync /// The quality. public string Quality { get; set; } /// + /// Gets or sets the profile. + /// + /// The profile. + public string Profile { get; set; } + /// /// Gets or sets the category. /// /// The category. diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs index 84dd8a97c0..b65b7d11b3 100644 --- a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs +++ b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs @@ -44,7 +44,7 @@ namespace MediaBrowser.Server.Implementations.Devices _logger = logger; } - public async Task RegisterDevice(string reportedId, string name, string appName, string usedByUserId) + public async Task RegisterDevice(string reportedId, string name, string appName, string appVersion, string usedByUserId) { var device = GetDevice(reportedId) ?? new DeviceInfo { @@ -53,6 +53,7 @@ namespace MediaBrowser.Server.Implementations.Devices device.ReportedName = name; device.AppName = appName; + device.AppVersion = appVersion; if (!string.IsNullOrWhiteSpace(usedByUserId)) { diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs index d67c1894d8..f8cb6c9f4a 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Model.Logging; +using System.Text; +using MediaBrowser.Model.Logging; using MediaBrowser.Model.Serialization; using System; using System.Data; @@ -173,5 +174,36 @@ namespace MediaBrowser.Server.Implementations.Persistence return stream.ToArray(); } } + + public static void AddColumn(this IDbConnection connection, ILogger logger, string table, string columnName, string type) + { + using (var cmd = connection.CreateCommand()) + { + cmd.CommandText = "PRAGMA table_info(" + table + ")"; + + using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) + { + while (reader.Read()) + { + if (!reader.IsDBNull(1)) + { + var name = reader.GetString(1); + + if (string.Equals(name, columnName, StringComparison.OrdinalIgnoreCase)) + { + return; + } + } + } + } + } + + var builder = new StringBuilder(); + + builder.AppendLine("alter table " + table); + builder.AppendLine("add column " + columnName + " " + type); + + connection.RunQueries(new[] { builder.ToString() }, logger); + } } } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs b/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs index cd20ad74dd..df7cc47f4d 100644 --- a/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs +++ b/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs @@ -37,7 +37,7 @@ namespace MediaBrowser.Server.Implementations.Security string[] queries = { - "create table if not exists AccessTokens (Id GUID PRIMARY KEY, AccessToken TEXT NOT NULL, DeviceId TEXT, AppName TEXT, DeviceName TEXT, UserId TEXT, IsActive BIT, DateCreated DATETIME NOT NULL, DateRevoked DATETIME)", + "create table if not exists AccessTokens (Id GUID PRIMARY KEY, AccessToken TEXT NOT NULL, DeviceId TEXT, AppName TEXT, AppVersion TEXT, DeviceName TEXT, UserId TEXT, IsActive BIT, DateCreated DATETIME NOT NULL, DateRevoked DATETIME)", "create index if not exists idx_AccessTokens on AccessTokens(Id)", //pragmas @@ -48,18 +48,21 @@ namespace MediaBrowser.Server.Implementations.Security _connection.RunQueries(queries, _logger); + _connection.AddColumn(_logger, "AccessTokens", "AppVersion", "TEXT"); + PrepareStatements(); } private void PrepareStatements() { _saveInfoCommand = _connection.CreateCommand(); - _saveInfoCommand.CommandText = "replace into AccessTokens (Id, AccessToken, DeviceId, AppName, DeviceName, UserId, IsActive, DateCreated, DateRevoked) values (@Id, @AccessToken, @DeviceId, @AppName, @DeviceName, @UserId, @IsActive, @DateCreated, @DateRevoked)"; + _saveInfoCommand.CommandText = "replace into AccessTokens (Id, AccessToken, DeviceId, AppName, AppVersion, DeviceName, UserId, IsActive, DateCreated, DateRevoked) values (@Id, @AccessToken, @DeviceId, @AppName, @AppVersion, @DeviceName, @UserId, @IsActive, @DateCreated, @DateRevoked)"; _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@Id"); _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@AccessToken"); _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@DeviceId"); _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@AppName"); + _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@AppVersion"); _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@DeviceName"); _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@UserId"); _saveInfoCommand.Parameters.Add(_saveInfoCommand, "@IsActive"); @@ -97,6 +100,7 @@ namespace MediaBrowser.Server.Implementations.Security _saveInfoCommand.GetParameter(index++).Value = info.AccessToken; _saveInfoCommand.GetParameter(index++).Value = info.DeviceId; _saveInfoCommand.GetParameter(index++).Value = info.AppName; + _saveInfoCommand.GetParameter(index++).Value = info.AppVersion; _saveInfoCommand.GetParameter(index++).Value = info.DeviceName; _saveInfoCommand.GetParameter(index++).Value = info.UserId; _saveInfoCommand.GetParameter(index++).Value = info.IsActive; @@ -140,7 +144,7 @@ namespace MediaBrowser.Server.Implementations.Security } } - private const string BaseSelectText = "select Id, AccessToken, DeviceId, AppName, DeviceName, UserId, IsActive, DateCreated, DateRevoked from AccessTokens"; + private const string BaseSelectText = "select Id, AccessToken, DeviceId, AppName, AppVersion, DeviceName, UserId, IsActive, DateCreated, DateRevoked from AccessTokens"; public QueryResult Get(AuthenticationInfoQuery query) { @@ -264,8 +268,6 @@ namespace MediaBrowser.Server.Implementations.Security private AuthenticationInfo Get(IDataReader reader) { - var s = "select Id, AccessToken, DeviceId, AppName, DeviceName, UserId, IsActive, DateCreated, DateRevoked from AccessTokens"; - var info = new AuthenticationInfo { Id = reader.GetGuid(0).ToString("N"), @@ -284,20 +286,25 @@ namespace MediaBrowser.Server.Implementations.Security if (!reader.IsDBNull(4)) { - info.DeviceName = reader.GetString(4); + info.AppVersion = reader.GetString(4); } - + if (!reader.IsDBNull(5)) { - info.UserId = reader.GetString(5); + info.DeviceName = reader.GetString(5); + } + + if (!reader.IsDBNull(6)) + { + info.UserId = reader.GetString(6); } - info.IsActive = reader.GetBoolean(6); - info.DateCreated = reader.GetDateTime(7).ToUniversalTime(); + info.IsActive = reader.GetBoolean(7); + info.DateCreated = reader.GetDateTime(8).ToUniversalTime(); - if (!reader.IsDBNull(8)) + if (!reader.IsDBNull(9)) { - info.DateRevoked = reader.GetDateTime(8).ToUniversalTime(); + info.DateRevoked = reader.GetDateTime(9).ToUniversalTime(); } return info; diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs index 7c6ab2af64..76e97ff485 100644 --- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs +++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs @@ -202,7 +202,7 @@ namespace MediaBrowser.Server.Implementations.Session /// /// Logs the user activity. /// - /// Type of the client. + /// Type of the client. /// The app version. /// The device id. /// Name of the device. @@ -211,16 +211,16 @@ namespace MediaBrowser.Server.Implementations.Session /// Task. /// user /// - public async Task LogSessionActivity(string clientType, + public async Task LogSessionActivity(string appName, string appVersion, string deviceId, string deviceName, string remoteEndPoint, User user) { - if (string.IsNullOrEmpty(clientType)) + if (string.IsNullOrEmpty(appName)) { - throw new ArgumentNullException("clientType"); + throw new ArgumentNullException("appName"); } if (string.IsNullOrEmpty(appVersion)) { @@ -237,7 +237,7 @@ namespace MediaBrowser.Server.Implementations.Session var activityDate = DateTime.UtcNow; - var session = await GetSessionInfo(clientType, appVersion, deviceId, deviceName, remoteEndPoint, user).ConfigureAwait(false); + var session = await GetSessionInfo(appName, appVersion, deviceId, deviceName, remoteEndPoint, user).ConfigureAwait(false); session.LastActivityDate = activityDate; @@ -362,24 +362,24 @@ namespace MediaBrowser.Server.Implementations.Session } } - private string GetSessionKey(string clientType, string deviceId) + private string GetSessionKey(string appName, string deviceId) { - return clientType + deviceId; + return appName + deviceId; } /// /// Gets the connection. /// - /// Type of the client. + /// Type of the client. /// The app version. /// The device id. /// Name of the device. /// The remote end point. /// The user. /// SessionInfo. - private async Task GetSessionInfo(string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint, User user) + private async Task GetSessionInfo(string appName, string appVersion, string deviceId, string deviceName, string remoteEndPoint, User user) { - var key = GetSessionKey(clientType, deviceId); + var key = GetSessionKey(appName, deviceId); await _sessionLock.WaitAsync(CancellationToken.None).ConfigureAwait(false); @@ -395,7 +395,7 @@ namespace MediaBrowser.Server.Implementations.Session { sessionInfo = new SessionInfo { - Client = clientType, + Client = appName, DeviceId = deviceId, ApplicationVersion = appVersion, Id = key.GetMD5().ToString("N") @@ -413,7 +413,7 @@ namespace MediaBrowser.Server.Implementations.Session if (!string.IsNullOrEmpty(deviceId)) { var userIdString = userId.HasValue ? userId.Value.ToString("N") : null; - device = await _deviceManager.RegisterDevice(deviceId, deviceName, clientType, userIdString).ConfigureAwait(false); + device = await _deviceManager.RegisterDevice(deviceId, deviceName, appName, appVersion, userIdString).ConfigureAwait(false); } } @@ -1651,10 +1651,11 @@ namespace MediaBrowser.Server.Implementations.Session : _userManager.GetUserById(info.UserId); appVersion = string.IsNullOrWhiteSpace(appVersion) - ? "1" + ? info.AppVersion : appVersion; var deviceName = info.DeviceName; + var appName = info.AppName; if (!string.IsNullOrWhiteSpace(deviceId)) { @@ -1663,6 +1664,12 @@ namespace MediaBrowser.Server.Implementations.Session if (device != null) { deviceName = device.Name; + appName = device.AppName; + + if (!string.IsNullOrWhiteSpace(device.AppVersion)) + { + appVersion = device.AppVersion; + } } } else @@ -1670,7 +1677,7 @@ namespace MediaBrowser.Server.Implementations.Session deviceId = info.DeviceId; } - return GetSessionInfo(info.AppName, appVersion, deviceId, deviceName, remoteEndpoint, user); + return GetSessionInfo(appName, appVersion, deviceId, deviceName, remoteEndpoint, user); } public Task GetSessionByAuthenticationToken(string token, string deviceId, string remoteEndpoint) diff --git a/MediaBrowser.Server.Implementations/Sync/AppSyncProvider.cs b/MediaBrowser.Server.Implementations/Sync/AppSyncProvider.cs index c86549cb3d..e4361ed1a5 100644 --- a/MediaBrowser.Server.Implementations/Sync/AppSyncProvider.cs +++ b/MediaBrowser.Server.Implementations/Sync/AppSyncProvider.cs @@ -32,12 +32,12 @@ namespace MediaBrowser.Server.Implementations.Sync }); } - public DeviceProfile GetDeviceProfile(SyncTarget target, string quality) + public DeviceProfile GetDeviceProfile(SyncTarget target, string profile, string quality) { var caps = _deviceManager.GetCapabilities(target.Id); - var profile = caps == null || caps.DeviceProfile == null ? new DeviceProfile() : caps.DeviceProfile; - var maxBitrate = profile.MaxStaticBitrate; + var deviceProfile = caps == null || caps.DeviceProfile == null ? new DeviceProfile() : caps.DeviceProfile; + var maxBitrate = deviceProfile.MaxStaticBitrate; if (maxBitrate.HasValue) { @@ -50,10 +50,10 @@ namespace MediaBrowser.Server.Implementations.Sync maxBitrate = Convert.ToInt32(maxBitrate.Value * .5); } - profile.MaxStaticBitrate = maxBitrate; + deviceProfile.MaxStaticBitrate = maxBitrate; } - return profile; + return deviceProfile; } public string Name @@ -101,5 +101,10 @@ namespace MediaBrowser.Server.Implementations.Sync } }; } + + public IEnumerable GetProfileOptions(SyncTarget target) + { + return new List(); + } } } diff --git a/MediaBrowser.Server.Implementations/Sync/IHasSyncQuality.cs b/MediaBrowser.Server.Implementations/Sync/IHasSyncQuality.cs index fa73a1cac3..cefce4d179 100644 --- a/MediaBrowser.Server.Implementations/Sync/IHasSyncQuality.cs +++ b/MediaBrowser.Server.Implementations/Sync/IHasSyncQuality.cs @@ -10,9 +10,10 @@ namespace MediaBrowser.Server.Implementations.Sync /// Gets the device profile. /// /// The target. + /// The profile. /// The quality. /// DeviceProfile. - DeviceProfile GetDeviceProfile(SyncTarget target, string quality); + DeviceProfile GetDeviceProfile(SyncTarget target, string profile, string quality); /// /// Gets the quality options. @@ -20,5 +21,12 @@ namespace MediaBrowser.Server.Implementations.Sync /// The target. /// IEnumerable<SyncQualityOption>. IEnumerable GetQualityOptions(SyncTarget target); + + /// + /// Gets the profile options. + /// + /// The target. + /// IEnumerable<SyncQualityOption>. + IEnumerable GetProfileOptions(SyncTarget target); } } diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs index 0bf9a2e23a..b75f6e7618 100644 --- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs +++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs @@ -982,7 +982,7 @@ namespace MediaBrowser.Server.Implementations.Sync public AudioOptions GetAudioOptions(SyncJobItem jobItem, SyncJob job) { - var profile = GetDeviceProfile(jobItem.TargetId, null); + var profile = GetDeviceProfile(jobItem.TargetId, null, null); return new AudioOptions { @@ -992,7 +992,7 @@ namespace MediaBrowser.Server.Implementations.Sync public VideoOptions GetVideoOptions(SyncJobItem jobItem, SyncJob job) { - var profile = GetDeviceProfile(jobItem.TargetId, job.Quality); + var profile = GetDeviceProfile(jobItem.TargetId, job.Profile, job.Quality); return new VideoOptions { @@ -1000,7 +1000,7 @@ namespace MediaBrowser.Server.Implementations.Sync }; } - public DeviceProfile GetDeviceProfile(string targetId, string quality) + private DeviceProfile GetDeviceProfile(string targetId, string profile, string quality) { foreach (var provider in _providers) { @@ -1008,7 +1008,7 @@ namespace MediaBrowser.Server.Implementations.Sync { if (string.Equals(target.Id, targetId, StringComparison.OrdinalIgnoreCase)) { - return GetDeviceProfile(provider, target, quality); + return GetDeviceProfile(provider, target, profile, quality); } } } @@ -1016,22 +1016,22 @@ namespace MediaBrowser.Server.Implementations.Sync return null; } - private DeviceProfile GetDeviceProfile(ISyncProvider provider, SyncTarget target, string quality) + private DeviceProfile GetDeviceProfile(ISyncProvider provider, SyncTarget target, string profile, string quality) { var hasProfile = provider as IHasSyncQuality; if (hasProfile != null) { - return hasProfile.GetDeviceProfile(target, quality); + return hasProfile.GetDeviceProfile(target, profile, quality); } - return GetDefaultProfile(quality); + return GetDeviceProfile(profile, quality); } - private DeviceProfile GetDefaultProfile(string quality) + private DeviceProfile GetDeviceProfile(string profile, string quality) { - var profile = new CloudSyncProfile(true, false); - var maxBitrate = profile.MaxStaticBitrate; + var deviceProfile = new CloudSyncProfile(true, false); + var maxBitrate = deviceProfile.MaxStaticBitrate; if (maxBitrate.HasValue) { @@ -1044,10 +1044,10 @@ namespace MediaBrowser.Server.Implementations.Sync maxBitrate = Convert.ToInt32(maxBitrate.Value * .5); } - profile.MaxStaticBitrate = maxBitrate; + deviceProfile.MaxStaticBitrate = maxBitrate; } - return profile; + return deviceProfile; } public IEnumerable GetQualityOptions(string targetId) @@ -1100,5 +1100,40 @@ namespace MediaBrowser.Server.Implementations.Sync } }; } + + public IEnumerable GetProfileOptions(string targetId) + { + foreach (var provider in _providers) + { + foreach (var target in GetSyncTargets(provider)) + { + if (string.Equals(target.Id, targetId, StringComparison.OrdinalIgnoreCase)) + { + return GetProfileOptions(provider, target); + } + } + } + + return new List(); + } + + private IEnumerable GetProfileOptions(ISyncProvider provider, SyncTarget target) + { + var hasQuality = provider as IHasSyncQuality; + if (hasQuality != null) + { + return hasQuality.GetProfileOptions(target); + } + + var list = new List(); + + list.Add(new SyncQualityOption + { + Name = SyncQuality.Low.ToString(), + Id = SyncQuality.Low.ToString() + }); + + return list; + } } } diff --git a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs index 9d820eaa2b..f733adda93 100644 --- a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs +++ b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Controller; +using System.Text; +using MediaBrowser.Controller; using MediaBrowser.Controller.Sync; using MediaBrowser.Model.Dto; using MediaBrowser.Model.Logging; @@ -50,7 +51,7 @@ namespace MediaBrowser.Server.Implementations.Sync string[] queries = { - "create table if not exists SyncJobs (Id GUID PRIMARY KEY, TargetId TEXT NOT NULL, Name TEXT NOT NULL, Quality TEXT, 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 table if not exists SyncJobs (Id GUID PRIMARY KEY, TargetId TEXT NOT NULL, Name TEXT NOT NULL, Profile TEXT, Quality TEXT, 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, ItemName TEXT, MediaSourceId TEXT, JobId TEXT, TemporaryPath TEXT, OutputPath TEXT, Status TEXT, TargetId TEXT, DateCreated DateTime, Progress FLOAT, AdditionalFiles TEXT, MediaSource TEXT, IsMarkedForRemoval BIT, JobItemIndex INT)", @@ -64,6 +65,8 @@ namespace MediaBrowser.Server.Implementations.Sync _connection.RunQueries(queries, _logger); + _connection.AddColumn(_logger, "SyncJobs", "Profile", "TEXT"); + PrepareStatements(); } @@ -81,11 +84,12 @@ namespace MediaBrowser.Server.Implementations.Sync // _insertJobCommand _insertJobCommand = _connection.CreateCommand(); - _insertJobCommand.CommandText = "insert 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)"; + _insertJobCommand.CommandText = "insert into SyncJobs (Id, TargetId, Name, Profile, Quality, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount) values (@Id, @TargetId, @Name, @Profile, @Quality, @Status, @Progress, @UserId, @ItemIds, @Category, @ParentId, @UnwatchedOnly, @ItemLimit, @SyncNewContent, @DateCreated, @DateLastModified, @ItemCount)"; _insertJobCommand.Parameters.Add(_insertJobCommand, "@Id"); _insertJobCommand.Parameters.Add(_insertJobCommand, "@TargetId"); _insertJobCommand.Parameters.Add(_insertJobCommand, "@Name"); + _insertJobCommand.Parameters.Add(_insertJobCommand, "@Profile"); _insertJobCommand.Parameters.Add(_insertJobCommand, "@Quality"); _insertJobCommand.Parameters.Add(_insertJobCommand, "@Status"); _insertJobCommand.Parameters.Add(_insertJobCommand, "@Progress"); @@ -102,11 +106,12 @@ namespace MediaBrowser.Server.Implementations.Sync // _updateJobCommand _updateJobCommand = _connection.CreateCommand(); - _updateJobCommand.CommandText = "update SyncJobs set TargetId=@TargetId,Name=@Name,Quality=@Quality,Status=@Status,Progress=@Progress,UserId=@UserId,ItemIds=@ItemIds,Category=@Category,ParentId=@ParentId,UnwatchedOnly=@UnwatchedOnly,ItemLimit=@ItemLimit,SyncNewContent=@SyncNewContent,DateCreated=@DateCreated,DateLastModified=@DateLastModified,ItemCount=@ItemCount where Id=@ID"; + _updateJobCommand.CommandText = "update SyncJobs set TargetId=@TargetId,Name=@Name,Profile=@Profile,Quality=@Quality,Status=@Status,Progress=@Progress,UserId=@UserId,ItemIds=@ItemIds,Category=@Category,ParentId=@ParentId,UnwatchedOnly=@UnwatchedOnly,ItemLimit=@ItemLimit,SyncNewContent=@SyncNewContent,DateCreated=@DateCreated,DateLastModified=@DateLastModified,ItemCount=@ItemCount where Id=@ID"; _updateJobCommand.Parameters.Add(_updateJobCommand, "@Id"); _updateJobCommand.Parameters.Add(_updateJobCommand, "@TargetId"); _updateJobCommand.Parameters.Add(_updateJobCommand, "@Name"); + _updateJobCommand.Parameters.Add(_updateJobCommand, "@Profile"); _updateJobCommand.Parameters.Add(_updateJobCommand, "@Quality"); _updateJobCommand.Parameters.Add(_updateJobCommand, "@Status"); _updateJobCommand.Parameters.Add(_updateJobCommand, "@Progress"); @@ -162,7 +167,7 @@ namespace MediaBrowser.Server.Implementations.Sync _updateJobItemCommand.Parameters.Add(_updateJobItemCommand, "@JobItemIndex"); } - 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 BaseJobSelectText = "select Id, TargetId, Name, Profile, Quality, Status, Progress, UserId, ItemIds, Category, ParentId, UnwatchedOnly, ItemLimit, SyncNewContent, DateCreated, DateLastModified, ItemCount from SyncJobs"; private const string BaseJobItemSelectText = "select Id, ItemId, ItemName, MediaSourceId, JobId, TemporaryPath, OutputPath, Status, TargetId, DateCreated, Progress, AdditionalFiles, MediaSource, IsMarkedForRemoval, JobItemIndex from SyncJobItems"; public SyncJob GetJob(string id) @@ -210,54 +215,59 @@ namespace MediaBrowser.Server.Implementations.Sync if (!reader.IsDBNull(3)) { - info.Quality = reader.GetString(3); + info.Profile = reader.GetString(3); } if (!reader.IsDBNull(4)) { - info.Status = (SyncJobStatus)Enum.Parse(typeof(SyncJobStatus), reader.GetString(4), true); + info.Quality = reader.GetString(4); } if (!reader.IsDBNull(5)) { - info.Progress = reader.GetDouble(5); + info.Status = (SyncJobStatus)Enum.Parse(typeof(SyncJobStatus), reader.GetString(5), true); } if (!reader.IsDBNull(6)) { - info.UserId = reader.GetString(6); + info.Progress = reader.GetDouble(6); } if (!reader.IsDBNull(7)) { - info.RequestedItemIds = reader.GetString(7).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); + info.UserId = reader.GetString(7); } if (!reader.IsDBNull(8)) { - info.Category = (SyncCategory)Enum.Parse(typeof(SyncCategory), reader.GetString(8), true); + info.RequestedItemIds = reader.GetString(8).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); } if (!reader.IsDBNull(9)) { - info.ParentId = reader.GetString(9); + info.Category = (SyncCategory)Enum.Parse(typeof(SyncCategory), reader.GetString(9), true); } if (!reader.IsDBNull(10)) { - info.UnwatchedOnly = reader.GetBoolean(10); + info.ParentId = reader.GetString(10); } if (!reader.IsDBNull(11)) { - info.ItemLimit = reader.GetInt32(11); + info.UnwatchedOnly = reader.GetBoolean(11); + } + + if (!reader.IsDBNull(12)) + { + info.ItemLimit = reader.GetInt32(12); } - info.SyncNewContent = reader.GetBoolean(12); + info.SyncNewContent = reader.GetBoolean(13); - info.DateCreated = reader.GetDateTime(13).ToUniversalTime(); - info.DateLastModified = reader.GetDateTime(14).ToUniversalTime(); - info.ItemCount = reader.GetInt32(15); + info.DateCreated = reader.GetDateTime(14).ToUniversalTime(); + info.DateLastModified = reader.GetDateTime(15).ToUniversalTime(); + info.ItemCount = reader.GetInt32(16); return info; } @@ -294,6 +304,7 @@ namespace MediaBrowser.Server.Implementations.Sync cmd.GetParameter(index++).Value = new Guid(job.Id); cmd.GetParameter(index++).Value = job.TargetId; cmd.GetParameter(index++).Value = job.Name; + cmd.GetParameter(index++).Value = job.Profile; cmd.GetParameter(index++).Value = job.Quality; cmd.GetParameter(index++).Value = job.Status.ToString(); cmd.GetParameter(index++).Value = job.Progress;