direct upload

SamuelTulach · Aug 21, 2020 · e1f50eb · e1f50eb
1 parent 4bffee1
commit e1f50eb
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 21 deletions.
diff --git a/localization/Czech.json b/localization/Czech.json
@@ -8,6 +8,7 @@
   "SettingsForm_Language": "Jazyk",
   "SettingsForm_Save": "Uložit",
   "SettingsForm_Open": "Otevřit soubor nastavení",
+  "SettingsForm_DirectUpload": "Nahrát soubor ihned",
   "UploadForm_Info": "Informace o souboru",
   "UploadForm_Upload": "Nahrát",
   "UploadForm_Cancel": "Zrušit",

diff --git a/localization/English.json b/localization/English.json
@@ -8,6 +8,7 @@
     "SettingsForm_Language": "Language",
     "SettingsForm_Save": "Save",
     "SettingsForm_Open": "Open settings file",
+    "SettingsForm_DirectUpload": "Direct file upload",
     "UploadForm_Info": "File information",
     "UploadForm_Upload": "Upload",
     "UploadForm_Cancel": "Cancel",

diff --git a/uploader/uploader/LocalizationBase.cs b/uploader/uploader/LocalizationBase.cs
@@ -19,6 +19,7 @@ class LocalizationBase
         public string SettingsForm_Language = "Language";
         public string SettingsForm_Save = "Save";
         public string SettingsForm_Open = "Open settings file";
+        public string SettingsForm_DirectUpload = "Direct file upload";
 
         public string UploadForm_Info = "File information";
         public string UploadForm_Upload = "Upload";

diff --git a/uploader/uploader/Settings.cs b/uploader/uploader/Settings.cs
@@ -12,6 +12,7 @@ public class Settings
     {
         public string ApiKey = "";
         public string Language = "";
+        public bool DirectUpload = false;
 
         public static string GetSettingsFilename()
         {

diff --git a/uploader/uploader/SettingsForm.Designer.cs b/uploader/uploader/SettingsForm.Designer.cs
diff --git a/uploader/uploader/SettingsForm.cs b/uploader/uploader/SettingsForm.cs
@@ -30,6 +30,7 @@ private void SettingsForm_Load(object sender, EventArgs e)
             var settings = Settings.LoadSettings();
 
             apiTextbox.Text = settings.ApiKey;
+            directCheckbox.Checked = settings.DirectUpload;
 
             var languages = LocalizationHelper.GetLanguages();
             languageCombo.Items.Clear();
@@ -56,6 +57,7 @@ private void SettingsForm_Load(object sender, EventArgs e)
             saveButton.Text = LocalizationHelper.Base.SettingsForm_Save;
             openButton.Text = LocalizationHelper.Base.SettingsForm_Open;
             this.Text = LocalizationHelper.Base.SettingsForm_Title;
+            directCheckbox.Text = LocalizationHelper.Base.SettingsForm_DirectUpload;
 
             //LocalizationHelper.Export();
         }
@@ -80,7 +82,8 @@ private void saveButton_Click(object sender, EventArgs e)
             var settings = new Settings
             {
                 ApiKey = apiTextbox.Text, 
-                Language = languageCombo.Text
+                Language = languageCombo.Text,
+                DirectUpload = directCheckbox.Checked
             };
 
             Settings.SaveSettings(settings);

diff --git a/uploader/uploader/UploadForm.cs b/uploader/uploader/UploadForm.cs
@@ -63,6 +63,17 @@ private void Finish(bool resetText)
             uploadButton.Text = LocalizationHelper.Base.UploadForm_Upload;
         }
 
+        private void CloseWindow()
+        {
+            if (InvokeRequired)
+            {
+                this.Invoke(new Action(() => CloseWindow()));
+                return;
+            }
+
+            this.Close();
+        }
+
         private void Upload()
         {
             if (string.IsNullOrEmpty(_settings.ApiKey))
@@ -98,6 +109,8 @@ private void Upload()
             {
                 var reportLink = reportJson.permalink.ToString();
                 Process.Start(reportLink);
+
+                if (_settings.DirectUpload) CloseWindow();
             }
             catch (RuntimeBinderException)
             {
@@ -116,6 +129,8 @@ private void Upload()
                 {
                     var scanLink = scanJson.permalink.ToString();
                     Process.Start(scanLink);
+
+                    if (_settings.DirectUpload) CloseWindow();
                 }
                 catch (RuntimeBinderException)
                 {
@@ -129,6 +144,20 @@ private void Upload()
             Finish(true);
         }
 
+        private void StartUploadThread()
+        {
+            if (_uploadThread != null && _uploadThread.IsAlive)
+            {
+                _uploadThread.Abort();
+                uploadButton.Text = LocalizationHelper.Base.UploadForm_Upload;
+                return;
+            }
+            uploadButton.Text = LocalizationHelper.Base.UploadForm_Cancel;
+
+            _uploadThread = new Thread(Upload);
+            _uploadThread.Start();
+        }
+
         private void UploadForm_Load(object sender, EventArgs e)
         {
             mdTextbox.Text = Utils.GetMD5(_fileName);
@@ -138,20 +167,16 @@ private void UploadForm_Load(object sender, EventArgs e)
             settingsGroup.Text = LocalizationHelper.Base.UploadForm_Info;
             uploadButton.Text = LocalizationHelper.Base.UploadForm_Upload;
             statusLabel.Text = LocalizationHelper.Base.Message_Idle;
-        }
 
-        private void uploadButton_Click(object sender, EventArgs e)
-        {
-            if (_uploadThread != null && _uploadThread.IsAlive)
+            if (_settings.DirectUpload)
             {
-                _uploadThread.Abort();
-                uploadButton.Text = LocalizationHelper.Base.UploadForm_Upload;
-                return;
+                StartUploadThread();
             }
-            uploadButton.Text = LocalizationHelper.Base.UploadForm_Cancel;
+        }
 
-            _uploadThread = new Thread(Upload);
-            _uploadThread.Start();
+        private void uploadButton_Click(object sender, EventArgs e)
+        {
+            StartUploadThread();
         }
 
         private void UploadForm_FormClosing(object sender, FormClosingEventArgs e)

diff --git a/uploader/uploader/packages.config b/uploader/uploader/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net472" />
-  <package id="RestSharp" version="106.11.2" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net46" />
+  <package id="RestSharp" version="106.11.4" targetFramework="net46" />
 </packages>
diff --git a/uploader/uploader/uploader.csproj b/uploader/uploader/uploader.csproj
@@ -42,11 +42,11 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\darkui\DarkUI.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="RestSharp, Version=106.11.2.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.106.11.2\lib\net452\RestSharp.dll</HintPath>
+    <Reference Include="RestSharp, Version=106.11.4.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.106.11.4\lib\net452\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />