diff --git a/MediaBrowser.Api/EnvironmentService.cs b/MediaBrowser.Api/EnvironmentService.cs
index 11a0eec231..81b326da8f 100644
--- a/MediaBrowser.Api/EnvironmentService.cs
+++ b/MediaBrowser.Api/EnvironmentService.cs
@@ -120,8 +120,6 @@ namespace MediaBrowser.Api
///
/// The request.
/// System.Object.
- /// Path
- ///
public object Get(GetDirectoryContents request)
{
var path = request.Path;
@@ -138,15 +136,7 @@ namespace MediaBrowser.Api
return ToOptimizedSerializedResultUsingCache(GetNetworkShares(path).OrderBy(i => i.Path).ToList());
}
- try
- {
- return ToOptimizedSerializedResultUsingCache(GetFileSystemEntries(request).OrderBy(i => i.Path).ToList());
- }
- catch (UnauthorizedAccessException)
- {
- // Don't throw the original UnauthorizedAccessException because it will cause a 401 response
- throw new ApplicationException("Access to the path " + request.Path + " is denied.");
- }
+ return ToOptimizedSerializedResultUsingCache(GetFileSystemEntries(request).OrderBy(i => i.Path).ToList());
}
public object Get(GetNetworkShares request)
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index eb1cd6084b..20fd1ef40a 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -722,7 +722,7 @@ namespace MediaBrowser.Api.Library
if (!item.CanDelete(user))
{
- throw new UnauthorizedAccessException();
+ throw new SecurityException("Unauthorized access");
}
if (item is ILiveTvRecording)
diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs
index 07e64c98d4..344d6ab3d3 100644
--- a/MediaBrowser.Api/LiveTv/LiveTvService.cs
+++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs
@@ -521,12 +521,12 @@ namespace MediaBrowser.Api.LiveTv
if (user == null)
{
- throw new UnauthorizedAccessException("Anonymous live tv management is not allowed.");
+ throw new SecurityException("Anonymous live tv management is not allowed.");
}
if (!user.Policy.EnableLiveTvManagement)
{
- throw new UnauthorizedAccessException("The current user does not have permission to manage live tv.");
+ throw new SecurityException("The current user does not have permission to manage live tv.");
}
}
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 4ec6886117..5121fcd6f5 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -274,7 +274,6 @@ namespace MediaBrowser.Model.Configuration
InsecureApps9 = new[]
{
- "Unknown app",
"Windows Phone"
};
diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs
index 624736779e..dec6886350 100644
--- a/MediaBrowser.Providers/Manager/ImageSaver.cs
+++ b/MediaBrowser.Providers/Manager/ImageSaver.cs
@@ -236,11 +236,6 @@ namespace MediaBrowser.Providers.Manager
file.Attributes |= FileAttributes.Hidden;
}
}
- catch (UnauthorizedAccessException ex)
- {
- _logger.Error("Error saving image to {0}", ex, path);
- throw new Exception(string.Format("Error saving image to {0}", path), ex);
- }
finally
{
_libraryMonitor.ReportFileSystemChangeComplete(path, false);
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 596a76327b..b2a51377c6 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -879,6 +879,11 @@ namespace MediaBrowser.Providers.Manager
private void StartRefreshTimer()
{
+ if (_disposed)
+ {
+ return;
+ }
+
lock (_refreshTimerLock)
{
if (_refreshTimer == null)
@@ -1013,6 +1018,7 @@ namespace MediaBrowser.Providers.Manager
public void Dispose()
{
_disposed = true;
+ StopRefreshTimer();
}
}
}
\ No newline at end of file
diff --git a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
index 54db0d5faa..5e48b79e35 100644
--- a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
+++ b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
@@ -196,7 +196,7 @@ namespace MediaBrowser.Providers.Subtitles
if (!(loginResponse is MethodResponseLogIn))
{
- throw new UnauthorizedAccessException("Authentication to OpenSubtitles failed.");
+ throw new Exception("Authentication to OpenSubtitles failed.");
}
_lastLogin = DateTime.UtcNow;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 1885afc61e..e8bb40ba11 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -92,7 +92,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
{typeof (FileNotFoundException), 404},
{typeof (DirectoryNotFoundException), 404},
{typeof (SecurityException), 401},
- {typeof (UnauthorizedAccessException), 401}
+ {typeof (UnauthorizedAccessException), 500}
};
HostConfig.Instance.DebugMode = true;
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 2b55945e62..ca3da4aa2a 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -611,11 +611,19 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
try
{
+ var recordingEndDate = timer.EndDate.AddSeconds(timer.PostPaddingSeconds);
+
+ if (recordingEndDate <= DateTime.UtcNow)
+ {
+ _logger.Warn("Recording timer fired for timer {0}, Id: {1}, but the program has already ended.", timer.Name, timer.Id);
+ return;
+ }
+
var cancellationTokenSource = new CancellationTokenSource();
if (_activeRecordings.TryAdd(timer.Id, cancellationTokenSource))
{
- await RecordStream(timer, cancellationTokenSource.Token).ConfigureAwait(false);
+ await RecordStream(timer, recordingEndDate, cancellationTokenSource.Token).ConfigureAwait(false);
}
}
catch (OperationCanceledException)
@@ -628,22 +636,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
}
}
- private async Task RecordStream(TimerInfo timer, CancellationToken cancellationToken)
+ private async Task RecordStream(TimerInfo timer, DateTime recordingEndDate, CancellationToken cancellationToken)
{
if (timer == null)
{
throw new ArgumentNullException("timer");
}
- var mediaStreamInfo = await GetChannelStream(timer.ChannelId, null, CancellationToken.None);
- var duration = (timer.EndDate - DateTime.UtcNow).Add(TimeSpan.FromSeconds(timer.PostPaddingSeconds));
-
- HttpRequestOptions httpRequestOptions = new HttpRequestOptions()
- {
- Url = mediaStreamInfo.Path
- };
-
var info = GetProgramInfoFromCache(timer.ChannelId, timer.ProgramId);
+
var recordPath = RecordingPath;
if (info.IsMovie)
@@ -708,15 +709,27 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
_recordingProvider.Add(recording);
}
- recording.Path = recordPath;
- recording.Status = RecordingStatus.InProgress;
- recording.DateLastUpdated = DateTime.UtcNow;
- _recordingProvider.Update(recording);
-
- _logger.Info("Beginning recording.");
-
try
{
+ var mediaStreamInfo = await GetChannelStream(timer.ChannelId, null, CancellationToken.None);
+
+ // HDHR doesn't seem to release the tuner right away after first probing with ffmpeg
+ await Task.Delay(3000, cancellationToken).ConfigureAwait(false);
+
+ var duration = recordingEndDate - DateTime.UtcNow;
+
+ HttpRequestOptions httpRequestOptions = new HttpRequestOptions()
+ {
+ Url = mediaStreamInfo.Path
+ };
+
+ recording.Path = recordPath;
+ recording.Status = RecordingStatus.InProgress;
+ recording.DateLastUpdated = DateTime.UtcNow;
+ _recordingProvider.Update(recording);
+
+ _logger.Info("Beginning recording.");
+
httpRequestOptions.BufferContent = false;
var durationToken = new CancellationTokenSource(duration);
var linkedToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, durationToken.Token).Token;
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index d9c3ed7a6d..d164874dc9 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -29,6 +29,7 @@ using System.Globalization;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using MediaBrowser.Controller.Net;
namespace MediaBrowser.Server.Implementations.Session
{
@@ -1276,7 +1277,7 @@ namespace MediaBrowser.Server.Implementations.Session
{
if (!_deviceManager.CanAccessDevice(user.Id.ToString("N"), request.DeviceId))
{
- throw new UnauthorizedAccessException("User is not allowed access from this device.");
+ throw new SecurityException("User is not allowed access from this device.");
}
}
@@ -1286,7 +1287,7 @@ namespace MediaBrowser.Server.Implementations.Session
{
EventHelper.FireEventIfNotNull(AuthenticationFailed, this, new GenericEventArgs(request), _logger);
- throw new UnauthorizedAccessException("Invalid user or password entered.");
+ throw new SecurityException("Invalid user or password entered.");
}
var token = await GetAuthorizationToken(user.Id.ToString("N"), request.DeviceId, request.App, request.AppVersion, request.DeviceName).ConfigureAwait(false);
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 7aaf9c27a9..9e9c1f1b9d 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -9,6 +9,7 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using MediaBrowser.Controller.Net;
using WebMarkupMin.Core;
using WebMarkupMin.Core.Minifiers;
using WebMarkupMin.Core.Settings;
@@ -136,7 +137,7 @@ namespace MediaBrowser.WebDashboard.Api
// Don't allow file system access outside of the source folder
if (!_fileSystem.ContainsSubPath(rootPath, fullPath))
{
- throw new UnauthorizedAccessException();
+ throw new SecurityException("Access denied");
}
return fullPath;