cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-17 10:58:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2176 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-09-17 02:11:16 -04:00 committed by GitHub
commit 20739b144b
9 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@ -602,7 +602,7 @@ namespace MediaBrowser.Model.Dlna
private int GetAudioBitrate(string subProtocol, int? maxTotalBitrate, int? targetAudioChannels, string targetAudioCodec, MediaStream audioStream)
{
var defaultBitrate = audioStream == null ? 192000 : audioStream.BitRate ?? 192000;
int defaultBitrate = audioStream == null ? 192000 : audioStream.BitRate ?? 192000;
// Reduce the bitrate if we're downmixing
if (targetAudioChannels.HasValue && audioStream != null && audioStream.Channels.HasValue && targetAudioChannels.Value < audioStream.Channels.Value)
{
@ -615,7 +615,7 @@ namespace MediaBrowser.Model.Dlna
{
if (StringHelper.EqualsIgnoreCase(targetAudioCodec, "ac3"))
{
if (string.Equals(subProtocol, "hls", StringComparison.OrdinalIgnoreCase))
if (StringHelper.EqualsIgnoreCase(subProtocol, "hls"))
{
defaultBitrate = Math.Max(384000, defaultBitrate);
}

6
MediaBrowser.Server.Implementations/IO/FileRefresher.cs
View File

@ -68,6 +68,11 @@ namespace MediaBrowser.Server.Implementations.IO
lock (_timerLock)
{
if (_disposed)
{
return;
}
if (_timer == null)
{
_timer = new Timer(OnTimerCallback, null, TimeSpan.FromSeconds(ConfigurationManager.Configuration.LibraryMonitorDelay), TimeSpan.FromMilliseconds(-1));
@ -287,6 +292,7 @@ namespace MediaBrowser.Server.Implementations.IO
if (_timer != null)
{
_timer.Dispose();
_timer = null;
}
}
}

7
MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
View File

@ -99,8 +99,9 @@ namespace MediaBrowser.Server.Implementations.Intros
IncludeItemTypes = new[] { typeof(Trailer).Name },
TrailerTypes = trailerTypes.ToArray(),
SimilarTo = item,
IsPlayed = config.EnableIntrosForWatchedContent ? (bool?) null : false,
IsPlayed = config.EnableIntrosForWatchedContent ? (bool?)null : false,
MaxParentalRating = config.EnableIntrosParentalControl ? ratingLevel : null,
BlockUnratedItems = config.EnableIntrosParentalControl ? new[] { UnratedItem.Trailer } : new UnratedItem[] { },
Limit = config.TrailerLimit
});
@ -110,7 +111,7 @@ namespace MediaBrowser.Server.Implementations.Intros
Type = i.SourceType == SourceType.Channel ? ItemWithTrailerType.ChannelTrailer : ItemWithTrailerType.ItemWithTrailer,
LibraryManager = _libraryManager
}));
}
}
return GetResult(item, candidates, config);
}
@ -197,7 +198,7 @@ namespace MediaBrowser.Server.Implementations.Intros
}
returnResult.AddRange(GetMediaInfoIntrosByTags(allIntros, item.Tags).Take(1));
return returnResult.DistinctBy(i => i.Path, StringComparer.OrdinalIgnoreCase);
}
catch (IOException)

2
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -1011,7 +1011,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
var factorChannelWatchCount = (query.IsAiring ?? false) || (query.IsKids ?? false) || (query.IsSports ?? false) || (query.IsMovie ?? false);
programs = programList.OrderBy(i => i.HasImage(ImageType.Primary) ? 0 : 1)
programs = programList.OrderBy(i => i.StartDate.Date)
.ThenByDescending(i => GetRecommendationScore(i, user.Id, factorChannelWatchCount))
.ThenBy(i => i.StartDate);

