Merge remote-tracking branch 'origin/2.0.2-Location' into 2.0.0-crashing-bugfixes

# Conflicts:
#	LightlessSync/UI/DtrEntry.cs
This commit is contained in:
choco
2025-12-27 23:13:20 +01:00
24 changed files with 362 additions and 124 deletions

View File

@@ -364,28 +364,21 @@ public sealed class DtrEntry : IDisposable, IHostedService
return;
}
_ = Task.Run(async () =>
try
{
try
var cid = _dalamudUtilService.GetCID();
var hashedCid = cid.ToString().GetHash256();
_localHashedCid = hashedCid;
_localHashedCidFetchedAt = now;
return hashedCid;
}
catch (Exception ex)
{
if (now >= _localHashedCidNextErrorLog)
{
var cid = await _dalamudUtilService.GetCIDAsync().ConfigureAwait(false);
var hashedCid = cid.ToString().GetHash256();
lock (_localHashedCidLock)
{
_localHashedCid = hashedCid;
_localHashedCidFetchedAt = DateTime.UtcNow;
}
_logger.LogDebug(ex, "Failed to refresh local hashed CID for Lightfinder DTR entry.");
_localHashedCidNextErrorLog = now + _localHashedCidErrorCooldown;
}
catch (Exception ex)
{
var now = DateTime.UtcNow;
lock (_localHashedCidLock)
{
if (now >= _localHashedCidNextErrorLog)
{
_logger.LogDebug(ex, "Failed to refresh local hashed CID for Lightfinder DTR entry.");
_localHashedCidNextErrorLog = now + _localHashedCidErrorCooldown;
}
_localHashedCid = null;
_localHashedCidFetchedAt = now;