update recording deletion process
This commit is contained in:
parent
e04582c9d2
commit
b30bd9a1df
|
@ -789,12 +789,10 @@ namespace MediaBrowser.Api.Library
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item is ILiveTvRecording)
|
return item.Delete(new DeleteOptions
|
||||||
{
|
{
|
||||||
return _liveTv.DeleteRecording(i);
|
DeleteFileLocation = true
|
||||||
}
|
});
|
||||||
|
|
||||||
return _libraryManager.DeleteItem(item);
|
|
||||||
}).ToArray();
|
}).ToArray();
|
||||||
|
|
||||||
Task.WaitAll(tasks);
|
Task.WaitAll(tasks);
|
||||||
|
|
|
@ -1980,5 +1980,10 @@ namespace MediaBrowser.Controller.Entities
|
||||||
{
|
{
|
||||||
return new[] { Id };
|
return new[] { Id };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public virtual Task Delete(DeleteOptions options)
|
||||||
|
{
|
||||||
|
return LibraryManager.DeleteItem(this, options);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -6,14 +6,6 @@ namespace MediaBrowser.Controller.Library
|
||||||
{
|
{
|
||||||
public static class LibraryManagerExtensions
|
public static class LibraryManagerExtensions
|
||||||
{
|
{
|
||||||
public static Task DeleteItem(this ILibraryManager manager, BaseItem item)
|
|
||||||
{
|
|
||||||
return manager.DeleteItem(item, new DeleteOptions
|
|
||||||
{
|
|
||||||
DeleteFileLocation = true
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public static BaseItem GetItemById(this ILibraryManager manager, string id)
|
public static BaseItem GetItemById(this ILibraryManager manager, string id)
|
||||||
{
|
{
|
||||||
return manager.GetItemById(new Guid(id));
|
return manager.GetItemById(new Guid(id));
|
||||||
|
|
|
@ -44,6 +44,13 @@ namespace MediaBrowser.Controller.LiveTv
|
||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
Task DeleteRecording(string id);
|
Task DeleteRecording(string id);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Deletes the recording.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="recording">The recording.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
Task DeleteRecording(ILiveTvRecording recording);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Cancels the timer.
|
/// Cancels the timer.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -9,6 +9,8 @@ using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Runtime.Serialization;
|
using System.Runtime.Serialization;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using MediaBrowser.Controller.Library;
|
||||||
|
|
||||||
namespace MediaBrowser.Controller.LiveTv
|
namespace MediaBrowser.Controller.LiveTv
|
||||||
{
|
{
|
||||||
|
@ -144,5 +146,10 @@ namespace MediaBrowser.Controller.LiveTv
|
||||||
{
|
{
|
||||||
return IsVisible(user);
|
return IsVisible(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override Task Delete(DeleteOptions options)
|
||||||
|
{
|
||||||
|
return LiveTvManager.DeleteRecording(this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,8 @@ using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Runtime.Serialization;
|
using System.Runtime.Serialization;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using MediaBrowser.Controller.Library;
|
||||||
|
|
||||||
namespace MediaBrowser.Controller.LiveTv
|
namespace MediaBrowser.Controller.LiveTv
|
||||||
{
|
{
|
||||||
|
@ -159,5 +161,10 @@ namespace MediaBrowser.Controller.LiveTv
|
||||||
{
|
{
|
||||||
return IsVisible(user);
|
return IsVisible(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override Task Delete(DeleteOptions options)
|
||||||
|
{
|
||||||
|
return LiveTvManager.DeleteRecording(this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -175,7 +175,11 @@ namespace MediaBrowser.Providers.TV
|
||||||
{
|
{
|
||||||
_logger.Info("Removing virtual season {0} {1}", seasonToRemove.Series.Name, seasonToRemove.IndexNumber);
|
_logger.Info("Removing virtual season {0} {1}", seasonToRemove.Series.Name, seasonToRemove.IndexNumber);
|
||||||
|
|
||||||
await _libraryManager.DeleteItem(seasonToRemove).ConfigureAwait(false);
|
await seasonToRemove.Delete(new DeleteOptions
|
||||||
|
{
|
||||||
|
DeleteFileLocation = true
|
||||||
|
|
||||||
|
}).ConfigureAwait(false);
|
||||||
|
|
||||||
hasChanges = true;
|
hasChanges = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -315,7 +315,11 @@ namespace MediaBrowser.Providers.TV
|
||||||
{
|
{
|
||||||
_logger.Info("Removing missing/unaired episode {0} {1}x{2}", episodeToRemove.Series.Name, episodeToRemove.ParentIndexNumber, episodeToRemove.IndexNumber);
|
_logger.Info("Removing missing/unaired episode {0} {1}x{2}", episodeToRemove.Series.Name, episodeToRemove.ParentIndexNumber, episodeToRemove.IndexNumber);
|
||||||
|
|
||||||
await _libraryManager.DeleteItem(episodeToRemove).ConfigureAwait(false);
|
await episodeToRemove.Delete(new DeleteOptions
|
||||||
|
{
|
||||||
|
DeleteFileLocation = true
|
||||||
|
|
||||||
|
}).ConfigureAwait(false);
|
||||||
|
|
||||||
hasChanges = true;
|
hasChanges = true;
|
||||||
}
|
}
|
||||||
|
@ -380,7 +384,11 @@ namespace MediaBrowser.Providers.TV
|
||||||
{
|
{
|
||||||
_logger.Info("Removing virtual season {0} {1}", seasonToRemove.Series.Name, seasonToRemove.IndexNumber);
|
_logger.Info("Removing virtual season {0} {1}", seasonToRemove.Series.Name, seasonToRemove.IndexNumber);
|
||||||
|
|
||||||
await _libraryManager.DeleteItem(seasonToRemove).ConfigureAwait(false);
|
await seasonToRemove.Delete(new DeleteOptions
|
||||||
|
{
|
||||||
|
DeleteFileLocation = true
|
||||||
|
|
||||||
|
}).ConfigureAwait(false);
|
||||||
|
|
||||||
hasChanges = true;
|
hasChanges = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1673,6 +1673,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
|
||||||
throw new ResourceNotFoundException(string.Format("Recording with Id {0} not found", recordingId));
|
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);
|
var service = GetService(recording.ServiceName);
|
||||||
|
|
||||||
try
|
try
|
||||||
|
|
|
@ -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);
|
_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
|
DeleteFileLocation = false
|
||||||
});
|
|
||||||
|
}).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
numComplete++;
|
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);
|
_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
|
DeleteFileLocation = false
|
||||||
});
|
|
||||||
|
}).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
catch (OperationCanceledException)
|
catch (OperationCanceledException)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user