aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-02-11 23:54:00 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-02-11 23:54:00 -0500
commitb30bd9a1dfc52ff4581183acf5ddb214efc518da (patch)
tree01d0ac6f5ab69f0ad4c982422bfd8288d62eafaf /MediaBrowser.Server.Implementations
parente04582c9d2c0e0081ff717e07d6b164205cefd74 (diff)
update recording deletion process
Diffstat (limited to 'MediaBrowser.Server.Implementations')
-rw-r--r--MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs7
-rw-r--r--MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs10
2 files changed, 12 insertions, 5 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index dcebc0c42..b21e439a6 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1673,6 +1673,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
throw new ResourceNotFoundException(string.Format("Recording with Id {0} not found", recordingId));
}
+ await DeleteRecording(recording).ConfigureAwait(false);
+ }
+
+ public async Task DeleteRecording(ILiveTvRecording recording)
+ {
var service = GetService(recording.ServiceName);
try
@@ -1685,7 +1690,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
}
_lastRecordingRefreshTime = DateTime.MinValue;
-
+
// This is the responsibility of the live tv service
await _libraryManager.DeleteItem((BaseItem)recording, new DeleteOptions
{
diff --git a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
index 0959e2123..6ca1bae6d 100644
--- a/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
@@ -205,10 +205,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
{
_logger.Info("Cleaning item {0} type: {1} path: {2}", item.Name, item.GetType().Name, item.Path ?? string.Empty);
- await _libraryManager.DeleteItem(item, new DeleteOptions
+ await item.Delete(new DeleteOptions
{
DeleteFileLocation = false
- });
+
+ }).ConfigureAwait(false);
}
numComplete++;
@@ -274,10 +275,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
_logger.Info("Deleting item from database {0} because path no longer exists. type: {1} path: {2}", libraryItem.Name, libraryItem.GetType().Name, libraryItem.Path ?? string.Empty);
- await _libraryManager.DeleteItem(libraryItem, new DeleteOptions
+ await libraryItem.Delete(new DeleteOptions
{
DeleteFileLocation = false
- });
+
+ }).ConfigureAwait(false);
}
catch (OperationCanceledException)
{