merging

B2Uploader/B2Uploader.csproj

@@ -64,11 +64,20 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.2.2\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -104,6 +113,11 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
   </Target>
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

B2Uploader/Program.cs

@@ -8,6 +8,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
@@ -43,7 +44,7 @@ namespace B2Uploader
         static void Main(string[] args)
         {
             var result = CommandLine.Parser.Default.ParseArguments<CmdLineOptions>(args);
-
+                      
             logger.Debug("Starting B2Uploader Version: {0}", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
 
             var existCode = result.MapResult(options => {
@@ -63,7 +64,7 @@ namespace B2Uploader
                 {
                     logger.Debug("Listing Buckets");
                 }
-                var buckets = ListBuckets(new ListBucketsRequest() { accountId = auth.accountId }, auth.authorizationToken, auth.apiUrl);
+                var buckets = ListBuckets(new ListBucketsRequest() { accountId = auth.accountId }, auth.authorizationToken, auth.apiUrl).Result;
 
                 var bucket = buckets.buckets.First();
 
@@ -136,7 +137,7 @@ namespace B2Uploader
                         while (!uploaded && retries < 3)
                         {
                             try {
-                                var uploadURL = GetUploadURL(new GetUploadURLRequest { bucketId = bucket.bucketId }, auth.apiUrl, auth.authorizationToken);
+                                var uploadURL = GetUploadURL(new GetUploadURLRequest { bucketId = bucket.bucketId }, auth.apiUrl, auth.authorizationToken).Result;
                                 var response = UploadFile(uploadURL.authorizationToken, "b2/x-auto", s, uploadURL.uploadUrl);
                                 if(response != null)
                                 {
@@ -178,13 +179,13 @@ namespace B2Uploader
             return JsonConvert.DeserializeObject<AuthorizeResponse>(responseString);
         }
 
-        static ListBucketsResponse ListBuckets(ListBucketsRequest request, string authToken, string apiUrl)
+        static async Task<ListBucketsResponse> ListBuckets(ListBucketsRequest request, string authToken, string apiUrl)
         {
             var headers = GetAuthHeaders(authToken);
 
-            string responseString = MakeRequest(apiUrl + "/b2api/v1/b2_list_buckets", headers, JsonConvert.SerializeObject(request));
+            string responseString = await MakeRequest2(apiUrl + "/b2api/v1/b2_list_buckets", headers, JsonConvert.SerializeObject(request));
 
-            return JsonConvert.DeserializeObject<ListBucketsResponse>(responseString);
+            return  await Task.Factory.StartNew(() => JsonConvert.DeserializeObject<ListBucketsResponse>(responseString));
         }
 
         static List<Tuple<string,string>> GetAuthHeaders(string authToken)
@@ -194,13 +195,12 @@ namespace B2Uploader
             return headers;
         }
 
-        static GetUploadURLResponse GetUploadURL(GetUploadURLRequest request, string apiUrl, string authToken)
+        static async Task<GetUploadURLResponse> GetUploadURL(GetUploadURLRequest request, string apiUrl, string authToken)
         {
-
             var headers = GetAuthHeaders(authToken); 
-            string responseString = MakeRequest(apiUrl + "/b2api/v1/b2_get_upload_url", headers, JsonConvert.SerializeObject(request));
+            string responseString = await MakeRequest2(apiUrl + "/b2api/v1/b2_get_upload_url", headers, JsonConvert.SerializeObject(request));
             
-            return JsonConvert.DeserializeObject<GetUploadURLResponse>(responseString);
+            return await Task.Factory.StartNew(() => JsonConvert.DeserializeObject<GetUploadURLResponse>(responseString));
         }
         static string getValidFilename(string input)
         {
@@ -225,10 +225,8 @@ namespace B2Uploader
             headers.Add(new Tuple<string, string>("X-Bz-File-Name", fileName));
             headers.Add(new Tuple<string, string>("X-Bz-Content-Sha1", sha1));
 
-            using (FileStream fs = System.IO.File.OpenRead(filePath))
-            {
 
-                string responseString = MakeRequest(uploadUrl, headers, fs, contentType);
+            string responseString = MakeRequest2(uploadUrl, headers, filePath, true, contentType).Result;
 
                 var resp = JsonConvert.DeserializeObject<UploadFileResponse>(responseString);
 
@@ -242,69 +240,42 @@ namespace B2Uploader
                     //something went wrong!
                     return null;
                 }
-            }
+            
         }
 
         static ListFileNamesResponse ListFileNames(ListFileNamesRequest request, string apiUrl, string authToken)
         {
             var headers = GetAuthHeaders(authToken);
-            string responseString =  MakeRequest(string.Format("{0}/b2api/v1/b2_list_file_names", apiUrl), headers, JsonConvert.SerializeObject(request));
+            string responseString =  MakeRequest2(string.Format("{0}/b2api/v1/b2_list_file_names", apiUrl), headers, JsonConvert.SerializeObject(request)).Result;
 
             return JsonConvert.DeserializeObject<ListFileNamesResponse>(responseString);
         }
 
-
-        static string MakeRequest(string url, List<Tuple<string,string>> headers, string data, string contentType = "application/json; charset=urf-8")
-        {
-            MemoryStream ms = new MemoryStream(Encoding.UTF8.GetBytes(data));
-            return MakeRequest(url, headers, ms, contentType);
-        }
         
-        static string MakeRequest(string url, List<Tuple<string,string>> headers, Stream data, string contentType="application/json; charset=utf-8")
-        {
-            string reqId = DateTime.Now.Ticks.ToString("X2");
-            Stopwatch st = Stopwatch.StartNew();
-            try
+        static async Task<string> MakeRequest2(string url, List<Tuple<string, string>> headers, string data, bool isFile = false, string contentType = "application/json; charset=utf-8")
             {
+            var client = new HttpClient();
                 
-                logger.Debug("Starting RequestID: {0}", reqId);
-                HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url);
-
-                req.Method = "POST";
-
                 foreach (var head in headers)
                 {
-                    req.Headers.Add(head.Item1, head.Item2);
+                client.DefaultRequestHeaders.Add(head.Item1, head.Item2);
                 }
 
-                using (var stream = req.GetRequestStream())
+            HttpContent content = null;
+            if (isFile)
                 {
-                    
-                    data.Position = 0;
-
-                    req.ContentType = contentType;
-                    
-                    data.CopyTo(stream);
-                    data.Flush();
-                    
-                    stream.Close();
-                }
-                WebResponse response = (HttpWebResponse)req.GetResponse();
-                var responseString = new StreamReader(response.GetResponseStream()).ReadToEnd();
-                response.Close();
-                Console.WriteLine("RequId: {0} MakeRequest Took {1}ms",reqId, st.ElapsedMilliseconds);
-                return responseString;
+                content = new StreamContent(System.IO.File.OpenRead(data));
+                content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(contentType);
             }
-            catch (Exception ex)
+            else
             {
-                logger.Error("ReqId: {1} Error talking to server: {0}", ex.Message, reqId);
-                logger.Error("URL: {0}", url);
-                throw;
-            }
+                content = new StringContent(data);
         }
-
-        
+            var resp = await client.PostAsync(url, content);
         
+            resp.EnsureSuccessStatusCode();
+            return await resp.Content.ReadAsStringAsync();          
+        }
         
 
         private static string GetSha1(string fileName)

B2Uploader/packages.config

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommandLineParser" version="2.0.275-beta" targetFramework="net45" />
+  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
-  <package id="NLog" version="4.2.2" targetFramework="net45" />
-  <package id="NLog.Config" version="4.2.2" targetFramework="net45" />
+  <package id="NLog" version="4.2.3" targetFramework="net45" />
+  <package id="NLog.Config" version="4.2.3" targetFramework="net45" />
   <package id="NLog.Schema" version="4.2.1" targetFramework="net45" />
 </packages>