Fix download/upload timeout + Fix some warnings

LICENSE

@@ -0,0 +1,7 @@
+Copyright 2022 Aurélie Delhaie
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

OpenSaveCloudClient/AboutBox.cs

@@ -20,7 +20,7 @@ namespace OpenSaveCloudClient
         public AboutBox()
         {
             InitializeComponent();
-            serverConnector = ServerConnector.GetInstance();
+            serverConnector = ServerConnector.Instance;
         }
 
         private void AboutBox_Load(object sender, EventArgs e)

OpenSaveCloudClient/AddGameForm.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddGameForm));
             this.label1 = new System.Windows.Forms.Label();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
@@ -42,7 +41,6 @@
             this.NoCoverLabel = new System.Windows.Forms.Label();
             this.CoverPicture = new System.Windows.Forms.PictureBox();
             this.AddButton = new System.Windows.Forms.Button();
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.PathErrorLabel = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
@@ -201,11 +199,6 @@
             this.AddButton.UseVisualStyleBackColor = true;
             this.AddButton.Click += new System.EventHandler(this.button1_Click);
             // 
-            // timer1
-            // 
-            this.timer1.Interval = 350;
-            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-            // 
             // PathErrorLabel
             // 
             this.PathErrorLabel.AutoSize = true;
@@ -259,7 +252,6 @@
         private Label label2;
         private Label NoCoverLabel;
         private PictureBox CoverPicture;
-        private System.Windows.Forms.Timer timer1;
         private Label NameWarningLabel;
         private Label PathErrorLabel;
     }

OpenSaveCloudClient/AddGameForm.cs

@@ -1,6 +1,4 @@
-using IGDB;
-using IGDB.Models;
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudClient.Core;
 using OpenSaveCloudClient.Models;
 using System;
 using System.Collections.Generic;
