Fix download/upload timeout + Fix some warnings

This commit is contained in:
Aurélie Delhaie
2022-08-08 18:00:11 +02:00
parent e3d33a1af9
commit 40645a80a1
28 changed files with 71 additions and 52 deletions

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)
{

View File

@@ -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)