michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #967 from MediaBrowser/dev

Browse Source 
3.0.5482.1
This commit is contained in:
Luke 2015-01-04 19:52:36 -05:00
commit e3a1c13e7c
5 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
View File

@ -556,8 +556,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
{ {
var codec = request.VideoCodec; var codec = request.VideoCodec;
if (!string.IsNullOrEmpty(codec))
{
if (string.Equals(codec, "h264", StringComparison.OrdinalIgnoreCase)) if (string.Equals(codec, "h264", StringComparison.OrdinalIgnoreCase))
{ {
return "libx264"; return "libx264";
@ -579,10 +577,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
return "libtheora"; return "libtheora";
} }
return codec.ToLower(); return (codec ?? string.Empty).ToLower();
}
return "copy";
} }
internal static bool CanStreamCopyVideo(EncodingJobOptions request, MediaStream videoStream) internal static bool CanStreamCopyVideo(EncodingJobOptions request, MediaStream videoStream)

12
MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
View File

@ -1,12 +1,12 @@
using System.ComponentModel; using MediaBrowser.Model.Dto;
using System.Diagnostics;
using System.Runtime.Serialization;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
using MediaBrowser.Model.Extensions; using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.Library; using MediaBrowser.Model.Library;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.Serialization;
namespace MediaBrowser.Model.LiveTv namespace MediaBrowser.Model.LiveTv
{ {

28
MediaBrowser.Server.Implementations/Library/UserManager.cs
View File

@ -160,10 +160,25 @@ namespace MediaBrowser.Server.Implementations.Library
{ {
Users = await LoadUsers().ConfigureAwait(false); Users = await LoadUsers().ConfigureAwait(false);
foreach (var user in Users.ToList()) var users = Users.ToList();
foreach (var user in users)
{ {
await DoPolicyMigration(user).ConfigureAwait(false); await DoPolicyMigration(user).ConfigureAwait(false);
} }
// If there are no local users with admin rights, make them all admins
if (!users.Any(i => i.Policy.IsAdministrator))
{
foreach (var user in users)
{
if (!user.ConnectLinkType.HasValue || user.ConnectLinkType.Value == UserLinkType.LinkedUser)
{
user.Policy.IsAdministrator = true;
await UpdateUserPolicy(user, user.Policy, false).ConfigureAwait(false);
}
}
}
} }
public Task<bool> AuthenticateUser(string username, string passwordSha1, string remoteEndPoint) public Task<bool> AuthenticateUser(string username, string passwordSha1, string remoteEndPoint)
@ -331,7 +346,7 @@ namespace MediaBrowser.Server.Implementations.Library
user.Policy.IsHidden = user.Configuration.IsHidden; user.Policy.IsHidden = user.Configuration.IsHidden;
user.Policy.MaxParentalRating = user.Configuration.MaxParentalRating; user.Policy.MaxParentalRating = user.Configuration.MaxParentalRating;
await UpdateUserPolicy(user.Id.ToString("N"), user.Policy); await UpdateUserPolicy(user, user.Policy, false);
user.Configuration.HasMigratedToPolicy = true; user.Configuration.HasMigratedToPolicy = true;
await UpdateConfiguration(user, user.Configuration, true).ConfigureAwait(false); await UpdateConfiguration(user, user.Configuration, true).ConfigureAwait(false);
@ -867,12 +882,6 @@ namespace MediaBrowser.Server.Implementations.Library
userPolicy = _jsonSerializer.DeserializeFromString<UserPolicy>(json); userPolicy = _jsonSerializer.DeserializeFromString<UserPolicy>(json);
} }
var updateConfig = user.Policy.IsAdministrator != userPolicy.IsAdministrator ||
user.Policy.EnableLiveTvManagement != userPolicy.EnableLiveTvManagement ||
user.Policy.EnableLiveTvAccess != userPolicy.EnableLiveTvAccess ||
user.Policy.EnableMediaPlayback != userPolicy.EnableMediaPlayback ||
user.Policy.EnableContentDeletion != userPolicy.EnableContentDeletion;
var path = GetPolifyFilePath(user); var path = GetPolifyFilePath(user);
Directory.CreateDirectory(Path.GetDirectoryName(path)); Directory.CreateDirectory(Path.GetDirectoryName(path));
@ -883,8 +892,6 @@ namespace MediaBrowser.Server.Implementations.Library
user.Policy = userPolicy; user.Policy = userPolicy;
} }
if (updateConfig)
{
user.Configuration.IsAdministrator = user.Policy.IsAdministrator; user.Configuration.IsAdministrator = user.Policy.IsAdministrator;
user.Configuration.EnableLiveTvManagement = user.Policy.EnableLiveTvManagement; user.Configuration.EnableLiveTvManagement = user.Policy.EnableLiveTvManagement;
user.Configuration.EnableLiveTvAccess = user.Policy.EnableLiveTvAccess; user.Configuration.EnableLiveTvAccess = user.Policy.EnableLiveTvAccess;
@ -893,7 +900,6 @@ namespace MediaBrowser.Server.Implementations.Library
await UpdateConfiguration(user, user.Configuration, true).ConfigureAwait(false); await UpdateConfiguration(user, user.Configuration, true).ConfigureAwait(false);
} }
}
private void DeleteUserPolicy(User user) private void DeleteUserPolicy(User user)
{ {

8
MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
View File

@ -29,7 +29,7 @@ namespace MediaBrowser.Server.Implementations.Sync
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly ITVSeriesManager _tvSeriesManager; private readonly ITVSeriesManager _tvSeriesManager;
private readonly IMediaEncoder MediaEncoder; private readonly IMediaEncoder _mediaEncoder;
public SyncJobProcessor(ILibraryManager libraryManager, ISyncRepository syncRepo, ISyncManager syncManager, ILogger logger, IUserManager userManager, ITVSeriesManager tvSeriesManager, IMediaEncoder mediaEncoder) public SyncJobProcessor(ILibraryManager libraryManager, ISyncRepository syncRepo, ISyncManager syncManager, ILogger logger, IUserManager userManager, ITVSeriesManager tvSeriesManager, IMediaEncoder mediaEncoder)
{ {
@ -39,7 +39,7 @@ namespace MediaBrowser.Server.Implementations.Sync
_logger = logger; _logger = logger;
_userManager = userManager; _userManager = userManager;
_tvSeriesManager = tvSeriesManager; _tvSeriesManager = tvSeriesManager;
MediaEncoder = mediaEncoder; _mediaEncoder = mediaEncoder;
} }
public async Task EnsureJobItems(SyncJob job) public async Task EnsureJobItems(SyncJob job)
@ -412,7 +412,7 @@ namespace MediaBrowser.Server.Implementations.Sync
jobItem.Status = SyncJobItemStatus.Converting; jobItem.Status = SyncJobItemStatus.Converting;
await _syncRepo.Update(jobItem).ConfigureAwait(false); await _syncRepo.Update(jobItem).ConfigureAwait(false);
jobItem.OutputPath = await MediaEncoder.EncodeVideo(new EncodingJobOptions(streamInfo, profile), new Progress<double>(), cancellationToken); jobItem.OutputPath = await _mediaEncoder.EncodeVideo(new EncodingJobOptions(streamInfo, profile), new Progress<double>(), cancellationToken);
} }
else else
{ {
@ -456,7 +456,7 @@ namespace MediaBrowser.Server.Implementations.Sync
jobItem.Status = SyncJobItemStatus.Converting; jobItem.Status = SyncJobItemStatus.Converting;
await _syncRepo.Update(jobItem).ConfigureAwait(false); await _syncRepo.Update(jobItem).ConfigureAwait(false);
jobItem.OutputPath = await MediaEncoder.EncodeAudio(new EncodingJobOptions(streamInfo, profile), new Progress<double>(), cancellationToken); jobItem.OutputPath = await _mediaEncoder.EncodeAudio(new EncodingJobOptions(streamInfo, profile), new Progress<double>(), cancellationToken);
} }
else else
{ {

2
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")] //[assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5482.0")] [assembly: AssemblyVersion("3.0.5482.1")]