Fix for missing directories
[pithos-ms-client] / trunk / Pithos.Network / CloudFilesClient.cs
index de253c0..9d4bc06 100644 (file)
@@ -1,40 +1,44 @@
-// -----------------------------------------------------------------------
-// <copyright file="CloudFilesClient.cs" company="GRNET">
-// Copyright 2011-2012 GRNET S.A. All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or
-// without modification, are permitted provided that the following
-// conditions are met:
-// 
-//   1. Redistributions of source code must retain the above
-//      copyright notice, this list of conditions and the following
-//      disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above
-//      copyright notice, this list of conditions and the following
-//      disclaimer in the documentation and/or other materials
-//      provided with the distribution.
-// 
-// THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
-// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-// USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-// 
-// The views and conclusions contained in the software and
-// documentation are those of the authors and should not be
-// interpreted as representing official policies, either expressed
-// or implied, of GRNET S.A.
-// </copyright>
-// -----------------------------------------------------------------------
-
+#region
+/* -----------------------------------------------------------------------
+ * <copyright file="CloudFilesClient.cs" company="GRNet">
+ * 
+ * Copyright 2011-2012 GRNET S.A. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials
+ *      provided with the distribution.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and
+ * documentation are those of the authors and should not be
+ * interpreted as representing official policies, either expressed
+ * or implied, of GRNET S.A.
+ * </copyright>
+ * -----------------------------------------------------------------------
+ */
+#endregion
 
 // **CloudFilesClient** provides a simple client interface to CloudFiles and Pithos
 //
@@ -50,6 +54,7 @@ using System.Diagnostics.Contracts;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
@@ -62,6 +67,8 @@ namespace Pithos.Network
     [Export(typeof(ICloudClient))]
     public class CloudFilesClient:ICloudClient
     {
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         //CloudFilesClient uses *_baseClient* internally to communicate with the server
         //RestClient provides a REST-friendly interface over the standard WebClient.
         private RestClient _baseClient;
@@ -132,7 +139,6 @@ namespace Pithos.Network
         public bool UsePithos { get; set; }
 
 
-        private static readonly ILog Log = LogManager.GetLogger("CloudFilesClient");
 
         public CloudFilesClient(string userName, string apiKey)
         {
@@ -236,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};            
 
@@ -313,18 +319,21 @@ namespace Pithos.Network
             using (ThreadContext.Stacks["Share"].Push("List Objects"))
             {
                 if (Log.IsDebugEnabled) Log.DebugFormat("START");
-
+                //'since' is not used here because we need to have ListObjects return a NoChange result
+                //for all shared accounts,containers
+                var accounts = ListSharingAccounts();
+                var items = from account in accounts 
+                            let containers = ListContainers(account.name) 
+                            from container in containers 
+                            select ListObjects(account.name, container.Name,since);
+                var objects=items.SelectMany(r=> r).ToList();
+/*
                 var objects = new List<ObjectInfo>();
-                var accounts = ListSharingAccounts(since);
-                foreach (var account in accounts)
+                foreach (var containerObjects in items)
                 {
-                    var containers = ListContainers(account.name);
-                    foreach (var container in containers)
-                    {
-                        var containerObjects = ListObjects(account.name, container.Name);
-                        objects.AddRange(containerObjects);
-                    }
+                    objects.AddRange(containerObjects);
                 }
+*/
                 if (Log.IsDebugEnabled) Log.DebugFormat("END");
                 return objects;
             }
@@ -501,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");
@@ -599,6 +611,8 @@ namespace Pithos.Network
 
                     client.AssertStatusOK("ListObjects failed");
 
+                    if (client.StatusCode==HttpStatusCode.NotModified)
+                        return new[]{new NoModificationInfo(account,container)};
                     //If the result is empty, return an empty list,
                     var infos = String.IsNullOrWhiteSpace(content)
                                     ? new List<ObjectInfo>()
@@ -609,21 +623,22 @@ namespace Pithos.Network
                     {
                         info.Container = container;
                         info.Account = account;
+                        info.StorageUri = this.StorageUrl;
                     }
-                    if (Log.IsDebugEnabled) Log.DebugFormat("START");
+                    if (Log.IsDebugEnabled) Log.DebugFormat("END");
                     return infos;
                 }
             }
         }
 
-
-
         public IList<ObjectInfo> ListObjects(string account, string container, string folder, DateTime? since = null)
         {
             if (String.IsNullOrWhiteSpace(container))
                 throw new ArgumentNullException("container");
+/*
             if (String.IsNullOrWhiteSpace(folder))
                 throw new ArgumentNullException("folder");
+*/
             Contract.EndContractBlock();
 
             using (ThreadContext.Stacks["Objects"].Push("List"))
@@ -642,8 +657,17 @@ namespace Pithos.Network
                     var content = client.DownloadStringWithRetry(container, 3);
                     client.AssertStatusOK("ListObjects failed");
 
-                    var infos = JsonConvert.DeserializeObject<IList<ObjectInfo>>(content);
+                    if (client.StatusCode==HttpStatusCode.NotModified)
+                        return new[]{new NoModificationInfo(account,container,folder)};
 
+                    var infos = JsonConvert.DeserializeObject<IList<ObjectInfo>>(content);
+                    foreach (var info in infos)
+                    {
+                        info.Account = account;
+                        if (info.Container == null)
+                            info.Container = container;
+                        info.StorageUri = this.StorageUrl;
+                    }
                     if (Log.IsDebugEnabled) Log.DebugFormat("END");
                     return infos;
                 }
@@ -772,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;
@@ -851,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")),
@@ -1014,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 =>
             {
 
@@ -1038,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
                             //
@@ -1048,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);                    
                 
@@ -1065,6 +1093,7 @@ namespace Pithos.Network
 
         }
 
+        
         public Task<byte[]> GetBlock(string account, string container, Uri relativeUrl, long start, long? end)
         {
             if (String.IsNullOrWhiteSpace(Token))
@@ -1225,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
             {
@@ -1343,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};
@@ -1357,7 +1386,46 @@ namespace Pithos.Network
             return new WebException(String.Format("{0} failed with unexpected status code {1}", operation, statusCode));
         }
 
-        
+
+/*
+        public IEnumerable<ObjectInfo> ListDirectories(ContainerInfo container)
+        {
+            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