Revision 77e10b4f trunk/Pithos.Core/Agents/NetworkAgent.cs

b/trunk/Pithos.Core/Agents/NetworkAgent.cs
352 352
                        var remote = from info in remoteObjects.Union(sharedObjects)
353 353
                                     let name = info.Name
354 354
                                     where !name.EndsWith(".ignore", StringComparison.InvariantCultureIgnoreCase) &&
355
                                           !name.StartsWith("fragments/", StringComparison.InvariantCultureIgnoreCase)
355
                                           !name.StartsWith(FolderConstants.CacheFolder +"/", StringComparison.InvariantCultureIgnoreCase)
356 356
                                     select info;
357 357

  
358 358
                        //Create a list of actions from the remote files
......
557 557
                if (gate.Failed)
558 558
                    yield break;
559 559
                //The file's hashmap will be stored in the same location with the extension .hashmap
560
                //var hashPath = Path.Combine(FileAgent.FragmentsPath, relativePath + ".hashmap");
560
                //var hashPath = Path.Combine(FileAgent.CachePath, relativePath + ".hashmap");
561 561
                
562 562
                var client = new CloudFilesClient(accountInfo);
563 563
                var account = cloudFile.Account;
......
623 623
            //Calculate the relative file path for the new file
624 624
            var relativePath = relativeUrl.RelativeUriToFilePath();
625 625
            //The file will be stored in a temporary location while downloading with an extension .download
626
            var tempPath = Path.Combine(fileAgent.FragmentsPath, relativePath + ".download");
626
            var tempPath = Path.Combine(fileAgent.CachePath, relativePath + ".download");
627 627
            //Make sure the target folder exists. DownloadFileTask will not create the folder
628 628
            var tempFolder = Path.GetDirectoryName(tempPath);
629 629
            if (!Directory.Exists(tempFolder))
......
689 689
            
690 690
            //Calculate the relative file path for the new file
691 691
            var relativePath = relativeUrl.RelativeUriToFilePath();
692
            var blockUpdater = new BlockUpdater(fileAgent.FragmentsPath, localPath, relativePath, serverHash);
692
            var blockUpdater = new BlockUpdater(fileAgent.CachePath, localPath, relativePath, serverHash);
693 693

  
694 694
            
695 695
                        

Also available in: Unified diff