ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Cleanup, log with continuation tasks

Browse source
This commit is contained in:
Raymond 2021-11-10 20:24:36 -05:00
parent 6c1b50174a
commit 042558aa5e
1 changed files with 28 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Dalamud/Game/Network/Internal/NetworkHandlers.cs
View file

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -11,6 +12,7 @@ using Dalamud.Game.Gui;
using Dalamud.Game.Network.Internal.MarketBoardUploaders; using Dalamud.Game.Network.Internal.MarketBoardUploaders;
using Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis; using Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis;
using Dalamud.Game.Network.Structures; using Dalamud.Game.Network.Structures;
using Dalamud.Utility;
using Lumina.Excel.GeneratedSheets; using Lumina.Excel.GeneratedSheets;
using Serilog; using Serilog;
@ -58,9 +60,10 @@ namespace Dalamud.Game.Network.Internal
{ {
if (!this.optOutMbUploads) if (!this.optOutMbUploads)
{ {
if (opCode == Service<DataManager>.Get().ClientOpCodes["MarketBoardPurchaseHandler"]) if (opCode == dataManager.ClientOpCodes["MarketBoardPurchaseHandler"])
{ {
this.marketBoardPurchaseHandler = MarketBoardPurchaseHandler.Read(dataPtr); this.marketBoardPurchaseHandler = MarketBoardPurchaseHandler.Read(dataPtr);
return;
} }
} }
@ -137,14 +140,9 @@ namespace Dalamud.Game.Network.Internal
request.ListingsRequestId, request.ListingsRequestId,
request.CatalogId, request.CatalogId,
request.AmountToArrive); request.AmountToArrive);
try
{ Task.Run(() => this.uploader.Upload(request))
Task.Run(() => this.uploader.Upload(request)); .ContinueWith((task) => Log.Error(task.Exception, "Market Board offerings data upload failed."), TaskContinuationOptions.OnlyOnFaulted);
}
catch (Exception ex)
{
Log.Error(ex, "Market Board data upload failed.");
}
} }
return; return;
@ -176,14 +174,8 @@ namespace Dalamud.Game.Network.Internal
{ {
Log.Verbose("Request had 0 amount, uploading now"); Log.Verbose("Request had 0 amount, uploading now");
try Task.Run(() => this.uploader.Upload(request))
{ .ContinueWith((task) => Log.Error(task.Exception, "Market Board history data upload failed."), TaskContinuationOptions.OnlyOnFaulted);
Task.Run(() => this.uploader.Upload(request));
}
catch (Exception ex)
{
Log.Error(ex, "Market Board data upload failed.");
}
} }
} }
@ -207,14 +199,11 @@ namespace Dalamud.Game.Network.Internal
taxes.IshgardTax, taxes.IshgardTax,
taxes.KuganeTax, taxes.KuganeTax,
taxes.CrystariumTax); taxes.CrystariumTax);
try
{ Task.Run(() => this.uploader.UploadTax(taxes))
Task.Run(() => this.uploader.UploadTax(taxes)); .ContinueWith((task) => Log.Error(task.Exception, "Market Board tax data upload failed."), TaskContinuationOptions.OnlyOnFaulted);
}
catch (Exception ex) return;
{
Log.Error(ex, "Market Board data upload failed.");
}
} }
if (opCode == dataManager.ServerOpCodes["MarketBoardPurchase"]) if (opCode == dataManager.ServerOpCodes["MarketBoardPurchase"])
@ -224,17 +213,26 @@ namespace Dalamud.Game.Network.Internal
var purchase = MarketBoardPurchase.Read(dataPtr); var purchase = MarketBoardPurchase.Read(dataPtr);
var sameQty = purchase.ItemQuantity == this.marketBoardPurchaseHandler.ItemQuantity;
var itemMatch = purchase.CatalogId == this.marketBoardPurchaseHandler.CatalogId;
var itemMatchHq = purchase.CatalogId == this.marketBoardPurchaseHandler.CatalogId + 1_000_000;
// Transaction succeeded // Transaction succeeded
if (purchase.ItemQuantity == this.marketBoardPurchaseHandler.ItemQuantity if (sameQty && (itemMatch || itemMatchHq))
&& (purchase.CatalogId == this.marketBoardPurchaseHandler.CatalogId {
|| purchase.CatalogId == this.marketBoardPurchaseHandler.CatalogId + 1_000_000))
{ // HQ
Log.Verbose($"Bought {purchase.ItemQuantity}x {this.marketBoardPurchaseHandler.CatalogId} for {this.marketBoardPurchaseHandler.PricePerUnit * purchase.ItemQuantity} gils, listing id is {this.marketBoardPurchaseHandler.ListingId}"); Log.Verbose($"Bought {purchase.ItemQuantity}x {this.marketBoardPurchaseHandler.CatalogId} for {this.marketBoardPurchaseHandler.PricePerUnit * purchase.ItemQuantity} gils, listing id is {this.marketBoardPurchaseHandler.ListingId}");
var handler = this.marketBoardPurchaseHandler; // Capture the object so that we don't pass in a null one when the task starts. var handler = this.marketBoardPurchaseHandler; // Capture the object so that we don't pass in a null one when the task starts.
Task.Run(() => this.uploader.UploadPurchase(handler));
Task.Run(() => this.uploader.UploadPurchase(handler))
.ContinueWith((task) => Log.Error(task.Exception, "Market Board purchase data upload failed."), TaskContinuationOptions.OnlyOnFaulted);
} }
this.marketBoardPurchaseHandler = null; this.marketBoardPurchaseHandler = null;
return;
}
}
}
private unsafe void HandleCfPop(IntPtr dataPtr) private unsafe void HandleCfPop(IntPtr dataPtr)
{ {