/trunk/Pithos.Core/Agents/NetworkAgent.cs - Diff - Pithos MS Client - Greek Research and Technology Network's projects

Revision 2341c603 trunk/Pithos.Core/Agents/NetworkAgent.cs

     using System.Diagnostics;
     using System.Diagnostics.Contracts;
     using System.IO;
     using System.Linq;
     using System.Net;
     using System.Reflection;
     using System.Threading;
-...
             [System.ComponentModel.Composition.Import]
             public IPithosSettings Settings { get; set; }
             private Uploader _uploader;
             [System.ComponentModel.Composition.Import]
             public Uploader Uploader { get; set; }
             public Uploader Uploader
+            {
                 get { return _uploader; }
                 set
+                {
                     _uploader = value;
                     _uploader.UnpauseEvent = _unPauseEvent;
+                }
+            }
             private Downloader _downloader;
             [System.ComponentModel.Composition.Import]
             public Downloader Downloader { get; set; }
             public Downloader Downloader
+            {
                 get { return _downloader; }
                 set
+                {
                     _downloader = value;
                     _downloader.UnpauseEvent = _unPauseEvent;
+                }
+            }
             [System.ComponentModel.Composition.Import]
             public Selectives Selectives { get; set; }
             //The Proceed signals the poll agent that it can proceed with polling.
             //Essentially it stops the poll agent to give priority to the network agent
             //Initially the event is signalled because we don't need to pause
             private readonly AsyncManualResetEvent _proceedEvent = new AsyncManualResetEvent(true);
             private Agents.Selectives _selectives;
             private bool _pause;
             public AsyncManualResetEvent ProceedEvent
+            {
                 get { return _proceedEvent; }
+            }
             private readonly AsyncManualResetEvent _unPauseEvent = new AsyncManualResetEvent(true);
             private CancellationTokenSource _currentOperationCancellation=new CancellationTokenSource();
             public void CancelCurrentOperation()
+            {
                 //What does it mean to cancel the current upload/download?
                 //Obviously, the current operation will be cancelled by throwing
                 //a cancellation exception.
                 //
                 //The default behavior is to retry any operations that throw.
                 //Obviously this is not what we want in this situation.
                 //The cancelled operation should NOT bea retried.
                 //
                 //This can be done by catching the cancellation exception
                 //and avoiding the retry.
                 //
                 //Have to reset the cancellation source - it is not possible to reset the source
                 //Have to prevent a case where an operation requests a token from the old source
                 var oldSource = Interlocked.Exchange(ref _currentOperationCancellation, new CancellationTokenSource());
                 oldSource.Cancel();
+            }
             public void Start()
+            {
-...
                     loop = () =>
+                    {
                         DeleteAgent.ProceedEvent.Wait();
                         _unPauseEvent.Wait();
                         var message = inbox.Receive();
                         var process=message.Then(Process,inbox.CancellationToken);
                         inbox.LoopAsync(process, loop);
-...
+                            {
                                 case CloudActionType.UploadUnconditional:
                                     //Abort if the file was deleted before we reached this point
                                     await Uploader.UploadCloudFile(action);
                                     await Uploader.UploadCloudFile(action,CurrentOperationCancelToken);
                                     break;
                                 case CloudActionType.DownloadUnconditional:
                                     await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath);
                                     await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath, CurrentOperationCancelToken);
                                     break;
                                 case CloudActionType.RenameCloud:
                                     var moveAction = (CloudMoveAction)action;
-...
                                 case CloudActionType.MustSynch:
                                     if (!File.Exists(downloadPath) && !Directory.Exists(downloadPath))
+                                    {
                                         await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath);
                                         await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath, CurrentOperationCancelToken);
+                                    }
                                     else
+                                    {
-...
+                        }
+                    }
     */
                     catch (OperationCanceledException)
+                    {
                         throw;
                     catch (OperationCanceledException ex)
+                    {
                         Log.WarnFormat("Cancelling [{0}]",ex);
+                    }
                     catch (DirectoryNotFoundException)
+                    {
-...
+                }
+            }
             private CancellationToken CurrentOperationCancelToken
+            {
                 get { return _currentOperationCancellation.Token; }
+            }
             private void UpdateStatus(PithosStatus status)
+            {
-...
                     // If the previous tophash matches the local tophash, the file was only changed on the server.
                     if (localHash == previousCloudHash)
+                    {
                         await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath);
                         await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath, CurrentOperationCancelToken);
+                    }
                     else
+                    {
-...
                 get { return _agent.CancellationToken; }
+            }
             public bool Pause
+            {
                 get {
                     return _pause;
+                }
                 set {
                     _pause = value;
                     if (_pause)
                         _unPauseEvent.Reset();
                     else
+                    {
                         _unPauseEvent.Set();
+                    }
+                }
+            }
             private void RenameCloudFile(AccountInfo accountInfo,CloudMoveAction action)
-...
+            }
+        }

Also available in: Unified diff

Synnefo » Pithos MS Client

Revision 2341c603 trunk/Pithos.Core/Agents/NetworkAgent.cs