ToxicMushroom/mare.client
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.client.git synced 2025-12-14 02:34:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

upload timeout 100s->300s

Browse source
This commit is contained in:
rootdarkarchon 2023-04-06 01:53:54 +02:00
parent 1e9d4998ce
commit e96c652e64
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MareAPI

@ -1 +1 @@
Subproject commit 22346739d2028d4244a86a8bcdc4e85dc5fb1c98 Subproject commit 8a7640c1a13bcfc32977a4e0818754f7d080ef4e

2
MareSynchronos/MareSynchronos.csproj
View file

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Authors></Authors> <Authors></Authors>
<Company></Company> <Company></Company>
<Version>0.8.18</Version> <Version>0.8.19</Version>
<Description></Description> <Description></Description>
<Copyright></Copyright> <Copyright></Copyright>
<PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl> <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>

5
MareSynchronos/PlayerData/Pairs/CachedPlayer.cs
View file

@ -213,7 +213,8 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
{ {
await _dalamudUtil.RunOnFrameworkThread(() => _ipcManager.PenumbraRemoveTemporaryCollection(Logger, applicationId, PlayerName!)).ConfigureAwait(false); await _dalamudUtil.RunOnFrameworkThread(() => _ipcManager.PenumbraRemoveTemporaryCollection(Logger, applicationId, PlayerName!)).ConfigureAwait(false);
token.ThrowIfCancellationRequested(); 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(); token.ThrowIfCancellationRequested();
} }
@ -425,7 +426,7 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
} }
var appToken = _applicationCancellationTokenSource?.Token; var appToken = _applicationCancellationTokenSource?.Token;
while ((!_applicationTask?.IsCompleted ?? false) while ((!_applicationTask?.IsCompleted ?? false)
&& !downloadToken.IsCancellationRequested && !downloadToken.IsCancellationRequested
&& (!appToken?.IsCancellationRequested ?? false)) && (!appToken?.IsCancellationRequested ?? false))
{ {

1
MareSynchronos/WebAPI/Files/FileTransferOrchestrator.cs
View file

@ -22,6 +22,7 @@ public class FileTransferOrchestrator : DisposableMediatorSubscriberBase
_mareConfig = mareConfig; _mareConfig = mareConfig;
_serverManager = serverManager; _serverManager = serverManager;
_httpClient = new(); _httpClient = new();
_httpClient.Timeout = TimeSpan.FromSeconds(300);
_availableDownloadSlots = mareConfig.Current.ParallelDownloads; _availableDownloadSlots = mareConfig.Current.ParallelDownloads;
_downloadSemaphore = new(_availableDownloadSlots); _downloadSemaphore = new(_availableDownloadSlots);