aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-02 18:45:21 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-02 18:45:21 -0500
commitb2548a83b6adfb67bf9678de0aeda0532b062f0d (patch)
treeb2659f1c0079e89b092b5956d652cf29c0afebbd
parent3cdfd57ee07615392eec782c6af735fe665a44b2 (diff)
restore changes
-rw-r--r--MediaBrowser.Api/System/SystemService.cs11
-rw-r--r--MediaBrowser.Providers/Manager/ItemImageProvider.cs8
2 files changed, 18 insertions, 1 deletions
diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs
index 3f2b3d66a..9b6b6a7d6 100644
--- a/MediaBrowser.Api/System/SystemService.cs
+++ b/MediaBrowser.Api/System/SystemService.cs
@@ -32,6 +32,12 @@ namespace MediaBrowser.Api.System
}
+ [Route("/System/Ping", "POST")]
+ public class PingSystem : IReturnVoid
+ {
+
+ }
+
/// <summary>
/// Class RestartApplication
/// </summary>
@@ -104,6 +110,11 @@ namespace MediaBrowser.Api.System
_security = security;
}
+ public object Post(PingSystem request)
+ {
+ return _appHost.Name;
+ }
+
public object Get(GetServerLogs request)
{
List<FileSystemMetadata> files;
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
index 19f575d0d..f99aa967f 100644
--- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs
+++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
@@ -359,12 +359,13 @@ namespace MediaBrowser.Providers.Manager
private void ClearImages(IHasImages item, ImageType type)
{
var deleted = false;
+ var deletedImages = new List<ItemImageInfo>();
foreach (var image in item.GetImages(type).ToList())
{
if (!image.IsLocalFile)
{
- // TODO: Need to get this image removed
+ deletedImages.Add(image);
continue;
}
@@ -384,6 +385,11 @@ namespace MediaBrowser.Providers.Manager
}
}
+ foreach (var image in deletedImages)
+ {
+ item.RemoveImage(image);
+ }
+
if (deleted)
{
item.ValidateImages(new DirectoryService(_logger, _fileSystem));