From e96c652e64b301491bf119eca54f0fd0a08c1472 Mon Sep 17 00:00:00 2001
From: rootdarkarchon <root.darkarchon@outlook.com>
Date: Thu, 6 Apr 2023 01:53:54 +0200
Subject: [PATCH] upload timeout 100s->300s

---
 MareAPI                                                 | 2 +-
 MareSynchronos/MareSynchronos.csproj                    | 2 +-
 MareSynchronos/PlayerData/Pairs/CachedPlayer.cs         | 5 +++--
 MareSynchronos/WebAPI/Files/FileTransferOrchestrator.cs | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/MareAPI b/MareAPI
index 2234673..8a7640c 160000
--- a/MareAPI
+++ b/MareAPI
@@ -1 +1 @@
-Subproject commit 22346739d2028d4244a86a8bcdc4e85dc5fb1c98
+Subproject commit 8a7640c1a13bcfc32977a4e0818754f7d080ef4e
diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index 71c1807..a54cf7d 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>0.8.18</Version>
+    <Version>0.8.19</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>
diff --git a/MareSynchronos/PlayerData/Pairs/CachedPlayer.cs b/MareSynchronos/PlayerData/Pairs/CachedPlayer.cs
index e79859c..6a1ef8d 100644
--- a/MareSynchronos/PlayerData/Pairs/CachedPlayer.cs
+++ b/MareSynchronos/PlayerData/Pairs/CachedPlayer.cs
@@ -213,7 +213,8 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
     {
         await _dalamudUtil.RunOnFrameworkThread(() => _ipcManager.PenumbraRemoveTemporaryCollection(Logger, applicationId, PlayerName!)).ConfigureAwait(false);
         token.ThrowIfCancellationRequested();
-        await _dalamudUtil.RunOnFrameworkThread(() => _ipcManager.PenumbraSetTemporaryMods(Logger, applicationId, PlayerName!, _charaHandler?.GameObjectLazy?.Value.ObjectTableIndex(), moddedPaths, manipulationData)).ConfigureAwait(false);
+        await _dalamudUtil.RunOnFrameworkThread(() => _ipcManager.PenumbraSetTemporaryMods(Logger, applicationId, PlayerName!,
+            _charaHandler?.GameObjectLazy?.Value.ObjectTableIndex(), moddedPaths, manipulationData)).ConfigureAwait(false);
         token.ThrowIfCancellationRequested();
     }
 
@@ -425,7 +426,7 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
             }
 
             var appToken = _applicationCancellationTokenSource?.Token;
-            while ((!_applicationTask?.IsCompleted ?? false) 
+            while ((!_applicationTask?.IsCompleted ?? false)
                    && !downloadToken.IsCancellationRequested
                    && (!appToken?.IsCancellationRequested ?? false))
             {
diff --git a/MareSynchronos/WebAPI/Files/FileTransferOrchestrator.cs b/MareSynchronos/WebAPI/Files/FileTransferOrchestrator.cs
index 7bf997f..181437f 100644
--- a/MareSynchronos/WebAPI/Files/FileTransferOrchestrator.cs
+++ b/MareSynchronos/WebAPI/Files/FileTransferOrchestrator.cs
@@ -22,6 +22,7 @@ public class FileTransferOrchestrator : DisposableMediatorSubscriberBase
         _mareConfig = mareConfig;
         _serverManager = serverManager;
         _httpClient = new();
+        _httpClient.Timeout = TimeSpan.FromSeconds(300);
 
         _availableDownloadSlots = mareConfig.Current.ParallelDownloads;
         _downloadSemaphore = new(_availableDownloadSlots);