ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-30 20:33:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add MarketBoard service and associated interfaces, test and data widget (#1822)

Browse source 
* Add MarketBoard service and associated interfaces, test and data widget
* Dispose of events properly
* Make listings readonly lists + provide internal list for internal use
* Rename CatalogId to ItemId on interfaces, have kept CatalogId internally as it's technically correct
* Removed RetainerOwnerId from the public interface
* Removed NextCatalogId from the public interface
* Updated test text
* Null events in scoped service disposal
This commit is contained in:
Blair 2024-06-17 03:40:48 +10:00 • committed by GitHub
parent a35ae5fdf3
commit e160746d42
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 1131 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Dalamud/Interface/Internal/Windows/Data/DataWindow.cs
View file

@ -43,6 +43,7 @@ internal class DataWindow : Window, IDisposable
new IconBrowserWidget(),
new ImGuiWidget(),
new KeyStateWidget(),
new MarketBoardWidget(),
new NetworkMonitorWidget(),
new ObjectTableWidget(),
new PartyListWidget(),

302
Dalamud/Interface/Internal/Windows/Data/Widgets/MarketBoardWidget.cs Normal file
View file

@ -0,0 +1,302 @@
using System.Collections.Concurrent;
using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii;
using ImGuiNET;
namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
using System.Globalization;
using Game.MarketBoard;
using Game.Network.Structures;
/// <summary>
/// Widget to display market board events.
/// </summary>
internal class MarketBoardWidget : IDataWindowWidget
{
private readonly ConcurrentQueue<(IMarketBoardHistory MarketBoardHistory, IMarketBoardHistoryListing Listing)> marketBoardHistoryQueue = new();
private readonly ConcurrentQueue<(IMarketBoardCurrentOfferings MarketBoardCurrentOfferings, IMarketBoardItemListing Listing)> marketBoardCurrentOfferingsQueue = new();
private readonly ConcurrentQueue<IMarketBoardPurchase> marketBoardPurchasesQueue = new();
private readonly ConcurrentQueue<IMarketBoardPurchaseHandler> marketBoardPurchaseRequestsQueue = new();
private readonly ConcurrentQueue<IMarketTaxRates> marketTaxRatesQueue = new();
private bool trackMarketBoard;
private int trackedEvents;
/// <summary> Finalizes an instance of the <see cref="MarketBoardWidget"/> class. </summary>
~MarketBoardWidget()
{
if (this.trackMarketBoard)
{
this.trackMarketBoard = false;
var marketBoard = Service<MarketBoard>.GetNullable();
if (marketBoard != null)
{
marketBoard.HistoryReceived -= this.MarketBoardHistoryReceived;
marketBoard.OfferingsReceived -= this.MarketBoardOfferingsReceived;
marketBoard.ItemPurchased -= this.MarketBoardItemPurchased;
marketBoard.PurchaseRequested -= this.MarketBoardPurchaseRequested;
marketBoard.TaxRatesReceived -= this.TaxRatesReceived;
}
}
}
/// <inheritdoc/>
public string[]? CommandShortcuts { get; init; } = { "marketboard" };
/// <inheritdoc/>
public string DisplayName { get; init; } = "Market Board";
/// <inheritdoc/>
public bool Ready { get; set; }
/// <inheritdoc/>
public void Load()
{
this.trackMarketBoard = false;
this.trackedEvents = 0;
this.marketBoardHistoryQueue.Clear();
this.marketBoardPurchaseRequestsQueue.Clear();
this.marketBoardPurchasesQueue.Clear();
this.marketTaxRatesQueue.Clear();
this.marketBoardCurrentOfferingsQueue.Clear();
this.Ready = true;
}
/// <inheritdoc/>
public void Draw()
{
var marketBoard = Service<MarketBoard>.Get();
if (ImGui.Checkbox("Track MarketBoard Events", ref this.trackMarketBoard))
{
if (this.trackMarketBoard)
{
marketBoard.HistoryReceived += this.MarketBoardHistoryReceived;
marketBoard.OfferingsReceived += this.MarketBoardOfferingsReceived;
marketBoard.ItemPurchased += this.MarketBoardItemPurchased;
marketBoard.PurchaseRequested += this.MarketBoardPurchaseRequested;
marketBoard.TaxRatesReceived += this.TaxRatesReceived;
}
else
{
marketBoard.HistoryReceived -= this.MarketBoardHistoryReceived;
marketBoard.OfferingsReceived -= this.MarketBoardOfferingsReceived;
marketBoard.ItemPurchased -= this.MarketBoardItemPurchased;
marketBoard.PurchaseRequested -= this.MarketBoardPurchaseRequested;
marketBoard.TaxRatesReceived -= this.TaxRatesReceived;
}
}
ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X / 2);
if (ImGui.DragInt("Stored Number of Events", ref this.trackedEvents, 0.1f, 1, 512))
{
this.trackedEvents = Math.Clamp(this.trackedEvents, 1, 512);
}
if (ImGui.Button("Clear Stored Events"))
{
this.marketBoardHistoryQueue.Clear();
}
using (var tabBar = ImRaii.TabBar("marketTabs"))
{
if (tabBar)
{
using (var tabItem = ImRaii.TabItem("History"))
{
if (tabItem)
{
ImGuiTable.DrawTable(string.Empty, this.marketBoardHistoryQueue, this.DrawMarketBoardHistory, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg, "Item ID", "Quantity", "Is HQ?", "Sale Price", "Buyer Name", "Purchase Time");
}
}
using (var tabItem = ImRaii.TabItem("Offerings"))
{
if (tabItem)
{
ImGuiTable.DrawTable(string.Empty, this.marketBoardCurrentOfferingsQueue, this.DrawMarketBoardCurrentOfferings, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg, "Item ID", "Quantity", "Is HQ?", "Price Per Unit", "Buyer Name", "Retainer Name", "Last Review Time");
}
}
using (var tabItem = ImRaii.TabItem("Purchases"))
{
if (tabItem)
{
ImGuiTable.DrawTable(string.Empty, this.marketBoardPurchasesQueue, this.DrawMarketBoardPurchases, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg, "Item ID", "Quantity");
}
}
using (var tabItem = ImRaii.TabItem("Purchase Requests"))
{
if (tabItem)
{
ImGuiTable.DrawTable(string.Empty, this.marketBoardPurchaseRequestsQueue, this.DrawMarketBoardPurchaseRequests, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg, "Item ID", "Quantity", "Price Per Unit", "Listing ID", "Retainer ID");
}
}
using (var tabItem = ImRaii.TabItem("Taxes"))
{
if (tabItem)
{
ImGuiTable.DrawTable(string.Empty, this.marketTaxRatesQueue, this.DrawMarketTaxRates, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg, "Uldah", "Limsa Lominsa", "Gridania", "Ishgard", "Kugane", "Crystarium", "Sharlayan");
}
}
}
}
}
private void TaxRatesReceived(IMarketTaxRates marketTaxRates)
{
this.marketTaxRatesQueue.Enqueue(marketTaxRates);
while (this.marketTaxRatesQueue.Count > this.trackedEvents)
{
this.marketTaxRatesQueue.TryDequeue(out _);
}
}
private void MarketBoardPurchaseRequested(IMarketBoardPurchaseHandler marketBoardPurchaseHandler)
{
this.marketBoardPurchaseRequestsQueue.Enqueue(marketBoardPurchaseHandler);
while (this.marketBoardPurchaseRequestsQueue.Count > this.trackedEvents)
{
this.marketBoardPurchaseRequestsQueue.TryDequeue(out _);
}
}
private void MarketBoardItemPurchased(IMarketBoardPurchase marketBoardPurchase)
{
this.marketBoardPurchasesQueue.Enqueue(marketBoardPurchase);
while (this.marketBoardPurchasesQueue.Count > this.trackedEvents)
{
this.marketBoardPurchasesQueue.TryDequeue(out _);
}
}
private void MarketBoardOfferingsReceived(IMarketBoardCurrentOfferings marketBoardCurrentOfferings)
{
foreach (var listing in marketBoardCurrentOfferings.ItemListings)
{
this.marketBoardCurrentOfferingsQueue.Enqueue((marketBoardCurrentOfferings, listing));
}
while (this.marketBoardCurrentOfferingsQueue.Count > this.trackedEvents)
{
this.marketBoardCurrentOfferingsQueue.TryDequeue(out _);
}
}
private void MarketBoardHistoryReceived(IMarketBoardHistory marketBoardHistory)
{
foreach (var listing in marketBoardHistory.HistoryListings)
{
this.marketBoardHistoryQueue.Enqueue((marketBoardHistory, listing));
}
while (this.marketBoardHistoryQueue.Count > this.trackedEvents)
{
this.marketBoardHistoryQueue.TryDequeue(out _);
}
}
private void DrawMarketBoardHistory((IMarketBoardHistory History, IMarketBoardHistoryListing Listing) data)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.History.ItemId.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.Quantity.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.IsHq.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.SalePrice.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.BuyerName);
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.PurchaseTime.ToString(CultureInfo.InvariantCulture));
}
private void DrawMarketBoardCurrentOfferings((IMarketBoardCurrentOfferings MarketBoardCurrentOfferings, IMarketBoardItemListing Listing) data)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.ItemId.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.ItemQuantity.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.IsHq.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.PricePerUnit.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.PlayerName);
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.RetainerName);
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.LastReviewTime.ToString(CultureInfo.InvariantCulture));
}
private void DrawMarketBoardPurchases(IMarketBoardPurchase data)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.CatalogId.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.ItemQuantity.ToString());
}
private void DrawMarketBoardPurchaseRequests(IMarketBoardPurchaseHandler data)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.CatalogId.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.ItemQuantity.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.PricePerUnit.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.ListingId.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.RetainerId.ToString());
}
private void DrawMarketTaxRates(IMarketTaxRates data)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.UldahTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.LimsaLominsaTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.GridaniaTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.IshgardTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.KuganeTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.CrystariumTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.SharlayanTax.ToString());
}
}