Skip to content

perf(#29): 3 output-neutral cleanups (held — do not merge during gate) #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsboige merged 1 commit into from
Jun 18, 2026
Merged

perf(#29): 3 output-neutral cleanups (held — do not merge during gate) #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Generation/Converters/Argumentum.AssetConverter/UtilityExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ namespace Argumentum.AssetConverter
public static class UtilityExtensions
{

// Shared HttpClient (was `new HttpClient()` per call — #29 H6). Thread-safe for concurrent calls;
// avoids socket exhaustion / GC pressure on long runs with repeated downloads. Output-neutral.
private static readonly HttpClient _sharedHttpClient = new HttpClient();


public static void ExportDataTable(this CsvWriter writer, DataTable dt)
Expand Down Expand Up @@ -214,7 +217,7 @@ public static async Task<DocumentPayload> GetDocumentPayload(this string docPath
try
{
// Download the file from the specified URL
using var client = new HttpClient();
var client = _sharedHttpClient;

var response = await client.GetAsync(urlFile);
if (response.IsSuccessStatusCode)
Expand Down
7 changes: 3 additions & 4 deletions Generation/Converters/Argumentum.AssetConverter/WebBasedGenerator/Cardpen/HarvestManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,6 @@ public async Task<CardSetHarvest> GenerateHarvestImages(Func<Task<IBrowser>> bro
Log("Entering GenerateHarvestImages.");
var currentHarvest = new CardSetHarvest();
var page = await GetFreePage(browser);
var consoleMessages = new List<string>();

void Page_Console(object sender, IConsoleMessage msg)
{
Expand Down Expand Up @@ -408,7 +407,7 @@ void Page_Console(object sender, IConsoleMessage msg)

Log("Diagnostic check passed: #cpOutput iframe is ready.");

var faces = await GenerateImages(page, cardSetDocuments.front, configCardSet.Config.FaceCardSetInfo, consoleMessages);
var faces = await GenerateImages(page, cardSetDocuments.front, configCardSet.Config.FaceCardSetInfo);
currentHarvest.Faces = faces;

// Issue #190 phase 1: opportunistic overflow detection on Virtues face cards.
Expand All @@ -434,7 +433,7 @@ void Page_Console(object sender, IConsoleMessage msg)

if (cardSetDocuments.back != null)
{
var backs = await GenerateImages(page, cardSetDocuments.back, configCardSet.Config.BackCardSetInfo, consoleMessages);
var backs = await GenerateImages(page, cardSetDocuments.back, configCardSet.Config.BackCardSetInfo);
currentHarvest.Backs = backs;
}
}
Expand All @@ -448,7 +447,7 @@ void Page_Console(object sender, IConsoleMessage msg)
}


public async Task<CardPenHarvest> GenerateImages(IPage page, CardSetPayload cardSetDocument, CardSetInfo cardSetInfo, List<string> consoleMessages)
public async Task<CardPenHarvest> GenerateImages(IPage page, CardSetPayload cardSetDocument, CardSetInfo cardSetInfo)
{
var toReturn = new CardPenHarvest();
if (cardSetDocument?.CardSetDocument == null)
Expand Down
22 changes: 15 additions & 7 deletions Generation/Converters/Argumentum.AssetConverter/WebBasedGenerator/PrintAndPlayDocument.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ public class PrintAndPlayDocument : IDocument
private readonly List<byte[]> _frontImagesData;
private readonly List<byte[]> _backImagesData;

// Header bytes read once and cached (was File.ReadAllBytes per page in ComposePage — #29 H5).
// Identical bytes, just no re-read; output-neutral.
private readonly Lazy<byte[]> _headerImageData;

private const float InchToCentimetre = 2.54f;
private const float InchToPoints = 72;
private float MmToPointsFactor = 0.1f / InchToCentimetre * InchToPoints;
Expand All @@ -25,6 +29,15 @@ public PrintAndPlayDocument(CardSetDocumentConfig docConfig, List<byte[]> frontI
_docConfig = docConfig;
_frontImagesData = frontImagesData;
_backImagesData = backImagesData;
_headerImageData = new Lazy<byte[]>(LoadHeaderImageData);
}

private byte[] LoadHeaderImageData()
{
if (string.IsNullOrEmpty(_docConfig.Header))
return null;
var imagePath = Path.Combine(Environment.CurrentDirectory, _docConfig.Header);
return File.Exists(imagePath) ? File.ReadAllBytes(imagePath) : null;
}

public DocumentMetadata GetMetadata() => new DocumentMetadata()
Expand Down Expand Up @@ -93,14 +106,9 @@ private void ComposePage(PageDescriptor page, PageSize pageSize, float pageMargi
page.PageColor(Colors.White);
page.DefaultTextStyle(x => x.FontSize(20));

if (!string.IsNullOrEmpty(_docConfig.Header))
if (_headerImageData.Value != null)
{
var imagePath = Path.Combine(Environment.CurrentDirectory, _docConfig.Header);
if(File.Exists(imagePath))
{
var imageData = File.ReadAllBytes(imagePath);
page.Header().AlignCenter().Height(pageSize.Height / 10).Padding(pageSize.Width / 150).Image(imageData, ImageScaling.FitHeight);
}
page.Header().AlignCenter().Height(pageSize.Height / 10).Padding(pageSize.Width / 150).Image(_headerImageData.Value, ImageScaling.FitHeight);
}

page.Content()
Expand Down
Loading