From c0aec48a31d96726a6fb1814f28b6971fabca163 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 21 Mar 2015 12:10:02 -0400 Subject: beta fixes --- .../HttpServer/Security/SessionContext.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'MediaBrowser.Server.Implementations/HttpServer') diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs index 1bbe9893b..c8278dc54 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs @@ -28,7 +28,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security if (!string.IsNullOrWhiteSpace(authorization.Token)) { var auth = GetTokenInfo(requestContext); - return _sessionManager.GetSessionByAuthenticationToken(auth, authorization.DeviceId, requestContext.RemoteIp, authorization.Version); + if (auth != null) + { + return _sessionManager.GetSessionByAuthenticationToken(auth, authorization.DeviceId, requestContext.RemoteIp, authorization.Version); + } } var session = _sessionManager.GetSession(authorization.DeviceId, authorization.Client, authorization.Version); -- cgit v1.2.3 From e62270df353aa8e2ae0a20aeff7d5aa6f9b62630 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 24 Mar 2015 21:34:34 -0400 Subject: add socket error message --- MediaBrowser.Api/ApiEntryPoint.cs | 7 +++++++ MediaBrowser.Api/Playback/BaseStreamingService.cs | 2 +- MediaBrowser.Api/Playback/TranscodingThrottler.cs | 6 ++++++ .../HttpServer/SocketSharp/SharpWebSocket.cs | 3 ++- MediaBrowser.Server.Implementations/Session/WebSocketController.cs | 2 +- .../UserViews/StripCollageBuilder.cs | 2 +- 6 files changed, 18 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.Server.Implementations/HttpServer') diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs index 281f764b5..a21fc22fe 100644 --- a/MediaBrowser.Api/ApiEntryPoint.cs +++ b/MediaBrowser.Api/ApiEntryPoint.cs @@ -407,6 +407,11 @@ namespace MediaBrowser.Api { try { + if (job.TranscodingThrottler != null) + { + job.TranscodingThrottler.Stop(); + } + Logger.Info("Killing ffmpeg process for {0}", job.Path); //process.Kill(); @@ -578,6 +583,8 @@ namespace MediaBrowser.Api public long? TranscodingPositionTicks { get; set; } public long? DownloadPositionTicks { get; set; } + public TranscodingThrottler TranscodingThrottler { get; set; } + public void DisposeKillTimer() { if (KillTimer != null) diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index ae71ac262..bc194b45b 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -1123,7 +1123,7 @@ namespace MediaBrowser.Api.Playback { if (state.RunTimeTicks.Value >= TimeSpan.FromMinutes(5).Ticks && state.IsInputVideo) { - state.TranscodingThrottler = new TranscodingThrottler(transcodingJob, Logger); + transcodingJob.TranscodingThrottler = state.TranscodingThrottler = new TranscodingThrottler(transcodingJob, Logger); state.TranscodingThrottler.Start(); } } diff --git a/MediaBrowser.Api/Playback/TranscodingThrottler.cs b/MediaBrowser.Api/Playback/TranscodingThrottler.cs index 38ce9e298..19a9fe934 100644 --- a/MediaBrowser.Api/Playback/TranscodingThrottler.cs +++ b/MediaBrowser.Api/Playback/TranscodingThrottler.cs @@ -139,6 +139,12 @@ namespace MediaBrowser.Api.Playback return false; } + public void Stop() + { + DisposeTimer(); + UnpauseTranscoding(); + } + public void Dispose() { DisposeTimer(); diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs index 8ab8b0215..a8b3bc10b 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs @@ -56,7 +56,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp void socket_OnError(object sender, SocketHttpListener.ErrorEventArgs e) { - EventHelper.FireEventIfNotNull(Closed, this, EventArgs.Empty, _logger); + _logger.Error("Error in SharpWebSocket: {0}", e.Message ?? string.Empty); + //EventHelper.FireEventIfNotNull(Closed, this, EventArgs.Empty, _logger); } void socket_OnClose(object sender, SocketHttpListener.CloseEventArgs e) diff --git a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs index d4ecd9572..1e1949533 100644 --- a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs +++ b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs @@ -45,7 +45,7 @@ namespace MediaBrowser.Server.Implementations.Session { get { - return _isActive; + return HasOpenSockets; } } diff --git a/MediaBrowser.Server.Implementations/UserViews/StripCollageBuilder.cs b/MediaBrowser.Server.Implementations/UserViews/StripCollageBuilder.cs index 2f2d9860c..00be0f18e 100644 --- a/MediaBrowser.Server.Implementations/UserViews/StripCollageBuilder.cs +++ b/MediaBrowser.Server.Implementations/UserViews/StripCollageBuilder.cs @@ -20,7 +20,7 @@ namespace MediaBrowser.Server.Implementations.UserViews public Stream BuildThumbCollage(IEnumerable paths, string text, int width, int height) { - using (var wand = BuildThumbCollageWandWithText(paths, text, width, height)) + using (var wand = BuildThumbCollageWand(paths, width, height)) { return DynamicImageHelpers.GetStream(wand, _appPaths); } -- cgit v1.2.3 From bbaf88ae1f088584f9130852cd99ad372adce136 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 24 Mar 2015 23:54:32 -0400 Subject: update tv db cleanup --- MediaBrowser.Controller/Persistence/IItemRepository.cs | 2 +- MediaBrowser.Dlna/PlayTo/PlayToController.cs | 5 ----- .../HttpServer/Security/SessionContext.cs | 16 ++++++++-------- .../LiveTv/LiveTvManager.cs | 2 +- .../Persistence/SqliteItemRepository.cs | 6 +++--- .../Photos/BaseDynamicImageProvider.cs | 2 +- .../Session/WebSocketController.cs | 10 +++++++++- 7 files changed, 23 insertions(+), 20 deletions(-) (limited to 'MediaBrowser.Server.Implementations/HttpServer') diff --git a/MediaBrowser.Controller/Persistence/IItemRepository.cs b/MediaBrowser.Controller/Persistence/IItemRepository.cs index 245c81d70..f306518df 100644 --- a/MediaBrowser.Controller/Persistence/IItemRepository.cs +++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs @@ -107,7 +107,7 @@ namespace MediaBrowser.Controller.Persistence /// /// The type. /// IEnumerable{Guid}. - IEnumerable GetItemsOfType(Type type); + IEnumerable GetItemsOfType(Type type); /// /// Saves the children. diff --git a/MediaBrowser.Dlna/PlayTo/PlayToController.cs b/MediaBrowser.Dlna/PlayTo/PlayToController.cs index d52428dc9..f8f939f47 100644 --- a/MediaBrowser.Dlna/PlayTo/PlayToController.cs +++ b/MediaBrowser.Dlna/PlayTo/PlayToController.cs @@ -134,11 +134,6 @@ namespace MediaBrowser.Dlna.PlayTo } } - private string GetServerAddress() - { - return _serverAddress; - } - async void _device_MediaChanged(object sender, MediaChangedEventArgs e) { try diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs index c8278dc54..f40d117c4 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs @@ -25,14 +25,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security { var authorization = _authContext.GetAuthorizationInfo(requestContext); - if (!string.IsNullOrWhiteSpace(authorization.Token)) - { - var auth = GetTokenInfo(requestContext); - if (auth != null) - { - return _sessionManager.GetSessionByAuthenticationToken(auth, authorization.DeviceId, requestContext.RemoteIp, authorization.Version); - } - } + //if (!string.IsNullOrWhiteSpace(authorization.Token)) + //{ + // var auth = GetTokenInfo(requestContext); + // if (auth != null) + // { + // return _sessionManager.GetSessionByAuthenticationToken(auth, authorization.DeviceId, requestContext.RemoteIp, authorization.Version); + // } + //} var session = _sessionManager.GetSession(authorization.DeviceId, authorization.Client, authorization.Version); return Task.FromResult(session); diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index ffa774300..2bc6cbadf 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -1115,7 +1115,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv { cancellationToken.ThrowIfCancellationRequested(); - if (!currentIdList.Contains(new Guid(programId))) + if (!currentIdList.Contains(programId)) { var program = _libraryManager.GetItemById(programId); diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index 4c45d5b83..12ce60d45 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -521,8 +521,8 @@ namespace MediaBrowser.Server.Implementations.Persistence } } } - - public IEnumerable GetItemsOfType(Type type) + + public IEnumerable GetItemsOfType(Type type) { if (type == null) { @@ -541,7 +541,7 @@ namespace MediaBrowser.Server.Implementations.Persistence { while (reader.Read()) { - yield return reader.GetString(0); + yield return reader.GetGuid(0); } } } diff --git a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs index 2cfc873de..6fb02358e 100644 --- a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs +++ b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs @@ -125,7 +125,7 @@ namespace MediaBrowser.Server.Implementations.Photos protected abstract Task> GetItemsWithImages(IHasImages item); - private const string Version = "3"; + private const string Version = "4"; protected string GetConfigurationCacheKey(List items, string itemName) { var parts = Version + "_" + (itemName ?? string.Empty) + "_" + diff --git a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs index 1e1949533..765664299 100644 --- a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs +++ b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs @@ -41,17 +41,25 @@ namespace MediaBrowser.Server.Implementations.Session } private bool _isActive; + private DateTime _lastActivityDate; public bool IsSessionActive { get { - return HasOpenSockets; + if (HasOpenSockets) + { + return true; + } + + //return false; + return _isActive && (DateTime.UtcNow - _lastActivityDate).TotalMinutes <= 10; } } public void OnActivity() { _isActive = true; + _lastActivityDate = DateTime.UtcNow; } private IEnumerable GetActiveSockets() -- cgit v1.2.3