sync updates

4 files changed, 42 insertions, 38 deletions

diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 509a274ee..5ceaa5f5b 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -47,7 +47,7 @@
   <ItemGroup>
     <Reference Include="ImageMagickSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ImageMagickSharp.1.0.0.2\lib\net45\ImageMagickSharp.dll</HintPath>
+      <HintPath>..\packages\ImageMagickSharp.1.0.0.3\lib\net45\ImageMagickSharp.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Naming, Version=1.0.5509.27636, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/MediaBrowser.Server.Implementations/Sync/CloudSyncProvider.cs b/MediaBrowser.Server.Implementations/Sync/CloudSyncProvider.cs
index 37caa561e..1ef9d4b15 100644
--- a/MediaBrowser.Server.Implementations/Sync/CloudSyncProvider.cs
+++ b/MediaBrowser.Server.Implementations/Sync/CloudSyncProvider.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Sync;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -39,21 +40,18 @@ namespace MediaBrowser.Server.Implementations.Sync
             return null;
         }
 
-        public Task<List<string>> GetServerItemIds(string serverId, SyncTarget target, CancellationToken cancellationToken)
+        public Task SendFile(string inputFile, string[] pathParts, SyncTarget target, IProgress<double> progress, CancellationToken cancellationToken)
         {
-            throw new NotImplementedException();
-        }
+            var provider = GetProvider(target);
 
-        public Task DeleteItem(string serverId, string itemId, SyncTarget target, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
+            return provider.SendFile(inputFile, pathParts, target, progress, cancellationToken);
         }
 
-        public Task TransferItemFile(string serverId, string itemId, string inputFile, string[] pathParts, SyncTarget target, CancellationToken cancellationToken)
+        public Task<Stream> GetFile(string[] pathParts, SyncTarget target, IProgress<double> progress, CancellationToken cancellationToken)
         {
             var provider = GetProvider(target);
 
-            return provider.TransferItemFile(serverId, itemId, inputFile, pathParts, target, cancellationToken);
+            return provider.GetFile(pathParts, target, progress, cancellationToken);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Sync/MediaSync.cs b/MediaBrowser.Server.Implementations/Sync/MediaSync.cs
index 349e6aa1d..764652bbf 100644
--- a/MediaBrowser.Server.Implementations/Sync/MediaSync.cs
+++ b/MediaBrowser.Server.Implementations/Sync/MediaSync.cs
@@ -23,7 +23,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             _appHost = appHost;
         }
 
-        public async Task Sync(IServerSyncProvider provider, 
+        public async Task Sync(IServerSyncProvider provider,
             SyncTarget target,
             IProgress<double> progress,
             CancellationToken cancellationToken)
@@ -53,28 +53,28 @@ namespace MediaBrowser.Server.Implementations.Sync
             SyncTarget target,
             CancellationToken cancellationToken)
         {
-            var localIds = await provider.GetServerItemIds(serverId, target, cancellationToken).ConfigureAwait(false);
-
-            var result = await _syncManager.SyncData(new SyncDataRequest
-            {
-                TargetId = target.Id,
-                LocalItemIds = localIds
-
-            }).ConfigureAwait(false);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            foreach (var itemIdToRemove in result.ItemIdsToRemove)
-            {
-                try
-                {
-                    await RemoveItem(provider, serverId, itemIdToRemove, target, cancellationToken).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    _logger.ErrorException("Error deleting item from sync target. Id: {0}", ex, itemIdToRemove);
-                }
-            }
+            //var localIds = await provider.GetServerItemIds(serverId, target, cancellationToken).ConfigureAwait(false);
+
+            //var result = await _syncManager.SyncData(new SyncDataRequest
+            //{
+            //    TargetId = target.Id,
+            //    LocalItemIds = localIds
+
+            //}).ConfigureAwait(false);
+
+            //cancellationToken.ThrowIfCancellationRequested();
+
+            //foreach (var itemIdToRemove in result.ItemIdsToRemove)
+            //{
+            //    try
+            //    {
+            //        await RemoveItem(provider, serverId, itemIdToRemove, target, cancellationToken).ConfigureAwait(false);
+            //    }
+            //    catch (Exception ex)
+            //    {
+            //        _logger.ErrorException("Error deleting item from sync target. Id: {0}", ex, itemIdToRemove);
+            //    }
+            //}
         }
 
         private async Task GetNewMedia(IServerSyncProvider provider,
@@ -83,8 +83,8 @@ namespace MediaBrowser.Server.Implementations.Sync
             IProgress<double> progress,
             CancellationToken cancellationToken)
         {
-            var jobItems =  await _syncManager.GetReadySyncItems(target.Id).ConfigureAwait(false);
-            
+            var jobItems = await _syncManager.GetReadySyncItems(target.Id).ConfigureAwait(false);
+
             var numComplete = 0;
             double startingPercent = 0;
             double percentPerItem = 1;
@@ -138,8 +138,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             {
                 string[] pathParts = GetPathParts(serverId, libraryItem);
 
-                await provider.TransferItemFile(serverId, libraryItem.Id, internalSyncJobItem.OutputPath, pathParts, target, cancellationToken)
-                        .ConfigureAwait(false);
+                await SendFile(provider, internalSyncJobItem.OutputPath, pathParts, target, cancellationToken).ConfigureAwait(false);
 
                 progress.Report(92);
 
@@ -171,12 +170,19 @@ namespace MediaBrowser.Server.Implementations.Sync
             SyncTarget target,
             CancellationToken cancellationToken)
         {
-            return provider.DeleteItem(serverId, itemId, target, cancellationToken);
+            return Task.FromResult(true);
+            //return provider.DeleteItem(serverId, itemId, target, cancellationToken);
         }
 
         private string[] GetPathParts(string serverId, BaseItemDto item)
         {
             return null;
         }
+
+        private async Task SendFile(IServerSyncProvider provider, string inputPath, string[] path, SyncTarget target, CancellationToken cancellationToken)
+        {
+            await provider.SendFile(inputPath, path, target, new Progress<double>(), cancellationToken)
+                    .ConfigureAwait(false);
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index 41df1b471..0112d0f75 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

-  <package id="ImageMagickSharp" version="1.0.0.2" targetFramework="net45" />

+  <package id="ImageMagickSharp" version="1.0.0.3" targetFramework="net45" />

   <package id="MediaBrowser.Naming" version="1.0.0.32" targetFramework="net45" />

   <package id="Mono.Nat" version="1.2.21.0" targetFramework="net45" />

   <package id="morelinq" version="1.1.0" targetFramework="net45" />