Modified Selectives.IsSelected(ObjectInfo) to include the user's account, to properly...

[pithos-ms-client] / trunk / Pithos.Core / Agents / Uploader.cs

diff --git a/trunk/Pithos.Core/Agents/Uploader.cs b/trunk/Pithos.Core/Agents/Uploader.cs
index 094d2f9..7ac3dd3 100644 (file)
--- a/trunk/Pithos.Core/Agents/Uploader.cs
+++ b/trunk/Pithos.Core/Agents/Uploader.cs
@@ -260,7 +260,7 @@ namespace Pithos.Core.Agents
            \r
             using (StatusNotification.GetNotifier("Uploading {0}", "Finished Uploading {0}", fileInfo.Name))\r
             {\r
-                if (await WaitOrAbort(cloudFile, token)) \r
+                if (await WaitOrAbort(accountInfo,cloudFile, token)) \r
                     return;\r
 \r
                 var fullFileName = fileInfo.GetProperCapitalization();\r
@@ -278,14 +278,14 @@ namespace Pithos.Core.Agents
                 while (missingHashes.Count > 0)\r
                 {\r
 \r
-                    if (await WaitOrAbort(cloudFile, token))\r
+                    if (await WaitOrAbort(accountInfo,cloudFile, token))\r
                         return;\r
 \r
 \r
                     var buffer = new byte[accountInfo.BlockSize];\r
                     foreach (var missingHash in missingHashes)\r
                     {\r
-                        if (await WaitOrAbort(cloudFile, token))\r
+                        if (await WaitOrAbort(accountInfo,cloudFile, token))\r
                             return;\r
 \r
 \r
@@ -317,11 +317,11 @@ namespace Pithos.Core.Agents
             }\r
         }\r
 \r
-        private async Task<bool> WaitOrAbort(ObjectInfo cloudFile, CancellationToken token)\r
+        private async Task<bool> WaitOrAbort(AccountInfo account,ObjectInfo cloudFile, CancellationToken token)\r
         {\r
             token.ThrowIfCancellationRequested();\r
             await UnpauseEvent.WaitAsync();\r
-            var shouldAbort = !Selectives.IsSelected(cloudFile);\r
+            var shouldAbort = !Selectives.IsSelected(account,cloudFile);\r
             if (shouldAbort)\r
                 Log.InfoFormat("Aborting [{0}]",cloudFile.Uri);\r
             return shouldAbort;\r