moving sha check out, fixing url switch · ff97d5eb1d - SVN.BY: Go Git Service
浏览代码

moving sha check out, fixing url switch

Tiernan OToole 10 年之前
父节点
当前提交
ff97d5eb1d
共有 1 个文件被更改,包括 18 次插入3 次删除
  1. 18 3
      B2Uploader/Program.cs

+ 18 - 3
B2Uploader/Program.cs

33
 
33
 
34
             foreach(string s in Directory.GetFiles(args[2]))
34
             foreach(string s in Directory.GetFiles(args[2]))
35
             {
35
             {
36
-                var uploadURL = GetUploadURL(new GetUploadURLRequest { bucketId = bucket.bucketId }, auth.authorizationToken, auth.apiUrl);
36
+                var uploadURL = GetUploadURL(new GetUploadURLRequest { bucketId = bucket.bucketId }, auth.apiUrl, auth.authorizationToken);
37
                 var response = UploadFile(uploadURL.authorizationToken, "b2/x-auto", s, uploadURL.uploadUrl);
37
                 var response = UploadFile(uploadURL.authorizationToken, "b2/x-auto", s, uploadURL.uploadUrl);
38
             }
38
             }
39
 
39
 
96
 
96
 
97
         static UploadFileResponse UploadFile(string authToken, string contentType, string filePath, string uploadUrl)
97
         static UploadFileResponse UploadFile(string authToken, string contentType, string filePath, string uploadUrl)
98
         {
98
         {
99
-            SHA1 sha = SHA1.Create();
100
 
99
 
101
             byte[] bytes = File.ReadAllBytes(filePath);
100
             byte[] bytes = File.ReadAllBytes(filePath);
102
 
101
 
103
-            String sha1 = ASCIIEncoding.ASCII.GetString(sha.ComputeHash(bytes));
102
+            String sha1 = GetSha1(bytes);
104
             
103
             
105
             HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(uploadUrl);
104
             HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(uploadUrl);
106
             webRequest.Method = "POST";
105
             webRequest.Method = "POST";
129
                 return null;
128
                 return null;
130
             }
129
             }
131
         }
130
         }
131
+
132
+        private static string GetSha1(byte[] bytes)
133
+        {
134
+            using (SHA1Managed sha1 = new SHA1Managed())
135
+            {
136
+                var hash = sha1.ComputeHash(bytes);
137
+                var sb = new StringBuilder(hash.Length * 2);
138
+
139
+                foreach (byte b in hash)
140
+                {
141
+                    // can be "x2" if you want lowercase
142
+                    sb.Append(b.ToString("X2"));
143
+                }
144
+                return sb.ToString();
145
+            }
146
+        }
132
     }
147
     }
133
 
148
 
134
     public class AuthorizeResponse
149
     public class AuthorizeResponse