From 0c14f09b6449cbebf30593738c63106d223bbe2c Mon Sep 17 00:00:00 2001
From: Matthew Burnett <matthewburnett@riolu.com>
Date: Sat, 21 Apr 2018 16:11:31 -0400
Subject: [PATCH] Fix variable convention

---
 .../FileUploaders/GoogleCloudStorage.cs       | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ShareX.UploadersLib/FileUploaders/GoogleCloudStorage.cs b/ShareX.UploadersLib/FileUploaders/GoogleCloudStorage.cs
index d80cc9c65..12b1ec6bb 100644
--- a/ShareX.UploadersLib/FileUploaders/GoogleCloudStorage.cs
+++ b/ShareX.UploadersLib/FileUploaders/GoogleCloudStorage.cs
@@ -50,9 +50,9 @@ public override GenericUploader CreateUploader(UploadersConfig config, TaskRefer
         {
             return new GoogleCloudStorage(config.GoogleCloudStorageOAuth2Info)
             {
-                bucket = config.GoogleCloudStorageBucket,
-                domain = config.GoogleCloudStorageDomain,
-                prefix = config.GoogleCloudStorageObjectPrefix
+                Bucket = config.GoogleCloudStorageBucket,
+                Domain = config.GoogleCloudStorageDomain,
+                Prefix = config.GoogleCloudStorageObjectPrefix
             };
         }
 
@@ -61,6 +61,10 @@ public override GenericUploader CreateUploader(UploadersConfig config, TaskRefer
 
     public sealed class GoogleCloudStorage : FileUploader, IOAuth2
     {
+        public string Bucket { get; set; }
+        public string Domain { get; set; }
+        public string Prefix { get; set; }
+
         public OAuth2Info AuthInfo => googleAuth.AuthInfo;
 
         private GoogleOAuth2 googleAuth;
@@ -95,7 +99,7 @@ public bool GetAccessToken(string code)
 
         private string GetUploadPath(string fileName)
         {
-            string path = NameParser.Parse(NameParserType.FolderPath, prefix.Trim('/'));
+            string path = NameParser.Parse(NameParserType.FolderPath, Prefix.Trim('/'));
             return URLHelpers.CombineURL(path, fileName);
         }
 
@@ -116,19 +120,15 @@ public class Acl
             public string role { get; set; }
         }
 
-        public string bucket { get; set; }
-        public string domain { get; set; }
-        public string prefix { get; set; }
-
         public override UploadResult Upload(Stream stream, string fileName)
         {
             if (!CheckAuthorization()) return null;
 
             string uploadpath = GetUploadPath(fileName);
 
-            if (string.IsNullOrEmpty(domain))
+            if (string.IsNullOrEmpty(Domain))
             {
-                domain = $"storage.googleapis.com/{bucket}";
+                Domain = $"storage.googleapis.com/{Bucket}";
             }
 
             Metadata metadata = new Metadata
@@ -146,7 +146,7 @@ public override UploadResult Upload(Stream stream, string fileName)
 
             string metadatajson = JsonConvert.SerializeObject(metadata);
 
-            UploadResult result = SendRequestFile($"https://www.googleapis.com/upload/storage/v1/b/{bucket}/o?uploadType=multipart", stream, fileName,
+            UploadResult result = SendRequestFile($"https://www.googleapis.com/upload/storage/v1/b/{Bucket}/o?uploadType=multipart", stream, fileName,
                 headers: googleAuth.GetAuthHeaders(), contentType: "multipart/related", metadata: metadatajson);
             GoogleCloudStorageResponse upload = JsonConvert.DeserializeObject<GoogleCloudStorageResponse>(result.Response);
 
@@ -156,7 +156,7 @@ public override UploadResult Upload(Stream stream, string fileName)
                 return null;
             }
 
-            result.URL = URLHelpers.FixPrefix($"{domain}/{uploadpath}", "https://");
+            result.URL = URLHelpers.FixPrefix($"{Domain}/{uploadpath}", "https://");
 
             return result;
         }