Lightless-Sync/LightlessClient
8
1
Fork 2
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases 52 Wiki Activity

Revert "Added another try on fetching download status"

Browse Source 
This reverts commit deb7f67e59.
This commit is contained in:
cake
2026-01-03 23:22:18 +01:00
parent deb7f67e59
commit 3bbda69699
1 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
LightlessSync/UI/DownloadUi.cs
View File

@@ -1,5 +1,4 @@
using Dalamud.Bindings.ImGui;
using Dalamud.Game.ClientState.Statuses;
using Dalamud.Interface.Colors;
using LightlessSync.LightlessConfiguration;
using LightlessSync.LightlessConfiguration.Models;
@@ -168,30 +167,22 @@ public class DownloadUi : WindowMediatorSubscriberBase
List<KeyValuePair<GameObjectHandler, Dictionary<string, FileDownloadStatus>>> transfers;
try
{
transfers = _currentDownloads?.ToList() ?? [];
transfers = _currentDownloads.ToList();
}
catch (ArgumentException)
{
return;
}
foreach (var transfer in transfers)
{
var transferKey = transfer.Key;
if (transferKey is null)
continue;
var statusDict = transfer.Value;
if (statusDict is null)
// Skip if no valid game object
if (transferKey.GetGameObject() == null)
continue;
var gameObj = transferKey.GetGameObject();
if (gameObj is null)
{
_smoothed.Remove(transferKey);
continue;
}
var rawPos = _dalamudUtilService.WorldToScreen(transferKey.GetGameObject());
// If RawPos is zero, remove it from smoothed dictionary
@@ -216,29 +207,25 @@ public class DownloadUi : WindowMediatorSubscriberBase
var dlProg = 0;
var dlDecomp = 0;
try
foreach (var entry in transfer.Value)
{
foreach (var entry in statusDict)
var fileStatus = entry.Value;
switch (fileStatus.DownloadStatus)
{
var fileStatus = entry.Value;
if (fileStatus is null) continue;
totalBytes += fileStatus.TotalBytes;
transferredBytes += fileStatus.TransferredBytes;
switch (fileStatus.DownloadStatus)
{
case DownloadStatus.WaitingForSlot: dlSlot++; break;
case DownloadStatus.WaitingForQueue: dlQueue++; break;
case DownloadStatus.Downloading: dlProg++; break;
case DownloadStatus.Decompressing: dlDecomp++; break;
}
case DownloadStatus.WaitingForSlot:
dlSlot++;
break;
case DownloadStatus.WaitingForQueue:
dlQueue++;
break;
case DownloadStatus.Downloading:
dlProg++;
break;
case DownloadStatus.Decompressing:
dlDecomp++;
break;
}
}
catch (InvalidOperationException)
{
continue;
}
string statusText;
if (dlProg > 0)