From dc1e1c044a48eca7884d0c578623cb408e64d087 Mon Sep 17 00:00:00 2001 From: rootdarkarchon Date: Sun, 30 Apr 2023 23:35:18 +0200 Subject: [PATCH] fix cancelled file uploads marked as verified, fix exception spam for portraits --- MareSynchronos/Services/DalamudUtilService.cs | 4 +++- MareSynchronos/WebAPI/Files/FileUploadManager.cs | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/MareSynchronos/Services/DalamudUtilService.cs b/MareSynchronos/Services/DalamudUtilService.cs index 267fd64..84f7a4e 100644 --- a/MareSynchronos/Services/DalamudUtilService.cs +++ b/MareSynchronos/Services/DalamudUtilService.cs @@ -239,7 +239,9 @@ public class DalamudUtilService : IHostedService { if (_clientState.LocalPlayer?.IsDead ?? false) return; - _playerCharas = _performanceCollector.LogPerformance(this, "ObjTableToCharas", () => _objectTable.OfType().ToDictionary(p => p.GetHash256(), p => (p.Name.ToString(), p.Address), StringComparer.Ordinal)); + _playerCharas = _performanceCollector.LogPerformance(this, "ObjTableToCharas", + () => _objectTable.OfType().Where(o => o.ObjectIndex < 240) + .ToDictionary(p => p.GetHash256(), p => (p.Name.ToString(), p.Address), StringComparer.Ordinal)); if (GposeTarget != null && !IsInGpose) { diff --git a/MareSynchronos/WebAPI/Files/FileUploadManager.cs b/MareSynchronos/WebAPI/Files/FileUploadManager.cs index b1fc262..d49746b 100644 --- a/MareSynchronos/WebAPI/Files/FileUploadManager.cs +++ b/MareSynchronos/WebAPI/Files/FileUploadManager.cs @@ -156,14 +156,19 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase await UploadFileStream(compressedFile, fileHash, uploadToken).ConfigureAwait(false); else await UploadFileFull(compressedFile, fileHash, uploadToken).ConfigureAwait(false); + _verifiedUploadedHashes[fileHash] = DateTime.UtcNow; } catch (Exception ex) { - if (!_mareConfigService.Current.UseAlternativeFileUpload) + if (!_mareConfigService.Current.UseAlternativeFileUpload && ex is not OperationCanceledException) { Logger.LogWarning(ex, "[{hash}] Error during file upload, trying alternative file upload", fileHash); await UploadFileFull(compressedFile, fileHash, uploadToken).ConfigureAwait(false); } + else + { + Logger.LogWarning(ex, "[{hash}] File upload cancelled", fileHash); + } } } @@ -246,7 +251,6 @@ public sealed class FileUploadManager : DisposableMediatorSubscriberBase await uploadTask.ConfigureAwait(false); uploadTask = UploadFile(data.Item2, file.Hash, uploadToken); uploadToken.ThrowIfCancellationRequested(); - _verifiedUploadedHashes[file.Hash] = DateTime.UtcNow; } if (CurrentUploads.Any())