DropNet · prashantvc · May 21, 2012 · May 21, 2012 · May 21, 2012
diff --git a/DropNet.Tests/FileAsyncTests.cs b/DropNet.Tests/FileAsyncTests.cs
@@ -15,8 +15,14 @@ public class FileAsyncTests
 
         public FileAsyncTests()
         {
-            _client = new DropNetClient(TestVariables.ApiKey, TestVariables.ApiSecret);
-            _client.UserLogin = new Models.UserLogin { Token = TestVariables.Token, Secret = TestVariables.Secret };
+            _client = new DropNetClient(TestVariables.ApiKey, TestVariables.ApiSecret)
+                          {
+                              UserLogin = new UserLogin
+                                              {
+                                                  Token = TestVariables.Token, 
+                                                  Secret = TestVariables.Secret
+                                              }
+                          };
 
             _fixture = new Fixture();
         }
@@ -36,7 +42,7 @@ public void Can_Get_List_Of_Metadata_For_Search_String()
                                                {
                                                    Assert.IsNotNull(s);
                                                    Assert.AreEqual(1, s.Count);
-                                               }, 
+                                               },
                                                Assert.IsNull);
         }
 
@@ -74,7 +80,7 @@ public void Can_Upload_File_Async_Streaming()
 
             File.WriteAllText(localFile.FullName, localContent, System.Text.Encoding.UTF8);
             Assert.IsTrue(File.Exists(localFile.FullName));
-            byte[] content = _client.GetFileContentFromFS(localFile);
+            _client.GetFileContentFromFS(localFile);
 
             var waitForUploadFinished = new ManualResetEvent(false);
             using (var fileStream = localFile.OpenRead())
@@ -162,5 +168,10 @@ private void Can_Get_Thumbnail_Async_Failure(DropboxException error)
             Assert.IsTrue(false);
         }
 
+        [TestMethod]
+        public void Can_Get_Delta_Async()
+        {
+         _client.GetDeltaAsync("", Assert.IsNotNull, f => Assert.Fail(f.ToString()));   
+        }
     }
 }
diff --git a/DropNet.WindowsPhone/DropNet.WindowsPhone.csproj b/DropNet.WindowsPhone/DropNet.WindowsPhone.csproj
@@ -18,6 +18,10 @@
     <SilverlightApplication>false</SilverlightApplication>
     <ValidateXaml>true</ValidateXaml>
     <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <SccProjectName>%24/WinBox/DropNet/DropNet.WindowsPhone</SccProjectName>
+    <SccLocalPath>.</SccLocalPath>
+    <SccAuxPath>https://prashantvc.tfspreview.com/defaultcollection</SccAuxPath>
+    <SccProvider>{4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}</SccProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -83,6 +87,9 @@
     <Compile Include="..\DropNet\Models\DeltaPage.cs">
       <Link>Models\DeltaPage.cs</Link>
     </Compile>
+    <Compile Include="..\DropNet\Models\DeltaPageInternal.cs">
+      <Link>Models\DeltaPageInternal.cs</Link>
+    </Compile>
     <Compile Include="..\dropnet\Models\MetaData.cs">
       <Link>Models\MetaData.cs</Link>
     </Compile>

diff --git a/DropNet/Client/Files.Async.cs b/DropNet/Client/Files.Async.cs
@@ -3,8 +3,8 @@
 using DropNet.Models;
 using RestSharp;
 using System;
-using DropNet.Authenticators;
 using DropNet.Exceptions;
