Added progress bar and upload selected button

mr-manuel · Nov 4, 2023 · 4c28765 · 4c28765
1 parent 59fe9ac
commit 4c28765
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 9 deletions.
diff --git a/MiniserverForm.Designer.cs b/MiniserverForm.Designer.cs
diff --git a/MiniserverForm.cs b/MiniserverForm.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace LoxStatEdit
@@ -329,7 +330,12 @@ private void DataGridView_CellContentClick(object sender, DataGridViewCellEventA
             switch(e.ColumnIndex)
             {
                 case 4: //Download
+                    progressBar.Maximum = 1;
+                    progressBar.Value = 0;
+                    progressLabel.Text = "Starting download...";
                     Download(fileItem);
+                    progressBar.Value = 1;
+                    progressLabel.Text = "Download complete!";
                     RefreshLocal();
                     RefreshGridView();
                     break;
@@ -338,27 +344,61 @@ private void DataGridView_CellContentClick(object sender, DataGridViewCellEventA
                         form.ShowDialog(this);
                     break;
                 case 6: //Upload
+                    progressBar.Maximum = 1;
+                    progressBar.Value = 0;
+                    progressLabel.Text = "Starting upload...";
                     Upload(fileItem);
+                    progressBar.Value = 1;
+                    progressLabel.Text = "Upload complete!";
                     RefreshMs();
                     RefreshGridView();
                     break;
             }
         }
 
-        private void DownloadButton_Click(object sender, EventArgs e)
+        private async void DownloadButton_Click(object sender, EventArgs e)
         {
+            progressBar.Maximum = _dataGridView.SelectedRows.Count;
+            progressBar.Value = 0;
+            progressLabel.Text = "Starting download...";
+
             foreach(DataGridViewRow row in _dataGridView.SelectedRows)
-                Download(_fileItems[row.Index]);
+            {
+                int rowIndex = row.Index; // Capture the index for the closure
+                await Task.Run(() => Download(_fileItems[rowIndex]));
+                progressBar.Value++;
+                progressLabel.Text = $"Downloaded {progressBar.Value} of {progressBar.Maximum}";
+            }
+            progressLabel.Text = "Download complete!";
+
             RefreshLocal();
             RefreshGridView();
+
+            // foreach(DataGridViewRow row in _dataGridView.SelectedRows)
+            //     Download(_fileItems[row.Index]);
+            // RefreshLocal();
+            // RefreshGridView();
         }
 
-        private void UploadButton_Click(object sender, EventArgs e)
+        private async void UploadButton_Click(object sender, EventArgs e)
         {
+            progressBar.Maximum = _dataGridView.SelectedRows.Count;
+            progressBar.Value = 0;
+            progressLabel.Text = "Starting upload...";
+
             foreach(DataGridViewRow row in _dataGridView.SelectedRows)
-                Upload(_fileItems[row.Index]);
-            RefreshMs();
-            RefreshGridView();
+            {
+                int rowIndex = row.Index; // Capture the index for the closure
+                await Task.Run(() => Upload(_fileItems[rowIndex]));
+                progressBar.Value++;
+                progressLabel.Text = $"Uploaded {progressBar.Value} of {progressBar.Maximum}";
+            }
+            progressLabel.Text = "Upload complete!";
+
+            // foreach(DataGridViewRow row in _dataGridView.SelectedRows)
+            //     Upload(_fileItems[row.Index]);
+            // RefreshMs();
+            // RefreshGridView();
         }
 
         // Launch project link

diff --git a/MiniserverForm.resx b/MiniserverForm.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -159,6 +159,9 @@
   <metadata name="_uploadCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="uploadButton.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>