From 7ea80aeaa083f7b2702252e2f694685f0fdc2009 Mon Sep 17 00:00:00 2001 From: Matthew Burnett Date: Fri, 20 Apr 2018 17:16:46 -0400 Subject: [PATCH] Finish form --- .../FileUploaders/GoogleCloudStorage.cs | 8 +- .../Forms/UploadersConfigForm.Designer.cs | 69 ++++++++++------ .../Forms/UploadersConfigForm.cs | 7 ++ .../Forms/UploadersConfigForm.resx | 80 +++++++++++++++---- 4 files changed, 120 insertions(+), 44 deletions(-) diff --git a/ShareX.UploadersLib/FileUploaders/GoogleCloudStorage.cs b/ShareX.UploadersLib/FileUploaders/GoogleCloudStorage.cs index 7996485ee..41f15ad96 100644 --- a/ShareX.UploadersLib/FileUploaders/GoogleCloudStorage.cs +++ b/ShareX.UploadersLib/FileUploaders/GoogleCloudStorage.cs @@ -122,7 +122,6 @@ public override UploadResult Upload(Stream stream, string fileName) UploadResult result = new UploadResult(); string contentType = Helpers.GetMimeType(fileName); - string uploadpath = GetUploadPath(fileName); Dictionary args = new Dictionary @@ -148,10 +147,15 @@ public override UploadResult Upload(Stream stream, string fileName) SendRequest(HttpMethod.POST, $"https://www.googleapis.com/storage/v1/b/{bucket}/o/{encodeduploadpath}/acl", requestjson, ContentTypeJSON, headers: googleAuth.GetAuthHeaders()); } + else + { + Errors.Add("Upload to Google Cloud Storage failed."); + return null; + } if (string.IsNullOrEmpty(domain)) { - domain = "storage.googleapis.com/{bucket}"; + domain = $"storage.googleapis.com/{bucket}"; } result.URL = $"https://{domain}/{uploadpath}"; diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs index f92d29d86..8fd0f71f2 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs @@ -303,6 +303,12 @@ private void InitializeComponent() this.lblAmazonS3AccessKey = new System.Windows.Forms.Label(); this.txtAmazonS3AccessKey = new System.Windows.Forms.TextBox(); this.tpGoogleCloudStorage = new System.Windows.Forms.TabPage(); + this.txtGoogleCloudStorageObjectPrefix = new System.Windows.Forms.TextBox(); + this.lblGoogleCloudStorageObjectPrefix = new System.Windows.Forms.Label(); + this.lblGoogleCloudStorageDomain = new System.Windows.Forms.Label(); + this.txtGoogleCloudStorageDomain = new System.Windows.Forms.TextBox(); + this.lblGoogleCloudStorageBucket = new System.Windows.Forms.Label(); + this.txtGoogleCloudStorageBucket = new System.Windows.Forms.TextBox(); this.oauth2GoogleCloudStorage = new ShareX.UploadersLib.OAuthControl(); this.tpAzureStorage = new System.Windows.Forms.TabPage(); this.cbAzureStorageEnvironment = new System.Windows.Forms.ComboBox(); @@ -639,10 +645,6 @@ private void InitializeComponent() this.lblWidthHint = new System.Windows.Forms.Label(); this.ttlvMain = new ShareX.HelpersLib.TabToListView(); this.actRapidShareAccountType = new ShareX.UploadersLib.AccountTypeControl(); - this.txtGoogleCloudStorageBucket = new System.Windows.Forms.TextBox(); - this.lblGoogleCloudStorageBucket = new System.Windows.Forms.Label(); - this.txtGoogleCloudStorageDomain = new System.Windows.Forms.TextBox(); - this.lblGoogleCloudStorageDomain = new System.Windows.Forms.Label(); this.tpOtherUploaders.SuspendLayout(); this.tcOtherUploaders.SuspendLayout(); this.tpTwitter.SuspendLayout(); @@ -2784,6 +2786,8 @@ private void InitializeComponent() // // tpGoogleCloudStorage // + this.tpGoogleCloudStorage.Controls.Add(this.txtGoogleCloudStorageObjectPrefix); + this.tpGoogleCloudStorage.Controls.Add(this.lblGoogleCloudStorageObjectPrefix); this.tpGoogleCloudStorage.Controls.Add(this.lblGoogleCloudStorageDomain); this.tpGoogleCloudStorage.Controls.Add(this.txtGoogleCloudStorageDomain); this.tpGoogleCloudStorage.Controls.Add(this.lblGoogleCloudStorageBucket); @@ -2793,6 +2797,39 @@ private void InitializeComponent() this.tpGoogleCloudStorage.Name = "tpGoogleCloudStorage"; this.tpGoogleCloudStorage.UseVisualStyleBackColor = true; // + // txtGoogleCloudStorageObjectPrefix + // + resources.ApplyResources(this.txtGoogleCloudStorageObjectPrefix, "txtGoogleCloudStorageObjectPrefix"); + this.txtGoogleCloudStorageObjectPrefix.Name = "txtGoogleCloudStorageObjectPrefix"; + this.txtGoogleCloudStorageObjectPrefix.TextChanged += new System.EventHandler(this.txtGoogleCloudStorageObjectPrefix_TextChanged); + // + // lblGoogleCloudStorageObjectPrefix + // + resources.ApplyResources(this.lblGoogleCloudStorageObjectPrefix, "lblGoogleCloudStorageObjectPrefix"); + this.lblGoogleCloudStorageObjectPrefix.Name = "lblGoogleCloudStorageObjectPrefix"; + // + // lblGoogleCloudStorageDomain + // + resources.ApplyResources(this.lblGoogleCloudStorageDomain, "lblGoogleCloudStorageDomain"); + this.lblGoogleCloudStorageDomain.Name = "lblGoogleCloudStorageDomain"; + // + // txtGoogleCloudStorageDomain + // + resources.ApplyResources(this.txtGoogleCloudStorageDomain, "txtGoogleCloudStorageDomain"); + this.txtGoogleCloudStorageDomain.Name = "txtGoogleCloudStorageDomain"; + this.txtGoogleCloudStorageDomain.TextChanged += new System.EventHandler(this.txtGoogleCloudStorageDomain_TextChanged); + // + // lblGoogleCloudStorageBucket + // + resources.ApplyResources(this.lblGoogleCloudStorageBucket, "lblGoogleCloudStorageBucket"); + this.lblGoogleCloudStorageBucket.Name = "lblGoogleCloudStorageBucket"; + // + // txtGoogleCloudStorageBucket + // + resources.ApplyResources(this.txtGoogleCloudStorageBucket, "txtGoogleCloudStorageBucket"); + this.txtGoogleCloudStorageBucket.Name = "txtGoogleCloudStorageBucket"; + this.txtGoogleCloudStorageBucket.TextChanged += new System.EventHandler(this.txtGoogleCloudStorageBucket_TextChanged); + // // oauth2GoogleCloudStorage // resources.ApplyResources(this.oauth2GoogleCloudStorage, "oauth2GoogleCloudStorage"); @@ -5220,28 +5257,6 @@ private void InitializeComponent() this.actRapidShareAccountType.Name = "actRapidShareAccountType"; this.actRapidShareAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous; // - // txtGoogleCloudStorageBucket - // - resources.ApplyResources(this.txtGoogleCloudStorageBucket, "txtGoogleCloudStorageBucket"); - this.txtGoogleCloudStorageBucket.Name = "txtGoogleCloudStorageBucket"; - this.txtGoogleCloudStorageBucket.TextChanged += new System.EventHandler(this.txtGoogleCloudStorageBucket_TextChanged); - // - // lblGoogleCloudStorageBucket - // - resources.ApplyResources(this.lblGoogleCloudStorageBucket, "lblGoogleCloudStorageBucket"); - this.lblGoogleCloudStorageBucket.Name = "lblGoogleCloudStorageBucket"; - // - // txtGoogleCloudStorageDomain - // - resources.ApplyResources(this.txtGoogleCloudStorageDomain, "txtGoogleCloudStorageDomain"); - this.txtGoogleCloudStorageDomain.Name = "txtGoogleCloudStorageDomain"; - this.txtGoogleCloudStorageDomain.TextChanged += new System.EventHandler(this.txtGoogleCloudStorageDomain_TextChanged); - // - // lblGoogleCloudStorageDomain - // - resources.ApplyResources(this.lblGoogleCloudStorageDomain, "lblGoogleCloudStorageDomain"); - this.lblGoogleCloudStorageDomain.Name = "lblGoogleCloudStorageDomain"; - // // UploadersConfigForm // resources.ApplyResources(this, "$this"); @@ -6035,5 +6050,7 @@ private void InitializeComponent() private System.Windows.Forms.Label lblGoogleCloudStorageBucket; private System.Windows.Forms.TextBox txtGoogleCloudStorageDomain; private System.Windows.Forms.Label lblGoogleCloudStorageDomain; + private System.Windows.Forms.TextBox txtGoogleCloudStorageObjectPrefix; + private System.Windows.Forms.Label lblGoogleCloudStorageObjectPrefix; } } diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index 29cd944c7..313074516 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -95,6 +95,7 @@ private void InitializeControls() CodeMenu.Create(txtDropboxPath, CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn); CodeMenu.Create(txtAmazonS3ObjectPrefix, CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn); CodeMenu.Create(txtMediaFirePath, CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn); + CodeMenu.Create(txtGoogleCloudStorageObjectPrefix, CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn); CodeMenuItem codeMenuItemInput = new CodeMenuItem("$input$", "Text/URL input"); CodeMenuItem codeMenuItemFilename = new CodeMenuItem("$filename$", "File name"); @@ -741,6 +742,7 @@ public void LoadSettings() txtGoogleCloudStorageBucket.Text = Config.GoogleCloudStorageBucket; txtGoogleCloudStorageDomain.Text = Config.GoogleCloudStorageDomain; + txtGoogleCloudStorageObjectPrefix.Text = Config.GoogleCloudStorageObjectPrefix; #endregion Google Cloud Storage @@ -3076,6 +3078,11 @@ private void txtGoogleCloudStorageDomain_TextChanged(object sender, EventArgs e) Config.GoogleCloudStorageDomain = txtGoogleCloudStorageDomain.Text; } + private void txtGoogleCloudStorageObjectPrefix_TextChanged(object sender, EventArgs e) + { + Config.GoogleCloudStorageObjectPrefix = txtGoogleCloudStorageObjectPrefix.Text; + } + #endregion Google Cloud Storage #endregion File uploaders diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx index 98ada060f..ec81493f9 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx @@ -5423,13 +5423,13 @@ store.book[0].title 5 - 4, 202 + 4, 40 3, 3, 3, 3 - 178, 0 + 972, 519 0 @@ -7067,13 +7067,13 @@ store.book[0].title 20 - 4, 40 + 4, 202 3, 3, 3, 3 - 972, 519 + 178, 0 13 @@ -7093,11 +7093,59 @@ store.book[0].title 6 + + 16, 349 + + + 324, 20 + + + 6 + + + txtGoogleCloudStorageObjectPrefix + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpGoogleCloudStorage + + + 0 + + + True + + + 13, 333 + + + 32, 13 + + + 5 + + + Path: + + + lblGoogleCloudStorageObjectPrefix + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpGoogleCloudStorage + + + 1 + True - 13, 313 + 13, 294 82, 13 @@ -7118,13 +7166,13 @@ store.book[0].title tpGoogleCloudStorage - 0 + 2 - 16, 329 + 16, 310 - 100, 20 + 324, 20 3 @@ -7139,7 +7187,7 @@ store.book[0].title tpGoogleCloudStorage - 1 + 3 True @@ -7166,13 +7214,13 @@ store.book[0].title tpGoogleCloudStorage - 2 + 4 - 16, 271 + 20, 271 - 100, 20 + 320, 20 1 @@ -7187,7 +7235,7 @@ store.book[0].title tpGoogleCloudStorage - 3 + 5 16, 16 @@ -7208,7 +7256,7 @@ store.book[0].title tpGoogleCloudStorage - 4 + 6 4, 40 @@ -12120,7 +12168,7 @@ Using an encrypted library disables sharing. 4, 4, 4, 4 - 792, 3067 + 792, 4624 6 @@ -15915,7 +15963,7 @@ Using an encrypted library disables sharing. True - 59 + 54 6, 13