+using RestSharp.Deserializers;
 
 namespace DropNet
 {
@@ -28,6 +28,22 @@ public void GetMetaDataAsync(string path, Action<MetaData> success, Action<Dropb
             ExecuteAsync(ApiType.Base, request, success, failure);
         }
 
+        /// <summary>
+        /// Returns a link directly to a file.
+        /// Similar to /shares. The difference is that this bypasses the Dropbox webserver, used to provide a preview of the file, so that you can effectively stream the contents of your media.
+        /// </summary>
+        /// <param name="path">The path</param>
+        /// <param name="success">Success callback </param>
+        /// <param name="failure">Failure callback </param>
+        public void GetMediaAsync(string path, Action<ShareResponse> success, Action<DropboxException> failure)
+        {
+            if (!path.StartsWith("/")) path = "/" + path;
+
+            var request = _requestHelper.CreateMediaRequest(path, Root);
+
+            ExecuteAsync(ApiType.Base, request, success, failure);
+        }
+
         /// <summary>
         /// Gets MetaData for a File or Folder. For a folder this includes its contents. For a file, this includes details such as file size.
         /// Optional 'hash' param returns HTTP code 304	(Directory contents have not changed) if contents have not changed since the
@@ -80,7 +96,7 @@ public void SearchAsync(string searchString, string path, Action<List<MetaData>>
         /// <param name="path">The path of the file to download</param>
         /// /// <param name="success">Success callback </param>
         /// <param name="failure">Failure callback </param>
-        
+
         public void GetFileAsync(string path, Action<IRestResponse> success, Action<DropboxException> failure)
         {
             if (!path.StartsWith("/")) path = "/" + path;
@@ -221,46 +237,69 @@ public void CreateFolderAsync(string path, Action<MetaData> success, Action<Drop
         /// <param name="failure">Failure callback </param>
         public void GetShareAsync(string path, Action<ShareResponse> success, Action<DropboxException> failure)
         {
-            if (!path.StartsWith("/")) path = "/" + path;
+            if (!path.StartsWith("/"))
+            {
+                path = "/" + path;
+            }
 
             var request = _requestHelper.CreateShareRequest(path, Root);
-
             ExecuteAsync(ApiType.Base, request, success, failure);
         }
 
         /// <summary>
-        /// Returns a link directly to a file.
-        /// Similar to /shares. The difference is that this bypasses the Dropbox webserver, used to provide a preview of the file, so that you can effectively stream the contents of your media.
+        /// The beta delta function, gets updates for a given folder
         /// </summary>
-        /// <param name="path">The path</param>
-        /// <param name="success">Success callback </param>
-        /// <param name="failure">Failure callback </param>
-        public void GetMediaAsync(string path, Action<ShareResponse> success, Action<DropboxException> failure)
+        /// <param name="cursor">Cursor returned by prvious call</param>
+        /// <param name="success">Success Callback</param>
+        /// <param name="failure">Failure Callback</param>
+        public void GetDeltaAsync(string cursor, Action<DeltaPage> success, Action<DropboxException> failure)
         {
-            if (!path.StartsWith("/")) path = "/" + path;
-
-            var request = _requestHelper.CreateMediaRequest(path, Root);
+            var request = _requestHelper.CreateDeltaRequest(cursor);
+            ExecuteAsync<DeltaPageInternal>(ApiType.Base, request,
+                deltaResponse =>
+                {
+                    var deltaPage = new DeltaPage
+                    {
+                        Cursor = deltaResponse.Cursor,
+                        Has_More = deltaResponse.Has_More,
+                        Reset = deltaResponse.Reset,
+                        Entries = new List<DeltaEntry>()
+                    };
+
+                    foreach (var stringList in deltaResponse.Entries)
+                    {
+                        deltaPage.Entries.Add(StringListToDelta(stringList));
+                    }
+
+                    success (deltaPage);
+                },
 
-            ExecuteAsync(ApiType.Base, request, success, failure);
+                failure);
         }
 
         /// <summary>
-        /// The beta delta function, gets updates for a given folder
+        /// Helper function to convert a stringlist to a DeltaEntry object
         /// </summary>
-        /// <param name="IKnowThisIsBetaOnly"></param>
-        /// <param name="path"></param>
-        /// <param name="success"></param>
-        /// <param name="failure"></param>
-        public void GetDeltaAsync(bool IKnowThisIsBetaOnly, string path, Action<DeltaPage> success, Action<DropboxException> failure)
+        /// <param name="stringList"></param>
+        /// <returns></returns>
+        DeltaEntry StringListToDelta(List<string> stringList)
         {
-            if (!IKnowThisIsBetaOnly) return;
-
-            if (!path.StartsWith("/")) path = "/" + path;
-
-            var request = _requestHelper.CreateDeltaRequest(path);
+            var deltaEntry = new DeltaEntry
+            {
+                Path = stringList[0]
+            };
+            if (!String.IsNullOrEmpty(stringList[1]))
+            {
+                var jsonDeserializer = new JsonDeserializer();
+                var fakeresponse = new RestResponse
+                {
+                    Content = stringList[1]
+                };
+                deltaEntry.MetaData = jsonDeserializer.Deserialize<MetaData>(fakeresponse);
+            }
+            return deltaEntry;
+        } 
 
-            ExecuteAsync<DeltaPage>(ApiType.Base, request, success, failure);
-        }
 
         /// <summary>
         /// Gets the thumbnail of an image given its MetaData

diff --git a/DropNet/Client/Files.Sync.cs b/DropNet/Client/Files.Sync.cs
@@ -354,7 +354,7 @@ public DeltaPage GetDelta(string cursor)
         /// </summary>
         /// <param name="stringList"></param>
         /// <returns></returns>
-        private DeltaEntry StringListToDeltaEntry(List<string> stringList)
+        DeltaEntry StringListToDeltaEntry(List<string> stringList)
         {
             var deltaEntry = new DeltaEntry
             {
@@ -372,16 +372,7 @@ private DeltaEntry StringListToDeltaEntry(List<string> stringList)
             return deltaEntry;
         } 
 
-        /// <summary>
-        /// Private class used to deal with the DropBox API returning two different types in a given list
-        /// </summary>
-        private class DeltaPageInternal
-        {
-            public string Cursor { get; set; }
-            public bool Has_More { get; set; }
-            public bool Reset { get; set; }
-            public List<List<string>> Entries { get; set; }
-        }
+
     }
 }
 #endif
diff --git a/DropNet/DropNet.csproj b/DropNet/DropNet.csproj
@@ -80,6 +80,7 @@
     <Compile Include="Helpers\RequestHelper.cs" />
     <Compile Include="Models\AccountCreationResult.cs" />
     <Compile Include="Models\AccountInfo.cs" />
+    <Compile Include="Models\DeltaPageInternal.cs" />
     <Compile Include="Models\DeltaPage.cs" />
     <Compile Include="Models\MetaData.cs" />
     <Compile Include="Models\SharesResponse.cs" />

diff --git a/DropNet/Models/DeltaPageInternal.cs b/DropNet/Models/DeltaPageInternal.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace DropNet.Models
+{
+    /// <summary>
+    /// Private class used to deal with the DropBox API returning two different types in a given list
+    /// </summary>
+    internal class DeltaPageInternal
+    {
+        public string Cursor { get; set; }
+        public bool Has_More { get; set; }
+        public bool Reset { get; set; }
+        public List<List<string>> Entries { get; set; }
+    }
+}
diff --git a/DropNet/Models/MetaData.cs b/DropNet/Models/MetaData.cs
@@ -1,21 +1,46 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.Serialization;
 
 namespace DropNet.Models
 {
+    [DataContract]
     public class MetaData
     {
+        [DataMember]
         public string Hash { get; set; }
+
+        [DataMember]
         public bool Thumb_Exists { get; set; }
+
+        [DataMember]
         public long Bytes { get; set; }
+
+        [DataMember]
         public string Modified { get; set; }
+
+        [DataMember]
         public string Path { get; set; }
+
+        [DataMember]
         public bool Is_Dir { get; set; }
+
+        [DataMember]
         public bool Is_Deleted { get; set; }
+
+        [DataMember]
         public string Size { get; set; }
+
+        [DataMember]
         public string Root { get; set; }
+
+        [DataMember]
         public string Icon { get; set; }
+
+        [DataMember]
         public int Revision { get; set; }
+
+        [DataMember]
         public List<MetaData> Contents { get; set; }
 
         public DateTime ModifiedDate