open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1444 from MediaBrowser/dev

Browse Source 
Dev
pull/702/head
Luke 9 years ago
parent cec3d7e6b4 b30bd9a1df
commit 6f2d87a0f9
15 changed files with 66 additions and 31 deletions
Show Stats Download Patch File Download Diff File

10
MediaBrowser.Api/Library/LibraryService.cs
Unescape View File

@ -569,7 +569,7 @@ namespace MediaBrowser.Api.Library
{
throw new ArgumentException("This command cannot be used for remote or virtual items.");
}
if (_fileSystem.DirectoryExists(item.Path))
if (_fileSystem.DirectoryExists(item.Path))
{
throw new ArgumentException("This command cannot be used for directories.");
}
@ -789,12 +789,10 @@ namespace MediaBrowser.Api.Library
return Task.FromResult(true);
}
if (item is ILiveTvRecording)
return item.Delete(new DeleteOptions
{
return _liveTv.DeleteRecording(i);
}
return _libraryManager.DeleteItem(item);
DeleteFileLocation = true
});
}).ToArray();
Task.WaitAll(tasks);

5
MediaBrowser.Controller/Entities/BaseItem.cs
Unescape View File

@ -1980,5 +1980,10 @@ namespace MediaBrowser.Controller.Entities
{
return new[] { Id };
}
public virtual Task Delete(DeleteOptions options)
{
return LibraryManager.DeleteItem(this, options);
}
}
}

8
MediaBrowser.Controller/Library/LibraryManagerExtensions.cs
Unescape View File

@ -6,14 +6,6 @@ namespace MediaBrowser.Controller.Library
{
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)
{
return manager.GetItemById(new Guid(id));

7
MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
Unescape View File

@ -44,6 +44,13 @@ namespace MediaBrowser.Controller.LiveTv
/// <returns>Task.</returns>
Task DeleteRecording(string id);
/// <summary>
/// Deletes the recording.
/// </summary>
/// <param name="recording">The recording.</param>
/// <returns>Task.</returns>
Task DeleteRecording(ILiveTvRecording recording);
/// <summary>
/// Cancels the timer.
/// </summary>

7
MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs
Unescape View File

@ -9,6 +9,8 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Threading.Tasks;
using MediaBrowser.Controller.Library;
namespace MediaBrowser.Controller.LiveTv
{
@ -144,5 +146,10 @@ namespace MediaBrowser.Controller.LiveTv
{
return IsVisible(user);
}
public override Task Delete(DeleteOptions options)
{
return LiveTvManager.DeleteRecording(this);
}
}
}

7
MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs
Unescape View File

@ -9,6 +9,8 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Threading.Tasks;
using MediaBrowser.Controller.Library;
namespace MediaBrowser.Controller.LiveTv
{
@ -159,5 +161,10 @@ namespace MediaBrowser.Controller.LiveTv
{
return IsVisible(user);
}
public override Task Delete(DeleteOptions options)
{
return LiveTvManager.DeleteRecording(this);
}
}
}

2
MediaBrowser.Dlna/PlayTo/SsdpHttpClient.cs
Unescape View File

@ -114,7 +114,7 @@ namespace MediaBrowser.Dlna.PlayTo
{
Url = url,
UserAgent = USERAGENT,
LogRequest = logRequest || _config.GetDlnaConfiguration().EnableDebugLogging,
LogRequest = logRequest || _config.GetDlnaConfiguration().EnableDebugLog,
LogErrorResponseBody = true
};

2
MediaBrowser.Dlna/Service/BaseControlHandler.cs
Unescape View File

@ -27,7 +27,7 @@ namespace MediaBrowser.Dlna.Service
{
try
{
var enableDebugLogging = Config.GetDlnaConfiguration().EnableDebugLogging;
var enableDebugLogging = Config.GetDlnaConfiguration().EnableDebugLog;
if (enableDebugLogging)
{

2
MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs
Unescape View File

@ -217,7 +217,7 @@ namespace MediaBrowser.Dlna.Ssdp
return;
}
if (_config.GetDlnaConfiguration().EnableDebugLogging)
if (_config.GetDlnaConfiguration().EnableDebugLog)
{
var headerTexts = args.Headers.Select(i => string.Format("{0}={1}", i.Key, i.Value));
var headerText = string.Join(",", headerTexts.ToArray());

10
MediaBrowser.Dlna/Ssdp/SsdpHandler.cs
Unescape View File

@ -92,7 +92,7 @@ namespace MediaBrowser.Dlna.Ssdp
{
TimeSpan delay = GetSearchDelay(headers);
if (_config.GetDlnaConfiguration().EnableDebugLogging)
if (_config.GetDlnaConfiguration().EnableDebugLog)
{
_logger.Debug("Delaying search response by {0} seconds", delay.TotalSeconds);
}
@ -163,7 +163,7 @@ namespace MediaBrowser.Dlna.Ssdp
{
var msg = new SsdpMessageBuilder().BuildMessage(header, values);
var enableDebugLogging = _config.GetDlnaConfiguration().EnableDebugLogging;
var enableDebugLogging = _config.GetDlnaConfiguration().EnableDebugLog;
for (var i = 0; i < sendCount; i++)
{
@ -202,7 +202,7 @@ namespace MediaBrowser.Dlna.Ssdp
private void RespondToSearch(EndPoint endpoint, string deviceType)
{
var enableDebugLogging = _config.GetDlnaConfiguration().EnableDebugLogging;
var enableDebugLogging = _config.GetDlnaConfiguration().EnableDebugLog;
var isLogged = false;
@ -305,7 +305,7 @@ namespace MediaBrowser.Dlna.Ssdp
var received = (byte[])result.AsyncState;
var enableDebugLogging = _config.GetDlnaConfiguration().EnableDebugLogging;
var enableDebugLogging = _config.GetDlnaConfiguration().EnableDebugLog;
if (enableDebugLogging)
{
@ -404,7 +404,7 @@ namespace MediaBrowser.Dlna.Ssdp
private void NotifyAll()
{
var enableDebugLogging = _config.GetDlnaConfiguration().EnableDebugLogging;
var enableDebugLogging = _config.GetDlnaConfiguration().EnableDebugLog;
if (enableDebugLogging)
{

2
MediaBrowser.Model/Configuration/DlnaOptions.cs
Unescape View File

@ -5,7 +5,7 @@ namespace MediaBrowser.Model.Configuration
{
public bool EnablePlayTo { get; set; }
public bool EnableServer { get; set; }
public bool EnableDebugLogging { get; set; }
public bool EnableDebugLog { get; set; }
public bool BlastAliveMessages { get; set; }
public int ClientDiscoveryIntervalSeconds { get; set; }
public int BlastAliveMessageIntervalSeconds { get; set; }

6
MediaBrowser.Providers/TV/DummySeasonProvider.cs
Unescape View File

@ -175,7 +175,11 @@ namespace MediaBrowser.Providers.TV
{
_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;
}

12
MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
Unescape View File

@ -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);
await _libraryManager.DeleteItem(episodeToRemove).ConfigureAwait(false);
await episodeToRemove.Delete(new DeleteOptions
{
DeleteFileLocation = true
}).ConfigureAwait(false);
hasChanges = true;
}
@ -380,7 +384,11 @@ namespace MediaBrowser.Providers.TV
{
_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;
}

7
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
Unescape View File

@ -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
{

10
MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
Unescape View File

@ -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)
{

Write Preview
Loading…
Cancel
Save