10
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -315,6 +315,8 @@ namespace MediaBrowser.Server.Startup.Common
/// </summary>
public override async Task RunStartupTasks()
{
await PerformPreInitMigrations().ConfigureAwait(false);
if (ServerConfigurationManager.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion &&
ServerConfigurationManager.Configuration.IsStartupWizardCompleted)
{
@ -366,23 +368,21 @@ namespace MediaBrowser.Server.Startup.Common
HttpPort = ServerConfigurationManager.Configuration.HttpServerPortNumber;
HttpsPort = ServerConfigurationManager.Configuration.HttpsPortNumber;
PerformPreInitMigrations();
return base.Init(progress);
}
private void PerformPreInitMigrations()
private async Task PerformPreInitMigrations()
{
var migrations = new List<IVersionMigration>
{
new UpdateLevelMigration(ServerConfigurationManager, this, HttpClient, JsonSerializer, _releaseAssetFilename)
new UpdateLevelMigration(ServerConfigurationManager, this, HttpClient, JsonSerializer, _releaseAssetFilename, Logger)
};
foreach (var task in migrations)
{
try
{
task.Run();
await task.Run().ConfigureAwait(false);
}
catch (Exception ex)
{

2
MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
View File

@ -16,7 +16,7 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
_taskManager = taskManager;
}
public void Run()
public async Task Run()
{
// If a forced migration is required, do that now
if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion)

5
MediaBrowser.Server.Startup.Common/Migrations/IVersionMigration.cs
View File

@ -1,8 +1,9 @@

using System.Threading.Tasks;
namespace MediaBrowser.Server.Startup.Common.Migrations
{
public interface IVersionMigration
{
void Run();
Task Run();
}
}

3
MediaBrowser.Server.Startup.Common/Migrations/MovieDbEpisodeProviderMigration.cs
View File

@ -1,5 +1,6 @@
using MediaBrowser.Controller.Configuration;
using System.Linq;
using System.Threading.Tasks;
namespace MediaBrowser.Server.Startup.Common.Migrations
{
@ -13,7 +14,7 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
_config = config;
}
public void Run()
public async Task Run()
{
var migrationKey = this.GetType().FullName;
var migrationKeyList = _config.Configuration.Migrations.ToList();

20
MediaBrowser.Server.Startup.Common/Migrations/UpdateLevelMigration.cs
View File

@ -6,6 +6,7 @@ using MediaBrowser.Common.Implementations.Updates;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Updates;
@ -18,17 +19,19 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
private readonly IHttpClient _httpClient;
private readonly IJsonSerializer _jsonSerializer;
private readonly string _releaseAssetFilename;
private readonly ILogger _logger;
public UpdateLevelMigration(IServerConfigurationManager config, IServerApplicationHost appHost, IHttpClient httpClient, IJsonSerializer jsonSerializer, string releaseAssetFilename)
public UpdateLevelMigration(IServerConfigurationManager config, IServerApplicationHost appHost, IHttpClient httpClient, IJsonSerializer jsonSerializer, string releaseAssetFilename, ILogger logger)
{
_config = config;
_appHost = appHost;
_httpClient = httpClient;
_jsonSerializer = jsonSerializer;
_releaseAssetFilename = releaseAssetFilename;
_logger = logger;
}
public async void Run()
public async Task Run()
{
var lastVersion = _config.Configuration.LastVersion;
var currentVersion = _appHost.ApplicationVersion;
@ -44,9 +47,9 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
await CheckVersion(currentVersion, updateLevel, CancellationToken.None).ConfigureAwait(false);
}
catch
catch (Exception ex)
{
_logger.ErrorException("Error in update migration", ex);
}
}
@ -109,10 +112,13 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
private Version ParseVersion(string versionString)
{
var parts = versionString.Split('.');
if (parts.Length == 3)
if (!string.IsNullOrWhiteSpace(versionString))
{
versionString += ".0";
var parts = versionString.Split('.');
if (parts.Length == 3)
{
versionString += ".0";
}
}
Version version;