@@ -16,72 +14,21 @@ namespace OpenSaveCloudClient
 {
     public partial class AddGameForm : Form
     {
-
-        private readonly IGDBClient? _client;
         private GameSave result;
         private SaveManager saveManager;
 
         public GameSave Result { get { return result; } }
 
-        public AddGameForm(IGDBClient? iGDBClient)
+        public AddGameForm()
         {
             InitializeComponent();
-            _client = iGDBClient;
-            saveManager = SaveManager.GetInstance();
-            if (_client == null)
-            {
-                NoCoverLabel.Text = "IGDB is not configured";
-            }
-            else
-            {
-                NoCoverLabel.Visible = false;
-            }
-        }
-
-        private async void timer1_Tick(object sender, EventArgs e)
-        {
-            timer1.Stop();
-            if (_client != null)
-            {
-                NoCoverLabel.Visible = false;
-                CoverPicture.Visible = true;
-                if (!string.IsNullOrWhiteSpace(NameBox.Text))
-                {
-                    try
-                    {
-                        string query = string.Format("fields *; search \"{0}\";", NameBox.Text.Replace("\"", ""));
-                        Game[] games = await _client.QueryAsync<Game>(IGDBClient.Endpoints.Games, query: query);
-                        games = games.Where(g => g.Cover != null && g.Cover.Value != null).ToArray();
-                        if (games.Length > 0)
-                        {
-                            Game game = games.First();
-                            CoverPicture.LoadAsync(game.Cover.Value.Url);
-                        }
-                        else
-                        {
-                            CoverPicture.Visible = false;
-                            NoCoverLabel.Text = "No cover found";
-                            NoCoverLabel.Visible = true;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        CoverPicture.Visible = false;
-                        NoCoverLabel.Text = ex.Message;
-                        NoCoverLabel.Visible = true;
-                    }
-                }
-            }
+            saveManager = SaveManager.Instance;
+            NoCoverLabel.Text = "IGDB is not configured";
         }
 
         private void NameBox_TextChanged(object sender, EventArgs e)
         {
             NameWarningLabel.Visible = saveManager.Saves.Exists(g => g.Name == NameBox.Text);
-            if (_client != null)
-            {
-                timer1.Stop();
-                timer1.Start();
-            }
         }
 
         private void pathButton_Click(object sender, EventArgs e)

OpenSaveCloudClient/AddGameForm.resx

@@ -57,9 +57,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</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>

OpenSaveCloudClient/AddUser.cs

@@ -21,8 +21,8 @@ namespace OpenSaveCloudClient
         public AddUser()
         {
             InitializeComponent();
-            serverConnector = ServerConnector.GetInstance();
-            taskManager = TaskManager.GetInstance();
+            serverConnector = ServerConnector.Instance;
+            taskManager = TaskManager.Instance;
         }
 
         private void AddUser_Load(object sender, EventArgs e)

OpenSaveCloudClient/Core/LogManager.cs

@@ -20,10 +20,16 @@ namespace OpenSaveCloudClient.Core
             messages = new List<Log>();
         }
 
-        public static LogManager GetInstance()
+        public static LogManager Instance
         {
-            if (instance == null) { instance = new LogManager(); }
-            return instance;
+            get
+            {
+                if (instance == null)
+                {
+                    instance = new LogManager();
+                }
+                return instance;
+            }
         }
 
         public void AddError(Exception ex)

OpenSaveCloudClient/Core/SaveManager.cs

@@ -22,13 +22,16 @@ namespace OpenSaveCloudClient.Core
             ThreadPool.QueueUserWorkItem(delegate { CleanArchiveFolder(); });
         }
 
-        public static SaveManager GetInstance()
+        public static SaveManager Instance
         {
-            if (instance == null)
+            get
             {
-                instance = new SaveManager();
+                if (instance == null)
+                {
+                    instance = new SaveManager();
+                }
+                return instance;
             }
-            return instance;
         }
 
         public GameSave Create(string name, string path, string coverHash)

OpenSaveCloudClient/Core/ServerConnector.cs

@@ -29,7 +29,7 @@ namespace OpenSaveCloudClient.Core
 
         private readonly LogManager logManager;
         private readonly TaskManager taskManager;
-        private readonly Configuration configuration;
+        private readonly UserConfiguration configuration;
         private readonly SaveManager saveManager;
 
 
@@ -42,19 +42,21 @@ namespace OpenSaveCloudClient.Core
 
         private ServerConnector()
         {
-            configuration = Configuration.GetInstance();
-            logManager = LogManager.GetInstance();
-            taskManager = TaskManager.GetInstance();
-            saveManager = SaveManager.GetInstance();
+            configuration = UserConfiguration.Instance;
+            logManager = LogManager.Instance;
+            taskManager = TaskManager.Instance;
+            saveManager = SaveManager.Instance;
         }
 
-        public static ServerConnector GetInstance()
+        public static ServerConnector Instance
         {
-            if (instance == null)
-            {
-                instance = new ServerConnector();
+            get {
+                if (instance == null)
+                {
+                    instance = new ServerConnector();
+                }
+                return instance;
             }
-            return instance;
         }
 
         /// <summary>
@@ -441,6 +443,7 @@ namespace OpenSaveCloudClient.Core
                 client.DefaultRequestHeaders.Add("X-Upload-Key", uploadToken);
                 client.DefaultRequestHeaders.Add("X-Game-Save-Hash", newHash);
                 client.DefaultRequestHeaders.Add("X-Hash", hash);
+                client.Timeout = Timeout.InfiniteTimeSpan;
                 HttpResponseMessage response = client.PostAsync(string.Format("{0}:{1}/api/v1/game/upload", host, port), multipartFormContent).Result;
                 if (response.IsSuccessStatusCode)
                 {
@@ -480,6 +483,7 @@ namespace OpenSaveCloudClient.Core
                 using HttpClient client = new();
                 client.DefaultRequestHeaders.Add("Authorization", "bearer " + token);
                 client.DefaultRequestHeaders.Add("X-Upload-Key", uploadToken);
+                client.Timeout = Timeout.InfiniteTimeSpan;
                 HttpResponseMessage response = client.GetAsync(string.Format("{0}:{1}/api/v1/game/download", host, port)).Result;
                 if (response.IsSuccessStatusCode)
                 {

OpenSaveCloudClient/Core/TaskManager.cs

@@ -21,7 +21,7 @@ namespace OpenSaveCloudClient.Core
 
         private TaskManager()
         {
-            logManager = LogManager.GetInstance();
+            logManager = LogManager.Instance;
             _tasks = new Dictionary<string, AsyncTaskInformation>();
             mut = new Mutex();
             timer = new System.Timers.Timer
@@ -32,13 +32,16 @@ namespace OpenSaveCloudClient.Core
             timer.Start();
         }
 
-        public static TaskManager GetInstance()
+        public static TaskManager Instance
         {
-            if (instance == null)
+            get
             {
-                instance = new TaskManager();
+                if (instance == null)
+                {
+                    instance = new TaskManager();
+                }
+                return instance;
             }
-            return instance;
         }
 
         public string StartTask(string label, bool undefined, int progressMax)
@@ -125,7 +128,11 @@ namespace OpenSaveCloudClient.Core
             mut.WaitOne();
             try
             {
-                _tasks.Clear();
+                var ended = _tasks.Where(t => t.Value.Status != AsyncTaskStatus.Running).ToArray();
+                foreach (var task in ended)
+                {
+                    _tasks.Remove(task.Key);
+                }
                 OnTaskCleared(new TaskClearedEventArgs());
             }
             finally

OpenSaveCloudClient/DownloadGameForm.cs

@@ -28,8 +28,8 @@ namespace OpenSaveCloudClient
         {
             InitializeComponent();
             result = new List<GameSave>();
-            serverConnector = ServerConnector.GetInstance();
-            saveManager = SaveManager.GetInstance();
+            serverConnector = ServerConnector.Instance;
+            saveManager = SaveManager.Instance;
         }
 
         private void DownloadGameForm_Load(object sender, EventArgs e)

OpenSaveCloudClient/GameLibraryForm.cs

@@ -1,6 +1,5 @@
 using OpenSaveCloudClient.Models;
 using OpenSaveCloudClient.Core;
-using IGDB;
 using OpenSaveCloudClient.Models.Remote;
 
 namespace OpenSaveCloudClient
@@ -8,8 +7,7 @@ namespace OpenSaveCloudClient
     public partial class GameLibrary : Form
     {
 
-        private readonly Configuration _configuration;
-        //private readonly IGDBClient? _client;
+        private readonly UserConfiguration _configuration;
         private readonly SaveManager saveManager;
         private readonly TaskManager taskManager;
         private readonly ServerConnector serverConnector;
@@ -19,21 +17,15 @@ namespace OpenSaveCloudClient
         public GameLibrary()
         {
             InitializeComponent();
-            saveManager = SaveManager.GetInstance();
-            taskManager = TaskManager.GetInstance();
-            serverConnector = ServerConnector.GetInstance();
-            _configuration = Configuration.GetInstance();
-            logManager = LogManager.GetInstance();
+            saveManager = SaveManager.Instance;
+            taskManager = TaskManager.Instance;
+            serverConnector = ServerConnector.Instance;
+            _configuration = UserConfiguration.Instance;
+            logManager = LogManager.Instance;
 
             listViewContextMenu = new ContextMenuStrip();
             listViewContextMenu.Items.Add("Delete from server").Click += contextMenuDeleteFromServer_Click;
             listViewContextMenu.Items.Add("Remove from local library").Click += contextMenuRemoveFromLocalLibrary_Click;
-            /*if (_configuration.GetBoolean("igdb.enabled", false))
-            {
-                string clientId = _configuration.GetString("igdb.client_id", "");
-                string clientSecret = _configuration.GetString("igdb.client_secret", "");
-                _client = new IGDBClient(clientId, clientSecret);
-            }*/
         }
 
         private void GameLibrary_Load(object sender, EventArgs e)
@@ -172,7 +164,7 @@ namespace OpenSaveCloudClient
 
         private void AddButton_Click(object sender, EventArgs e)
         {
-            AddGameForm form = new(/*_client*/ null);
+            AddGameForm form = new();
             if (form.ShowDialog() == DialogResult.OK) {
                 GameSave newGame = form.Result;
                 ThreadPool.QueueUserWorkItem(delegate { AddGameToLibrary(newGame); });

OpenSaveCloudClient/LoginForm.cs

@@ -19,7 +19,7 @@ namespace OpenSaveCloudClient
         public LoginForm()
         {
             InitializeComponent();
-            serverConnector = ServerConnector.GetInstance();
+            serverConnector = ServerConnector.Instance;
         }
 
         private void LoginButton_Click(object sender, EventArgs e)

OpenSaveCloudClient/LogsForm.cs

@@ -19,7 +19,7 @@ namespace OpenSaveCloudClient
         public LogsForm()
         {
             InitializeComponent();
-            logManager = LogManager.GetInstance();
+            logManager = LogManager.Instance;
             logManager.NewMessage += logManager_NewError;
         }
 

OpenSaveCloudClient/Models/Configuration.cs

@@ -7,24 +7,27 @@ using System.Text.Json;
 
 namespace OpenSaveCloudClient.Models
 {
-    public class Configuration
+    public class UserConfiguration
     {
-        private static Configuration? instance;
+        private static UserConfiguration? instance;
         private Dictionary<string, string> _values;
 
-        private Configuration()
+        private UserConfiguration()
         {
             _values = new Dictionary<string, string>();
             Load();
         }
 
-        public static Configuration GetInstance()
+        public static UserConfiguration Instance
         {
-            if (instance == null)
+            get
             {
-                instance = new Configuration();
+                if (instance == null)
+                {
+                    instance = new UserConfiguration();
+                }
+                return instance;
             }
-            return instance;
         }
 
         private void Load()

OpenSaveCloudClient/Models/GameSave.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using System.IO.Compression;
 using System.Security.Cryptography;
 using OpenSaveCloudClient.Core;
+using System.Globalization;
 
 namespace OpenSaveCloudClient.Models
 {
@@ -96,7 +97,7 @@ namespace OpenSaveCloudClient.Models
             byte[]? hashBytes = HashTool.HashDirectory(FolderPath);
             if (hashBytes == null)
             {
-                throw new Exception(String.Format("failed to get hash of directory '{0}'", FolderPath));
+                throw new Exception(message: string.Format(CultureInfo.CurrentCulture, "failed to get hash of directory '{0}'", FolderPath));
             }
             currentHash = BitConverter.ToString(hashBytes).Replace("-", "");
             if (currentHash != hash)

OpenSaveCloudClient/OpenSaveCloudClient.csproj

@@ -2,15 +2,35 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.22621.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
-    <SupportedOSPlatformVersion>8.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
     <PlatformTarget>x64</PlatformTarget>
     <PackageIcon>logo.png</PackageIcon>
     <ApplicationIcon>logo.ico</ApplicationIcon>
     <Platforms>AnyCPU;x64</Platforms>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>D:\keyPair.snk</AssemblyOriginatorKeyFile>
+    <AnalysisLevel>6.0-all</AnalysisLevel>
+    <Version>1.0.2</Version>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <DebugType>none</DebugType>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,7 +38,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IGDB" Version="2.3.1" />
     <PackageReference Include="PasswordGenerator" Version="2.1.0" />
   </ItemGroup>
 
@@ -28,6 +47,11 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Update="Properties\Settings.Designer.cs">
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -42,6 +66,10 @@
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
+    <None Update="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
 
 </Project>

OpenSaveCloudClient/Properties/Settings.Designer.cs

@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenSaveCloudClient.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}

OpenSaveCloudClient/Properties/Settings.settings

@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+</SettingsFile>

OpenSaveCloudClient/SettingsForm.cs

@@ -14,12 +14,12 @@ namespace OpenSaveCloudClient
     public partial class SettingsForm : Form
     {
 
-        private readonly Configuration _configuration;
+        private readonly UserConfiguration _configuration;
 
         public SettingsForm()
         {
             InitializeComponent();
-            _configuration = Configuration.GetInstance();
+            _configuration = UserConfiguration.Instance;
             InitAndFillFields();
         }
 

OpenSaveCloudClient/TasksForm.cs

@@ -19,7 +19,7 @@ namespace OpenSaveCloudClient
         public TasksForm()
         {
             InitializeComponent();
-            taskManager = TaskManager.GetInstance();
+            taskManager = TaskManager.Instance;
         }
 
         private void AddLVItem(string key, string name, string status, bool undefined, int value, int max)

OpenSaveCloudClient/UserForm.cs

@@ -20,7 +20,7 @@ namespace OpenSaveCloudClient
         public UserForm()
         {
             InitializeComponent();
-            serverConnector = ServerConnector.GetInstance();
+            serverConnector = ServerConnector.Instance;
         }
 
         private void UserForm_Load(object sender, EventArgs e)

OpenSaveCloudClient/UserManagementForm.cs

@@ -20,7 +20,7 @@ namespace OpenSaveCloudClient
         public UserManagementForm()
         {
             InitializeComponent();
-            serverConnector = ServerConnector.GetInstance();
+            serverConnector = ServerConnector.Instance;
         }
 
         private void UserSettingsButton_Click(object sender, EventArgs e)

OpenSaveCloudClient/WaitingForm.Designer.cs

@@ -82,6 +82,5 @@
 
         private Label label1;
         private PictureBox LoadingIndicator;
-        private System.Windows.Forms.Timer timer1;
     }
 }

OpenSaveCloudClient/WaitingForm.cs

@@ -19,7 +19,7 @@ namespace OpenSaveCloudClient
         public WaitingForm()
         {
             InitializeComponent();
-            taskManager = TaskManager.GetInstance();
+            taskManager = TaskManager.Instance;
             taskManager.TaskChanged += OnTaskChanged;
         }