X-Git-Url: https://code.grnet.gr/git/pithos-ms-client/blobdiff_plain/9d2c0fc0f8e6e2637292de08b358bf71538dc5e0..0a9d4d1838a4783c898ec6e10a5cec1fec045b63:/trunk/Pithos.Core/Agents/NetworkAgent.cs diff --git a/trunk/Pithos.Core/Agents/NetworkAgent.cs b/trunk/Pithos.Core/Agents/NetworkAgent.cs index 47c4c37..0bdddd1 100644 --- a/trunk/Pithos.Core/Agents/NetworkAgent.cs +++ b/trunk/Pithos.Core/Agents/NetworkAgent.cs @@ -65,17 +65,34 @@ namespace Pithos.Core.Agents private Agent _agent; [System.ComponentModel.Composition.Import] - private DeleteAgent _deleteAgent=new DeleteAgent(); + private DeleteAgent DeleteAgent { get; set; } [System.ComponentModel.Composition.Import] public IStatusKeeper StatusKeeper { get; set; } - - public IStatusNotification StatusNotification { get; set; } + + private IStatusNotification _statusNotification; + public IStatusNotification StatusNotification + { + get { return _statusNotification; } + set + { + _statusNotification = value; + DeleteAgent.StatusNotification = value; + Uploader.StatusNotification = value; + Downloader.StatusNotification = value; + } + } [System.ComponentModel.Composition.Import] public IPithosSettings Settings { get; set; } + [System.ComponentModel.Composition.Import] + public Uploader Uploader { get; set; } + + [System.ComponentModel.Composition.Import] + public Downloader Downloader { 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 @@ -89,12 +106,18 @@ namespace Pithos.Core.Agents public void Start() { + if (_agent != null) + return; + + if (Log.IsDebugEnabled) + Log.Debug("Starting Network Agent"); + _agent = Agent.Start(inbox => { Action loop = null; loop = () => { - _deleteAgent.ProceedEvent.Wait(); + DeleteAgent.ProceedEvent.Wait(); var message = inbox.Receive(); var process=message.Then(Process,inbox.CancellationToken); inbox.LoopAsync(process, loop); @@ -115,7 +138,7 @@ namespace Pithos.Core.Agents - using (log4net.ThreadContext.Stacks["Operation"].Push(action.ToString())) + using (ThreadContext.Stacks["Operation"].Push(action.ToString())) { var cloudFile = action.CloudFile; @@ -123,16 +146,17 @@ namespace Pithos.Core.Agents try { + StatusNotification.SetPithosStatus(PithosStatus.LocalSyncing,"Processing"); _proceedEvent.Reset(); - //UpdateStatus(PithosStatus.Syncing); + var accountInfo = action.AccountInfo; if (action.Action == CloudActionType.DeleteCloud) { //Redirect deletes to the delete agent - _deleteAgent.Post((CloudDeleteAction)action); + DeleteAgent.Post((CloudDeleteAction)action); } - if (_deleteAgent.IsDeletedFile(action)) + if (DeleteAgent.IsDeletedFile(action)) { //Clear the status of already deleted files to avoid reprocessing if (action.LocalFile != null) @@ -144,10 +168,10 @@ namespace Pithos.Core.Agents { case CloudActionType.UploadUnconditional: //Abort if the file was deleted before we reached this point - await UploadCloudFile(action); + await Uploader.UploadCloudFile(action); break; case CloudActionType.DownloadUnconditional: - await DownloadCloudFile(accountInfo, cloudFile, downloadPath); + await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath); break; case CloudActionType.RenameCloud: var moveAction = (CloudMoveAction)action; @@ -159,7 +183,7 @@ namespace Pithos.Core.Agents case CloudActionType.MustSynch: if (!File.Exists(downloadPath) && !Directory.Exists(downloadPath)) { - await DownloadCloudFile(accountInfo, cloudFile, downloadPath); + await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath); } else { @@ -171,10 +195,21 @@ namespace Pithos.Core.Agents Log.InfoFormat("End Processing {0}:{1}->{2}", action.Action, action.LocalFile, action.CloudFile.Name); } +/* catch (WebException exc) - { + { Log.ErrorFormat("[WEB ERROR] {0} : {1} -> {2} due to exception\r\n{3}", action.Action, action.LocalFile, action.CloudFile, exc); + + + //Actions that resulted in server errors should be retried + var response = exc.Response as HttpWebResponse; + if (response != null && response.StatusCode >= HttpStatusCode.InternalServerError) + { + _agent.Post(action); + Log.WarnFormat("[REQUEUE] {0} : {1} -> {2}", action.Action, action.LocalFile, action.CloudFile); + } } +*/ catch (OperationCanceledException) { throw; @@ -204,7 +239,7 @@ namespace Pithos.Core.Agents { if (_agent.IsEmpty) _proceedEvent.Set(); - UpdateStatus(PithosStatus.InSynch); + UpdateStatus(PithosStatus.LocalComplete); } } } @@ -212,8 +247,8 @@ namespace Pithos.Core.Agents private void UpdateStatus(PithosStatus status) { - StatusKeeper.SetPithosStatus(status); - StatusNotification.Notify(new Notification()); + StatusNotification.SetPithosStatus(status); + //StatusNotification.Notify(new Notification()); } private void RenameLocalFile(AccountInfo accountInfo, CloudAction action) @@ -258,8 +293,8 @@ namespace Pithos.Core.Agents FileInfoExtensions.GetProperFilePathCapitalization(previousFile.FullName): FileInfoExtensions.GetProperDirectoryCapitalization(previousFile.FullName); - using (var gateOld = NetworkGate.Acquire(previousFullPath, NetworkOperation.Renaming)) - using (var gateNew = NetworkGate.Acquire(newPath,NetworkOperation.Renaming)) + using (NetworkGate.Acquire(previousFullPath, NetworkOperation.Renaming)) + using (NetworkGate.Acquire(newPath,NetworkOperation.Renaming)) using (new SessionScope(FlushAction.Auto)) { if (isFile) @@ -271,7 +306,7 @@ namespace Pithos.Core.Agents var state = StatusKeeper.GetStateByFilePath(previousFullPath); state.FilePath = newPath; state.SaveCopy(); - StatusKeeper.SetFileState(previousFullPath,FileStatus.Deleted,FileOverlayStatus.Deleted); + StatusKeeper.SetFileState(previousFullPath,FileStatus.Deleted,FileOverlayStatus.Deleted, "Deleted"); } } @@ -291,23 +326,22 @@ namespace Pithos.Core.Agents using (ThreadContext.Stacks["Operation"].Push("SyncFiles")) { - var localFile = action.LocalFile; + //var localFile = action.LocalFile; var cloudFile = action.CloudFile; var downloadPath = action.LocalFile.GetProperCapitalization(); var cloudHash = cloudFile.Hash.ToLower(); var previousCloudHash = cloudFile.PreviousHash.ToLower(); - var localHash = action.LocalHash.Value.ToLower(); - var topHash = action.TopHash.Value.ToLower(); + var localHash = action.TreeHash.Value.TopHash.ToHashString();// LocalHash.Value.ToLower(); + //var topHash = action.TopHash.Value.ToLower(); //At this point we know that an object has changed on the server and that a local //file already exists. We need to decide whether the file has only changed on //the server or there is a conflicting change on the client. // - //Not enough to compare only the local hashes (MD5), also have to compare the tophashes - //If any of the hashes match, we are done - if ((cloudHash == localHash || cloudHash == topHash)) + //If the hashes match, we are done + if (cloudFile != ObjectInfo.Empty && cloudHash == localHash) { Log.InfoFormat("Skipping {0}, hashes match", downloadPath); return; @@ -318,18 +352,18 @@ namespace Pithos.Core.Agents // If the previous tophash matches the local tophash, the file was only changed on the server. if (localHash == previousCloudHash) { - await DownloadCloudFile(accountInfo, cloudFile, downloadPath); + await Downloader.DownloadCloudFile(accountInfo, cloudFile, downloadPath); } else { //If the previous and local hash don't match, there was a local conflict //that was not uploaded to the server. We have a conflict - ReportConflict(downloadPath); + ReportConflictForMismatch(downloadPath); } } } - private void ReportConflict(string downloadPath) + private void ReportConflictForMismatch(string downloadPath) { if (String.IsNullOrWhiteSpace(downloadPath)) throw new ArgumentNullException("downloadPath"); @@ -350,13 +384,15 @@ namespace Pithos.Core.Agents throw new ArgumentException("The CloudAction.AccountInfo is empty","cloudAction"); Contract.EndContractBlock(); - _deleteAgent.ProceedEvent.Wait(); + DeleteAgent.ProceedEvent.Wait(); +/* //If the action targets a local file, add a treehash calculation if (!(cloudAction is CloudDeleteAction) && cloudAction.LocalFile as FileInfo != null) { var accountInfo = cloudAction.AccountInfo; var localFile = (FileInfo) cloudAction.LocalFile; + if (localFile.Length > accountInfo.BlockSize) cloudAction.TopHash = new Lazy(() => Signature.CalculateTreeHashAsync(localFile, @@ -367,15 +403,17 @@ namespace Pithos.Core.Agents { cloudAction.TopHash = new Lazy(() => cloudAction.LocalHash.Value); } + } else { //The hash for a directory is the empty string cloudAction.TopHash = new Lazy(() => String.Empty); } +*/ if (cloudAction is CloudDeleteAction) - _deleteAgent.Post((CloudDeleteAction)cloudAction); + DeleteAgent.Post((CloudDeleteAction)cloudAction); else _agent.Post(cloudAction); } @@ -388,18 +426,13 @@ namespace Pithos.Core.Agents public Task GetDeleteAwaiter() { - return _deleteAgent.ProceedEvent.WaitAsync(); + return DeleteAgent.ProceedEvent.WaitAsync(); } public CancellationToken CancellationToken { get { return _agent.CancellationToken; } } - private static FileAgent GetFileAgent(AccountInfo accountInfo) - { - return AgentLocator.Get(accountInfo.AccountPath); - } - private void RenameCloudFile(AccountInfo accountInfo,CloudMoveAction action) @@ -452,451 +485,8 @@ namespace Pithos.Core.Agents } } - //Download a file. - private async Task DownloadCloudFile(AccountInfo accountInfo, ObjectInfo cloudFile , string filePath) - { - if (accountInfo == null) - throw new ArgumentNullException("accountInfo"); - if (cloudFile == null) - throw new ArgumentNullException("cloudFile"); - if (String.IsNullOrWhiteSpace(cloudFile.Account)) - throw new ArgumentNullException("cloudFile"); - if (String.IsNullOrWhiteSpace(cloudFile.Container)) - throw new ArgumentNullException("cloudFile"); - if (String.IsNullOrWhiteSpace(filePath)) - throw new ArgumentNullException("filePath"); - if (!Path.IsPathRooted(filePath)) - throw new ArgumentException("The filePath must be rooted", "filePath"); - Contract.EndContractBlock(); - - using (ThreadContext.Stacks["Operation"].Push("DownloadCloudFile")) - { - - var localPath = Interfaces.FileInfoExtensions.GetProperFilePathCapitalization(filePath); - var relativeUrl = new Uri(cloudFile.Name, UriKind.Relative); - - var url = relativeUrl.ToString(); - if (cloudFile.Name.EndsWith(".ignore", StringComparison.InvariantCultureIgnoreCase)) - return; - - - //Are we already downloading or uploading the file? - using (var gate = NetworkGate.Acquire(localPath, NetworkOperation.Downloading)) - { - if (gate.Failed) - return; - - var client = new CloudFilesClient(accountInfo); - var account = cloudFile.Account; - var container = cloudFile.Container; - - if (cloudFile.Content_Type == @"application/directory") - { - if (!Directory.Exists(localPath)) - Directory.CreateDirectory(localPath); - } - else - { - //Retrieve the hashmap from the server - var serverHash = await client.GetHashMap(account, container, url); - //If it's a small file - if (serverHash.Hashes.Count == 1) - //Download it in one go - await - DownloadEntireFileAsync(accountInfo, client, cloudFile, relativeUrl, localPath, - serverHash); - //Otherwise download it block by block - else - await DownloadWithBlocks(accountInfo, client, cloudFile, relativeUrl, localPath, serverHash); - - if (cloudFile.AllowedTo == "read") - { - var attributes = File.GetAttributes(localPath); - File.SetAttributes(localPath, attributes | FileAttributes.ReadOnly); - } - } - //Now we can store the object's metadata without worrying about ghost status entries - StatusKeeper.StoreInfo(localPath, cloudFile); - } - } - } - - //Download a small file with a single GET operation - private async Task DownloadEntireFileAsync(AccountInfo accountInfo, CloudFilesClient client, ObjectInfo cloudFile, Uri relativeUrl, string filePath,TreeHash serverHash) - { - if (client == null) - throw new ArgumentNullException("client"); - if (cloudFile==null) - throw new ArgumentNullException("cloudFile"); - if (relativeUrl == null) - throw new ArgumentNullException("relativeUrl"); - if (String.IsNullOrWhiteSpace(filePath)) - throw new ArgumentNullException("filePath"); - if (!Path.IsPathRooted(filePath)) - throw new ArgumentException("The localPath must be rooted", "filePath"); - Contract.EndContractBlock(); - - var localPath = Pithos.Interfaces.FileInfoExtensions.GetProperFilePathCapitalization(filePath); - //If the file already exists - if (File.Exists(localPath)) - { - //First check with MD5 as this is a small file - var localMD5 = Signature.CalculateMD5(localPath); - var cloudHash=serverHash.TopHash.ToHashString(); - if (localMD5==cloudHash) - return; - //Then check with a treehash - var localTreeHash = Signature.CalculateTreeHash(localPath, serverHash.BlockSize, serverHash.BlockHash); - var localHash = localTreeHash.TopHash.ToHashString(); - if (localHash==cloudHash) - return; - } - StatusNotification.Notify(new CloudNotification { Data = cloudFile }); - - var fileAgent = GetFileAgent(accountInfo); - //Calculate the relative file path for the new file - var relativePath = relativeUrl.RelativeUriToFilePath(); - //The file will be stored in a temporary location while downloading with an extension .download - var tempPath = Path.Combine(fileAgent.CachePath, relativePath + ".download"); - //Make sure the target folder exists. DownloadFileTask will not create the folder - var tempFolder = Path.GetDirectoryName(tempPath); - if (!Directory.Exists(tempFolder)) - Directory.CreateDirectory(tempFolder); - - //Download the object to the temporary location - await client.GetObject(cloudFile.Account, cloudFile.Container, relativeUrl.ToString(), tempPath); - - //Create the local folder if it doesn't exist (necessary for shared objects) - var localFolder = Path.GetDirectoryName(localPath); - if (!Directory.Exists(localFolder)) - Directory.CreateDirectory(localFolder); - //And move it to its actual location once downloading is finished - if (File.Exists(localPath)) - File.Replace(tempPath,localPath,null,true); - else - File.Move(tempPath,localPath); - //Notify listeners that a local file has changed - StatusNotification.NotifyChangedFile(localPath); - - - } - - //Download a file asynchronously using blocks - public async Task DownloadWithBlocks(AccountInfo accountInfo, CloudFilesClient client, ObjectInfo cloudFile, Uri relativeUrl, string filePath, TreeHash serverHash) - { - if (client == null) - throw new ArgumentNullException("client"); - if (cloudFile == null) - throw new ArgumentNullException("cloudFile"); - if (relativeUrl == null) - throw new ArgumentNullException("relativeUrl"); - if (String.IsNullOrWhiteSpace(filePath)) - throw new ArgumentNullException("filePath"); - if (!Path.IsPathRooted(filePath)) - throw new ArgumentException("The filePath must be rooted", "filePath"); - if (serverHash == null) - throw new ArgumentNullException("serverHash"); - Contract.EndContractBlock(); - - var fileAgent = GetFileAgent(accountInfo); - var localPath = Interfaces.FileInfoExtensions.GetProperFilePathCapitalization(filePath); - - //Calculate the relative file path for the new file - var relativePath = relativeUrl.RelativeUriToFilePath(); - var blockUpdater = new BlockUpdater(fileAgent.CachePath, localPath, relativePath, serverHash); - - - - //Calculate the file's treehash - var treeHash = await Signature.CalculateTreeHashAsync(localPath, serverHash.BlockSize, serverHash.BlockHash, 2); - - //And compare it with the server's hash - var upHashes = serverHash.GetHashesAsStrings(); - var localHashes = treeHash.HashDictionary; - ReportDownloadProgress(Path.GetFileName(localPath),0,upHashes.Length,cloudFile.Bytes); - for (int i = 0; i < upHashes.Length; i++) - { - //For every non-matching hash - var upHash = upHashes[i]; - if (!localHashes.ContainsKey(upHash)) - { - StatusNotification.Notify(new CloudNotification { Data = cloudFile }); - - if (blockUpdater.UseOrphan(i, upHash)) - { - Log.InfoFormat("[BLOCK GET] ORPHAN FOUND for {0} of {1} for {2}", i, upHashes.Length, localPath); - continue; - } - Log.InfoFormat("[BLOCK GET] START {0} of {1} for {2}", i, upHashes.Length, localPath); - var start = i*serverHash.BlockSize; - //To download the last block just pass a null for the end of the range - long? end = null; - if (i < upHashes.Length - 1 ) - end= ((i + 1)*serverHash.BlockSize) ; - - //Download the missing block - var block = await client.GetBlock(cloudFile.Account, cloudFile.Container, relativeUrl, start, end); - - //and store it - blockUpdater.StoreBlock(i, block); - - - Log.InfoFormat("[BLOCK GET] FINISH {0} of {1} for {2}", i, upHashes.Length, localPath); - } - ReportDownloadProgress(Path.GetFileName(localPath), i, upHashes.Length, cloudFile.Bytes); - } - - //Want to avoid notifications if no changes were made - var hasChanges = blockUpdater.HasBlocks; - blockUpdater.Commit(); - - if (hasChanges) - //Notify listeners that a local file has changed - StatusNotification.NotifyChangedFile(localPath); - - Log.InfoFormat("[BLOCK GET] COMPLETE {0}", localPath); - } - - - private async Task UploadCloudFile(CloudAction action) - { - if (action == null) - throw new ArgumentNullException("action"); - Contract.EndContractBlock(); - using(ThreadContext.Stacks["Operation"].Push("UploadCloudFile")) - { - try - { - - var accountInfo = action.AccountInfo; - - var fileInfo = action.LocalFile; - - if (fileInfo.Extension.Equals("ignore", StringComparison.InvariantCultureIgnoreCase)) - return; - //Do not upload files in conflict - if (action.FileState.FileStatus == FileStatus.Conflict ) - { - Log.InfoFormat("Skipping file in conflict [{0}]",fileInfo.FullName); - return; - } - if (action.FileState.FileStatus == FileStatus.Forbidden) - { - Log.InfoFormat("Skipping forbidden file [{0}]",fileInfo.FullName); - return; - } - - var relativePath = fileInfo.AsRelativeTo(accountInfo.AccountPath); - if (relativePath.StartsWith(FolderConstants.OthersFolder)) - { - var parts = relativePath.Split('\\'); - var accountName = parts[1]; - var oldName = accountInfo.UserName; - var absoluteUri = accountInfo.StorageUri.AbsoluteUri; - var nameIndex = absoluteUri.IndexOf(oldName, StringComparison.Ordinal); - var root = absoluteUri.Substring(0, nameIndex); - - accountInfo = new AccountInfo - { - UserName = accountName, - AccountPath = Path.Combine(accountInfo.AccountPath, parts[0], parts[1]), - StorageUri = new Uri(root + accountName), - BlockHash = accountInfo.BlockHash, - BlockSize = accountInfo.BlockSize, - Token = accountInfo.Token - }; - } - - - var fullFileName = fileInfo.GetProperCapitalization(); - using (var gate = NetworkGate.Acquire(fullFileName, NetworkOperation.Uploading)) - { - //Abort if the file is already being uploaded or downloaded - if (gate.Failed) - return; - - var cloudFile = action.CloudFile; - var account = cloudFile.Account ?? accountInfo.UserName; - try - { - - var client = new CloudFilesClient(accountInfo); - //Even if GetObjectInfo times out, we can proceed with the upload - var info = client.GetObjectInfo(account, cloudFile.Container, cloudFile.Name); - - //If this is a read-only file, do not upload changes - if (info.AllowedTo == "read") - return; - - //TODO: Check how a directory hash is calculated -> All dirs seem to have the same hash - if (fileInfo is DirectoryInfo) - { - //If the directory doesn't exist the Hash property will be empty - if (String.IsNullOrWhiteSpace(info.Hash)) - //Go on and create the directory - await - client.PutObject(account, cloudFile.Container, cloudFile.Name, fullFileName, - String.Empty, "application/directory"); - } - else - { - - var cloudHash = info.Hash.ToLower(); - - var hash = action.LocalHash.Value; - var topHash = action.TopHash.Value; - - //If the file hashes match, abort the upload - if (hash == cloudHash || topHash == cloudHash) - { - //but store any metadata changes - StatusKeeper.StoreInfo(fullFileName, info); - Log.InfoFormat("Skip upload of {0}, hashes match", fullFileName); - return; - } - - - //Mark the file as modified while we upload it - StatusKeeper.SetFileOverlayStatus(fullFileName, FileOverlayStatus.Modified); - //And then upload it - - //Upload even small files using the Hashmap. The server may already contain - //the relevant block - - //First, calculate the tree hash - var treeHash = await Signature.CalculateTreeHashAsync(fullFileName, accountInfo.BlockSize, - accountInfo.BlockHash, 2); - - //TODO: If the upload fails with a 403, abort it and mark conflict - - await - UploadWithHashMap(accountInfo, cloudFile, fileInfo as FileInfo, cloudFile.Name, treeHash); - } - //If everything succeeds, change the file and overlay status to normal - StatusKeeper.SetFileState(fullFileName, FileStatus.Unchanged, FileOverlayStatus.Normal); - } - catch (WebException exc) - { - var response=(exc.Response as HttpWebResponse); - if (response.StatusCode == HttpStatusCode.Forbidden) - { - StatusKeeper.SetFileState(fileInfo.FullName,FileStatus.Forbidden, FileOverlayStatus.Conflict); - } - } - } - //Notify the Shell to update the overlays - NativeMethods.RaiseChangeNotification(fullFileName); - StatusNotification.NotifyChangedFile(fullFileName); - } - catch (AggregateException ex) - { - var exc = ex.InnerException as WebException; - if (exc == null) - throw ex.InnerException; - if (HandleUploadWebException(action, exc)) - return; - throw; - } - catch (WebException ex) - { - if (HandleUploadWebException(action, ex)) - return; - throw; - } - catch (Exception ex) - { - Log.Error("Unexpected error while uploading file", ex); - throw; - } - } - } - - - - private bool HandleUploadWebException(CloudAction action, WebException exc) - { - var response = exc.Response as HttpWebResponse; - if (response == null) - throw exc; - if (response.StatusCode == HttpStatusCode.Unauthorized) - { - Log.Error("Not allowed to upload file", exc); - var message = String.Format("Not allowed to uplad file {0}", action.LocalFile.FullName); - StatusKeeper.SetFileState(action.LocalFile.FullName, FileStatus.Unchanged, FileOverlayStatus.Normal); - StatusNotification.NotifyChange(message, TraceLevel.Warning); - return true; - } - return false; - } - - public async Task UploadWithHashMap(AccountInfo accountInfo,ObjectInfo cloudFile,FileInfo fileInfo,string url,TreeHash treeHash) - { - if (accountInfo == null) - throw new ArgumentNullException("accountInfo"); - if (cloudFile==null) - throw new ArgumentNullException("cloudFile"); - if (fileInfo == null) - throw new ArgumentNullException("fileInfo"); - if (String.IsNullOrWhiteSpace(url)) - throw new ArgumentNullException(url); - if (treeHash==null) - throw new ArgumentNullException("treeHash"); - if (String.IsNullOrWhiteSpace(cloudFile.Container) ) - throw new ArgumentException("Invalid container","cloudFile"); - Contract.EndContractBlock(); - - var fullFileName = fileInfo.GetProperCapitalization(); - - var account = cloudFile.Account ?? accountInfo.UserName; - var container = cloudFile.Container ; - - var client = new CloudFilesClient(accountInfo); - //Send the hashmap to the server - var missingHashes = await client.PutHashMap(account, container, url, treeHash); - int block = 0; - ReportUploadProgress(fileInfo.Name,block++, missingHashes.Count, fileInfo.Length); - //If the server returns no missing hashes, we are done - while (missingHashes.Count > 0) - { - - var buffer = new byte[accountInfo.BlockSize]; - foreach (var missingHash in missingHashes) - { - //Find the proper block - var blockIndex = treeHash.HashDictionary[missingHash]; - var offset = blockIndex*accountInfo.BlockSize; - - var read = fileInfo.Read(buffer, offset, accountInfo.BlockSize); - - try - { - //And upload the block - await client.PostBlock(account, container, buffer, 0, read); - Log.InfoFormat("[BLOCK] Block {0} of {1} uploaded", blockIndex, fullFileName); - } - catch (Exception exc) - { - Log.Error(String.Format("Uploading block {0} of {1}", blockIndex, fullFileName), exc); - } - ReportUploadProgress(fileInfo.Name,block++, missingHashes.Count, fileInfo.Length); - } - - //Repeat until there are no more missing hashes - missingHashes = await client.PutHashMap(account, container, url, treeHash); - } - ReportUploadProgress(fileInfo.Name, missingHashes.Count, missingHashes.Count, fileInfo.Length); - } - - private void ReportUploadProgress(string fileName,int block, int totalBlocks, long fileSize) - { - StatusNotification.Notify(new ProgressNotification(fileName,"Uploading",block,totalBlocks,fileSize) ); - } - private void ReportDownloadProgress(string fileName,int block, int totalBlocks, long fileSize) - { - StatusNotification.Notify(new ProgressNotification(fileName,"Downloading",block,totalBlocks,fileSize) ); - } }