Fix for missing directories

[pithos-ms-client] / trunk / Pithos.Network / CloudFilesClient.cs

diff --git a/trunk/Pithos.Network/CloudFilesClient.cs b/trunk/Pithos.Network/CloudFilesClient.cs
index fb5ba71..9d4bc06 100644 (file)
--- a/trunk/Pithos.Network/CloudFilesClient.cs
+++ b/trunk/Pithos.Network/CloudFilesClient.cs
@@ -46,7 +46,6 @@
 
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel.Composition;
@@ -243,7 +242,7 @@ namespace Pithos.Network
             }
 
             Log.InfoFormat("[AUTHENTICATE] End for {0}", UserName);
-            
+            Debug.Assert(_baseClient!=null);
 
             return new AccountInfo {StorageUri = StorageUrl, Token = Token, UserName = UserName,Groups=groups};            
 
@@ -511,10 +510,13 @@ namespace Pithos.Network
                     client.Headers.Add("X-Object-Public", isPublic);
 
 
-                    var uriBuilder = client.GetAddressBuilder(objectInfo.Container, objectInfo.Name);
-                    var uri = uriBuilder.Uri;
-
-                    client.UploadValues(uri,new NameValueCollection());
+                    /*var uriBuilder = client.GetAddressBuilder(objectInfo.Container, objectInfo.Name);
+                    uriBuilder.Query = "update=";
+                    var uri = uriBuilder.Uri.MakeRelativeUri(this.RootAddressUri);*/
+                    var address = String.Format("{0}/{1}?update=",objectInfo.Container, objectInfo.Name);
+                    client.PostWithRetry(address,"application/xml");
+                    
+                    //client.UploadValues(uri,new NameValueCollection());
 
 
                     client.AssertStatusOK("UpdateMetadata failed");
@@ -794,7 +796,8 @@ namespace Pithos.Network
                                                    ContentEncoding=client.GetHeaderValue("Content-Encoding",true),
                                                    ContendDisposition = client.GetHeaderValue("Content-Disposition",true),
                                                    Manifest=client.GetHeaderValue("X-Object-Manifest",true),
-                                                   PublicUrl=client.GetHeaderValue("X-Object-Public",true),                                                   
+                                                   PublicUrl=client.GetHeaderValue("X-Object-Public",true),  
+                                                   StorageUri=this.StorageUrl,
                                                };
                                 info.SetPermissions(permissions);
                                 return info;
@@ -873,6 +876,7 @@ namespace Pithos.Network
                                                 {
                                                     Account=account,
                                                     Name = container,
+                                                    StorageUrl=this.StorageUrl.ToString(),
                                                     Count =
                                                         long.Parse(client.GetHeaderValue("X-Container-Object-Count")),
                                                     Bytes = long.Parse(client.GetHeaderValue("X-Container-Bytes-Used")),
@@ -1036,7 +1040,8 @@ namespace Pithos.Network
             client.Headers[HttpRequestHeader.ContentType] = "application/octet-stream";
             var jsonHash = hash.ToJson();
             var uploadTask=client.UploadStringTask(uri, "PUT", jsonHash);
-            
+            if (Log.IsDebugEnabled)
+                Log.DebugFormat("Hashes:\r\n{0}", jsonHash);
             return uploadTask.ContinueWith(t =>
             {
 
@@ -1060,9 +1065,8 @@ namespace Pithos.Network
                     {
                         //In case of 409 the missing parts will be in the response content                        
                         using (var stream = response.GetResponseStream())
-                        using(var reader=new StreamReader(stream))
+                        using(var reader=stream.GetLoggedReader(Log))
                         {
-                            Debug.Assert(stream.Position == 0);
                             //We used to have to cleanup the content before returning it because it contains
                             //error content after the list of hashes
                             //
@@ -1070,15 +1074,17 @@ namespace Pithos.Network
                             //line by line
                             
                             var serializer = new JsonSerializer();                            
-                            var hashes=(List<string>)serializer.Deserialize(reader, typeof (List<string>));
-
+                            serializer.Error += (sender, args) => Log.ErrorFormat("Deserialization error at [{0}] [{1}]", args.ErrorContext.Error, args.ErrorContext.Member);
+                            var hashes = (List<string>)serializer.Deserialize(reader, typeof(List<string>));
                             return hashes;
                         }                        
                     }                    
                     //Any other status code is unexpected and the exception should be rethrown
+                    Log.LogError(response);
                     throw ex;
                     
                 }
+
                 //Any other status code is unexpected but there was no exception. We can probably continue processing
                 Log.WarnFormat("Unexcpected status code when putting map: {0} - {1}",client.StatusCode,client.StatusDescription);                    
                 
@@ -1087,6 +1093,7 @@ namespace Pithos.Network
 
         }
 
+        
         public Task<byte[]> GetBlock(string account, string container, Uri relativeUrl, long start, long? end)
         {
             if (String.IsNullOrWhiteSpace(Token))
@@ -1247,7 +1254,6 @@ namespace Pithos.Network
             if (!File.Exists(fileName) && !Directory.Exists(fileName))
                 throw new FileNotFoundException("The file or directory does not exist",fileName);
 */
-            Contract.EndContractBlock();
             
             try
             {
@@ -1365,6 +1371,7 @@ namespace Pithos.Network
 
                 client.Headers.Add("X-Move-From", sourceUrl);
                 client.AllowedStatusCodes.Add(HttpStatusCode.NotFound);
+                Log.InfoFormat("[TRASH] [{0}] to [{1}]",sourceUrl,targetUrl);
                 client.PutWithRetry(targetUrl, 3);
 
                 var expectedCodes = new[] {HttpStatusCode.OK, HttpStatusCode.NoContent, HttpStatusCode.Created,HttpStatusCode.NotFound};
@@ -1386,6 +1393,39 @@ namespace Pithos.Network
             var directories=this.ListObjects(container.Account, container.Name, "/");
         }
 */
+
+        public bool CanUpload(string account, ObjectInfo cloudFile)
+        {
+            Contract.Requires(!String.IsNullOrWhiteSpace(account));
+            Contract.Requires(cloudFile!=null);
+
+            using (var client = new RestClient(_baseClient))
+            {
+                if (!String.IsNullOrWhiteSpace(account))
+                    client.BaseAddress = GetAccountUrl(account);
+
+
+                var parts = cloudFile.Name.Split('/');
+                var folder = String.Join("/", parts,0,parts.Length-1);
+
+                var fileUrl=String.Format("{0}/{1}/{2}.pithos.ignore",cloudFile.Container,folder,Guid.NewGuid());
+
+                client.Parameters.Clear();
+                try
+                {
+                    client.PutWithRetry(fileUrl, 3, @"application/octet-stream");
+
+                    var expectedCodes = new[] { HttpStatusCode.OK, HttpStatusCode.NoContent, HttpStatusCode.Created};
+                    var result=(expectedCodes.Contains(client.StatusCode));
+                    DeleteObject(account, cloudFile.Container, fileUrl);
+                    return result;
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+        }
     }
 
     public class ShareAccountInfo