Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.
C# audio-converteravaloniabatch-conversionconvertercsharpdocument-converterdocx-to-pdfdotnetdrag-and-dropfile-conversionfile-converterheic-converterhwphwpximage-converterlinuxmacospdf-convertervideo-converterwindows
fix(spreadsheet): preserve workbooks and scale previews
Perricheno6df82df89311
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.mdindex afbf19bd..37b41e96 100644--- a/docs/ARCHITECTURE.md+++ b/docs/ARCHITECTURE.md@@ -146,6 +146,25 @@ multi-frame pictures refused, the EXIF thumbnail dropped), one history entry for- `Controls/CropMath` holds the arithmetic (ratios and their portrait forms, nudging by whole pixels, the frame inpixels, where the size chip goes, where the dial opens) and is unit tested.+## Spreadsheet print studio++The `tool-sheet-studio` tool opens `Views/SpreadsheetPrintStudioWindow` for one XLSX workbook instead of starting a+normal conversion job. `SpreadsheetPrintStudioViewModel` owns an ordered, non-destructive print plan: each visible+sheet starts as one region and the user can add more regions, change paper, orientation, scale, margins, page order,+hidden rows and manual breaks, then see the PDF that those settings will produce.++- `SpreadsheetPrintInspector` reads workbook metadata and streams the large worksheet data with `XmlReader`; opening+ a large workbook neither builds nor retains an `XDocument` for every sheet.+- `SpreadsheetPrintPackage` makes a disposable XLSX under `JobQueue.DefaultWorkRoot`. It keeps every worksheet and+ named range so cross-sheet formulas remain valid, hides the sheets not being rendered, and changes only the chosen+ sheet's print settings. A new print area is written only after the user explicitly changes or accepts the range.+- `SpreadsheetPrintService` runs LibreOffice once for each region. Preview and export use the same disposable-workbook+ path; export then joins the region PDFs in the chosen order with PDFsharp. The ordinary XLSX → PDF donut conversion+ can still differ because route planning may select Filee's built-in spreadsheet reader instead of LibreOffice.+- `PdfPreviewDocument` caches a PDF's bytes and page geometry. The studio asks PDFium/PDFtoImage for small thumbnails+ and only one large selected page, all decoded away from the UI thread; exporting never performs preview rendering.+ Cancellation closes LibreOffice and the temporary job folder is removed on success, error or window close.+## Settings and data`UserDataStore` owns `settings.json`, `presets.json`, `profiles.json` and `history.json`diff --git a/docs/ENGINES.md b/docs/ENGINES.mdindex 3ba038b0..b1acf881 100644--- a/docs/ENGINES.md+++ b/docs/ENGINES.md@@ -9,7 +9,7 @@ Filee chooses engines automatically. Settings → *Engines* shows their status,| Windows Imaging Component | part of Windows (Windows only) | **JPEG XR** (JXR, WDP, HDP; HDR screenshots of Windows) → the images ImageMagick writes, and PDF, ICNS, HEIC and SVG through PNG; HDR tone-mapped to SDR || Vector graphics | built in (Svg.Skia, SkiaSharp, ACadSharp) | **SVG/SVGZ → PDF (vector) and images**, SVG ↔ SVGZ, **SVG → DXF** (→ DWG with the CAD engine), **raster images → SVG (tracing)**, PDF-compatible AI → PDF || ICNS | built in | images → ICNS (16–1024 px), ICNS → images |-| PDFsharp | built in (library) | images → PDF, merge, split, page ranges, **compression** (smaller PDFs, see below) |+| PDFsharp | built in (library) | images → PDF, merge, split, page ranges, spreadsheet print-studio assembly, **compression** (smaller PDFs, see below) || PDFium | built in (library) | PDF → images (multi-page TIFF/GIF supported) || Unhwp | built in (library) | HWP/HWPX → TXT, Markdown, HTML (pictures in a `<name>_files` folder next to the Markdown, embedded in the HTML) || Text & Markdown (Markdig) | built in (library) | **Markdown → HTML, TXT**; **TXT, LOG, PY, PAC, BAT, COMMAND → UTF-8 TXT**, preserving source text without running scripts (and → PDF / DOCX through the HWPX writer, rhwp or LibreOffice) |@@ -400,6 +400,13 @@ the text the spreadsheet shows, the value behind it and its Excel number format.- Not converted: formulas (their cached results are kept), charts, pictures, comments, conditional formatting,data validation, print areas and page breaks.+The XLSX donut also offers **PDF + Edit** (`tool-sheet-studio`). Unlike an ordinary routed XLSX → PDF conversion,+this interactive tool always requires LibreOffice regardless of engine priority: it preserves the original workbook,+makes one disposable copy per selected sheet region, applies that region's print settings, and asks LibreOffice to+render it. PDFsharp combines the resulting PDFs. The live preview follows this exact studio export path and uses+PDFium/PDFtoImage for lazy thumbnails and the selected large page; the ordinary donut's PDF can differ because its+built-in XLSX route reads the workbook into Filee's document model.+## FontsFonts are converted in-process (`Filee.Engines/Fonts`); zlib and Brotli come with .NET. The input format isdiff --git a/docs/media/spreadsheet-print-studio-mixed-layout.png b/docs/media/spreadsheet-print-studio-mixed-layout.pngdeleted file mode 100644index 20583184..00000000Binary files a/docs/media/spreadsheet-print-studio-mixed-layout.png and /dev/null differdiff --git a/docs/media/spreadsheet-print-studio-overview.png b/docs/media/spreadsheet-print-studio-overview.pngdeleted file mode 100644index 07384ecb..00000000Binary files a/docs/media/spreadsheet-print-studio-overview.png and /dev/null differdiff --git a/src/Filee.App/Services/PresetAvailability.cs b/src/Filee.App/Services/PresetAvailability.csindex 6bb239d8..61bab762 100644--- a/src/Filee.App/Services/PresetAvailability.cs+++ b/src/Filee.App/Services/PresetAvailability.cs@@ -92,7 +92,7 @@ public sealed class PresetAvailability{if (preset.Id == "tool-sheet-studio"){- if (formats.Count > 0 && formats.All(format => format.Id == "xlsx"))+ if (formats.Count == 1 && formats[0].Id == "xlsx"){var libreOffice = _catalog.All.FirstOrDefault(converter => converter.Id == "libreoffice");if (libreOffice?.GetStatus().IsAvailable == true)diff --git a/src/Filee.App/Services/RadialController.cs b/src/Filee.App/Services/RadialController.csindex a19620dc..572c93c7 100644--- a/src/Filee.App/Services/RadialController.cs+++ b/src/Filee.App/Services/RadialController.cs@@ -380,9 +380,8 @@ public sealed class RadialController({if (preset.Id == "tool-sheet-studio"){- var workbook = files.FirstOrDefault(file => Path.GetExtension(file).Equals(".xlsx", StringComparison.OrdinalIgnoreCase));- if (workbook is not null)- windows.ShowSpreadsheetPrintStudio(workbook);+ if (files.Count == 1 && Path.GetExtension(files[0]).Equals(".xlsx", StringComparison.OrdinalIgnoreCase))+ windows.ShowSpreadsheetPrintStudio(files[0]);}elsewindows.ShowCropOverlay(files, preset, near);diff --git a/src/Filee.App/Services/SpreadsheetPrintService.cs b/src/Filee.App/Services/SpreadsheetPrintService.csindex f7bedc60..36427346 100644--- a/src/Filee.App/Services/SpreadsheetPrintService.cs+++ b/src/Filee.App/Services/SpreadsheetPrintService.cs@@ -9,7 +9,7 @@ using Filee.Engines.Pdf;namespace Filee.App.Services;-public sealed record SpreadsheetRenderedRegion(string PdfPath, IReadOnlyList<RenderedPdfPage> Pages, string TemporaryDirectory);+public sealed record SpreadsheetRenderedRegion(string PdfPath, PdfPreviewDocument Preview, string TemporaryDirectory);public sealed class SpreadsheetPrintService(IReadOnlyList<IConverter> converters){@@ -24,22 +24,11 @@ public sealed class SpreadsheetPrintService(IReadOnlyList<IConverter> converterspublic async Task<SpreadsheetRenderedRegion> RenderAsync(SpreadsheetWorkbookInfo workbook,SpreadsheetPrintRegion region, CancellationToken cancellationToken = default){- if (_libreOffice is null)- throw new InvalidOperationException("LibreOffice is not available.");- var folder = Path.Combine(Path.GetTempPath(), "filee-sheet-" + Guid.NewGuid().ToString("N"));- Directory.CreateDirectory(folder);+ var (output, folder) = await MakePdfAsync(workbook, region, cancellationToken);try{- var input = Path.Combine(folder, "preview.xlsx");- var output = Path.Combine(folder, "preview.pdf");- SpreadsheetPrintPackage.Create(workbook.Path, input, workbook, region);- var results = await _libreOffice.ConvertAsync(new ConversionStep(- input, "xlsx", "pdf", new Preset { TargetFormat = "pdf" },- new ExactOutput(output), folder), null, cancellationToken);- if (results.Count != 1 || !File.Exists(output))- throw new InvalidOperationException("LibreOffice did not create a PDF preview.");- var pages = await Task.Run(() => PdfPagePreviewRenderer.Render(output, cancellationToken: cancellationToken), cancellationToken);- return new SpreadsheetRenderedRegion(output, pages, folder);+ var preview = await Task.Run(() => PdfPreviewDocument.Open(output), cancellationToken);+ return new SpreadsheetRenderedRegion(output, preview, folder);}catch{@@ -55,13 +44,13 @@ public sealed class SpreadsheetPrintService(IReadOnlyList<IConverter> convertersthrow new ArgumentException("At least one region must be exported.", nameof(regions));if (_pdfMerger is null)throw new InvalidOperationException("The PDF merger is not available.");- var rendered = new List<SpreadsheetRenderedRegion>();+ var rendered = new List<(string PdfPath, string TemporaryDirectory)>();var temporaryOutput = outputPath + ".filee-tmp";try{for (var index = 0; index < regions.Count; index++){- rendered.Add(await RenderAsync(workbook, regions[index], cancellationToken));+ rendered.Add(await MakePdfAsync(workbook, regions[index], cancellationToken));progress?.Report(0.85 * (index + 1) / regions.Count);}TryDelete(temporaryOutput);@@ -77,12 +66,47 @@ public sealed class SpreadsheetPrintService(IReadOnlyList<IConverter> converters}}+ private async Task<(string PdfPath, string TemporaryDirectory)> MakePdfAsync(SpreadsheetWorkbookInfo workbook,+ SpreadsheetPrintRegion region, CancellationToken cancellationToken)+ {+ if (_libreOffice is null)+ throw new InvalidOperationException("LibreOffice is not available.");+ var folder = CreateWorkFolder();+ try+ {+ var input = Path.Combine(folder, "sheet.xlsx");+ var output = Path.Combine(folder, "sheet.pdf");+ await Task.Run(() => SpreadsheetPrintPackage.Create(workbook.Path, input, workbook, region), cancellationToken);+ var results = await _libreOffice.ConvertAsync(new ConversionStep(+ input, "xlsx", "pdf", new Preset { TargetFormat = "pdf" },+ new ExactOutput(output), folder), null, cancellationToken);+ if (results.Count != 1 || !File.Exists(output))+ throw new InvalidOperationException("LibreOffice did not create the requested PDF.");+ return (output, folder);+ }+ catch+ {+ TryDelete(folder);+ throw;+ }+ }+public static void Release(SpreadsheetRenderedRegion? rendered){if (rendered is not null)TryDelete(rendered.TemporaryDirectory);}+ private static string CreateWorkFolder()+ {+ Directory.CreateDirectory(JobQueue.DefaultWorkRoot);+ string folder;+ do folder = Path.Combine(JobQueue.DefaultWorkRoot, Guid.NewGuid().ToString("N")[..10]);+ while (Directory.Exists(folder));+ Directory.CreateDirectory(folder);+ return folder;+ }+private static void TryDelete(string path){trydiff --git a/src/Filee.App/ViewModels/SpreadsheetPrintStudioViewModel.cs b/src/Filee.App/ViewModels/SpreadsheetPrintStudioViewModel.csindex 9b623423..4da94f98 100644--- a/src/Filee.App/ViewModels/SpreadsheetPrintStudioViewModel.cs+++ b/src/Filee.App/ViewModels/SpreadsheetPrintStudioViewModel.cs@@ -17,19 +17,21 @@ namespace Filee.App.ViewModels;public sealed record SpreadsheetChoice<T>(T Value, string Label);-public sealed class SpreadsheetPreviewPage(int number, Bitmap image) : IDisposable+public sealed partial class SpreadsheetPreviewPage(int number) : ObservableObject, IDisposable{public int Number { get; } = number;- public Bitmap Image { get; } = image;- public void Dispose() => Image.Dispose();+ [ObservableProperty] private Bitmap? _thumbnail;+ public void Dispose() => Thumbnail?.Dispose();}public sealed partial class SpreadsheetSheetPlan : ObservableObject{private readonly Action _changed;private readonly ILocalizer _loc;+ private bool _suppressChanges;+ private bool _writePrintArea;public SpreadsheetSheetPlan(SpreadsheetSheetInfo sheet, ILocalizer loc, Action changed,- SpreadsheetPrintRegion? initial = null, string? name = null)+ SpreadsheetPrintRegion? initial = null, string? name = null, bool forcePrintArea = false){Sheet = sheet;_loc = loc;@@ -49,6 +51,7 @@ public sealed partial class SpreadsheetSheetPlan : ObservableObject_marginTopMm = source.MarginTopMm;_marginBottomMm = source.MarginBottomMm;_keepManualBreaks = source.KeepManualBreaks;+ _writePrintArea = forcePrintArea || source.WritePrintArea;}public SpreadsheetSheetInfo Sheet { get; }@@ -79,7 +82,12 @@ public sealed partial class SpreadsheetSheetPlan : ObservableObject[ObservableProperty] private bool _keepManualBreaks;partial void OnIncludedChanged(bool value) => _changed();- partial void OnRangeChanged(string value) => _changed();+ partial void OnRangeChanged(string value)+ {+ if (!_suppressChanges)+ _writePrintArea = true;+ _changed();+ }partial void OnPaperChanged(SpreadsheetPaper value) => _changed();partial void OnOrientationChanged(SpreadsheetPageOrientation value) => _changed();partial void OnScaleModeChanged(SpreadsheetScaleMode value) => _changed();@@ -96,7 +104,42 @@ public sealed partial class SpreadsheetSheetPlan : ObservableObjectpublic SpreadsheetPrintRegion ToRegion() => new(Sheet, Range.Trim(), Paper, Orientation, ScaleMode,ScalePercent, FitWidth, FitHeight, Order, MarginLeftMm, MarginRightMm, MarginTopMm, MarginBottomMm,- IncludeHidden, KeepManualBreaks);+ IncludeHidden, KeepManualBreaks, _writePrintArea);++ public void SetRangeExplicitly(string range)+ {+ _writePrintArea = true;+ if (Range == range)+ _changed();+ else+ Range = range;+ }++ public void Reset()+ {+ var source = SpreadsheetPrintRegion.FromSource(Sheet);+ _suppressChanges = true;+ try+ {+ Range = source.Range;+ Paper = source.Paper;+ Orientation = source.Orientation;+ ScaleMode = source.ScaleMode;+ ScalePercent = source.ScalePercent;+ FitWidth = source.FitWidth;+ FitHeight = source.FitHeight;+ Order = source.Order;+ MarginLeftMm = source.MarginLeftMm;+ MarginRightMm = source.MarginRightMm;+ MarginTopMm = source.MarginTopMm;+ MarginBottomMm = source.MarginBottomMm;+ IncludeHidden = source.IncludeHidden;+ KeepManualBreaks = source.KeepManualBreaks;+ _writePrintArea = source.WritePrintArea;+ }+ finally { _suppressChanges = false; }+ _changed();+ }}public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject, IDisposable@@ -105,8 +148,11 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,private readonly ILocalizer _loc;private readonly UserDataStore _store;private readonly ILogger? _log;- private readonly SpreadsheetWorkbookInfo _workbook;+ private readonly string _file;+ private SpreadsheetWorkbookInfo? _workbook;private CancellationTokenSource? _previewCancellation;+ private CancellationTokenSource? _pageCancellation;+ private CancellationTokenSource? _exportCancellation;private SpreadsheetRenderedRegion? _rendered;private bool _closed;@@ -117,7 +163,7 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,_loc = loc;_store = store;_log = log;- _workbook = service.Inspect(file);+ _file = file;Papers = SpreadsheetPaper.All.Select(paper => new SpreadsheetChoice<SpreadsheetPaper>(paper,paper == SpreadsheetPaper.Source ? loc["sheet_studio.from_workbook"] : paper.Name)).ToArray();Orientations =@@ -139,14 +185,13 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,new(SpreadsheetPageOrder.OverThenDown, loc["sheet_studio.over_down"]),];FileName = Path.GetFileName(file);- foreach (var sheet in _workbook.Sheets.Where(sheet => !sheet.IsHidden))- Sheets.Add(new SpreadsheetSheetPlan(sheet, loc, SchedulePreview));- SelectedSheet = Sheets.FirstOrDefault();- if (SelectedSheet is not null)- SchedulePreview();+ IsBusy = true;+ Status = loc["sheet_studio.rendering"];+ Initialization = InitializeAsync();}public string FileName { get; }+ internal Task Initialization { get; }public ObservableCollection<SpreadsheetSheetPlan> Sheets { get; } = [];public ObservableCollection<SpreadsheetPreviewPage> Pages { get; } = [];public IReadOnlyList<SpreadsheetChoice<SpreadsheetPaper>> Papers { get; private set; } = [];@@ -156,14 +201,22 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,[ObservableProperty] private SpreadsheetSheetPlan? _selectedSheet;[ObservableProperty] private SpreadsheetPreviewPage? _selectedPage;+ [ObservableProperty] private Bitmap? _previewImage;[ObservableProperty] private bool _isBusy;[ObservableProperty] private bool _isExporting;[ObservableProperty] private string _status = "";[ObservableProperty] private double _exportProgress;- public bool CanExport => !IsBusy && !IsExporting && Sheets.Any(sheet => sheet.Included);+ public bool CanExport => _workbook is not null && !IsBusy && !IsExporting && Sheets.Any(sheet => sheet.Included);+ public bool CanRemoveSelectedRegion => SelectedSheet is { } selected+ && Sheets.Count(item => item.Sheet.Index == selected.Sheet.Index) > 1;- partial void OnSelectedSheetChanged(SpreadsheetSheetPlan? value) => SchedulePreview();+ partial void OnSelectedSheetChanged(SpreadsheetSheetPlan? value)+ {+ OnPropertyChanged(nameof(CanRemoveSelectedRegion));+ SchedulePreview();+ }+ partial void OnSelectedPageChanged(SpreadsheetPreviewPage? value) => ScheduleLargePreview(value);partial void OnIsBusyChanged(bool value) => OnPropertyChanged(nameof(CanExport));partial void OnIsExportingChanged(bool value) => OnPropertyChanged(nameof(CanExport));@@ -171,7 +224,7 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,private void UseContentRange(){if (SelectedSheet is { } selected)- selected.Range = selected.Sheet.UsedRange;+ selected.SetRangeExplicitly(selected.Sheet.UsedRange);}[RelayCommand]@@ -179,21 +232,7 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,{if (SelectedSheet is not { } selected)return;- var source = SpreadsheetPrintRegion.FromSource(selected.Sheet);- selected.Range = source.Range;- selected.Paper = source.Paper;- selected.Orientation = source.Orientation;- selected.ScaleMode = source.ScaleMode;- selected.ScalePercent = source.ScalePercent;- selected.FitWidth = source.FitWidth;- selected.FitHeight = source.FitHeight;- selected.Order = source.Order;- selected.MarginLeftMm = source.MarginLeftMm;- selected.MarginRightMm = source.MarginRightMm;- selected.MarginTopMm = source.MarginTopMm;- selected.MarginBottomMm = source.MarginBottomMm;- selected.IncludeHidden = source.IncludeHidden;- selected.KeepManualBreaks = source.KeepManualBreaks;+ selected.Reset();}[RelayCommand]@@ -201,7 +240,7 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,{if (SelectedSheet is not { } selected)return;- selected.Range = selected.Sheet.UsedRange;+ selected.SetRangeExplicitly(selected.Sheet.UsedRange);selected.ScaleMode = SpreadsheetScaleMode.FitToPages;selected.FitWidth = selected.Sheet.UsedColumns > 60 ? 2 : 1;selected.FitHeight = 0;@@ -220,20 +259,22 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,return;var number = Sheets.Count(item => item.Sheet.Index == selected.Sheet.Index) + 1;var duplicate = new SpreadsheetSheetPlan(selected.Sheet, _loc, SchedulePreview, selected.ToRegion(),- _loc.Format("sheet_studio.region_name", selected.Sheet.Name, number));+ _loc.Format("sheet_studio.region_name", selected.Sheet.Name, number), forcePrintArea: true);var index = Sheets.IndexOf(selected) + 1;Sheets.Insert(index, duplicate);SelectedSheet = duplicate;+ OnPropertyChanged(nameof(CanRemoveSelectedRegion));}[RelayCommand]private void RemoveRegion(){- if (SelectedSheet is not { } selected || Sheets.Count == 1)+ if (SelectedSheet is not { } selected || Sheets.Count(item => item.Sheet.Index == selected.Sheet.Index) <= 1)return;var index = Sheets.IndexOf(selected);Sheets.Remove(selected);SelectedSheet = Sheets[Math.Min(index, Sheets.Count - 1)];+ OnPropertyChanged(nameof(CanRemoveSelectedRegion));}[RelayCommand]@@ -256,7 +297,7 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,public async Task ExportAsync(string outputPath){- if (IsExporting)+ if (IsExporting || _workbook is null)return;var regions = Sheets.Where(sheet => sheet.Included).Select(sheet => sheet.ToRegion()).ToArray();if (regions.Any(region => !SpreadsheetPrintInspector.IsValidRange(region.Range)))@@ -265,12 +306,15 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,return;}IsExporting = true;+ _previewCancellation?.Cancel();+ _pageCancellation?.Cancel();+ _exportCancellation = new CancellationTokenSource();ExportProgress = 0;Status = _loc["sheet_studio.exporting"];try{var progress = new Progress<double>(value => ExportProgress = value * 100);- await _service.ExportAsync(_workbook, regions, outputPath, progress);+ await _service.ExportAsync(_workbook, regions, outputPath, progress, _exportCancellation.Token);Status = _loc.Format("sheet_studio.exported", Path.GetFileName(outputPath));try{@@ -291,24 +335,37 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,_log?.LogWarning(ex, "Could not record spreadsheet studio export in history");}}+ catch (OperationCanceledException)+ {+ Status = _loc["common.cancel"];+ }catch (Exception ex) when (ex is not OutOfMemoryException){_log?.LogError(ex, "Could not export spreadsheet print plan for {File}", _workbook.Path);- Status = ex.Message;+ Status = _loc["error.conversion_failed"];}finally{IsExporting = false;+ _exportCancellation?.Dispose();+ _exportCancellation = null;+ if (!_closed)+ SchedulePreview();}}+ public void CancelExport() => _exportCancellation?.Cancel();+private void SchedulePreview(){OnPropertyChanged(nameof(CanExport));- if (_closed || SelectedSheet is null)+ if (_closed || IsExporting || _workbook is null || SelectedSheet is null)return;_previewCancellation?.Cancel();_previewCancellation?.Dispose();+ _pageCancellation?.Cancel();+ _pageCancellation?.Dispose();+ _pageCancellation = null;IsBusy = false;_previewCancellation = new CancellationTokenSource();_ = PreviewAfterDelayAsync(SelectedSheet, _previewCancellation.Token);@@ -326,7 +383,7 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,}IsBusy = true;Status = _loc["sheet_studio.rendering"];- var rendered = await _service.RenderAsync(_workbook, sheet.ToRegion(), cancellationToken);+ var rendered = await _service.RenderAsync(_workbook!, sheet.ToRegion(), cancellationToken);if (_closed || cancellationToken.IsCancellationRequested){SpreadsheetPrintService.Release(rendered);@@ -335,19 +392,17 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,ClearPages();SpreadsheetPrintService.Release(_rendered);_rendered = rendered;- foreach (var page in rendered.Pages)- {- using var stream = new MemoryStream(page.Png, writable: false);- Pages.Add(new SpreadsheetPreviewPage(page.PageNumber, new Bitmap(stream)));- }+ for (var pageNumber = 1; pageNumber <= rendered.Preview.PageCount; pageNumber++)+ Pages.Add(new SpreadsheetPreviewPage(pageNumber));SelectedPage = Pages.FirstOrDefault();Status = _loc.Format("sheet_studio.page_count", Pages.Count);+ await LoadThumbnailsAsync(rendered, cancellationToken);}catch (OperationCanceledException) { }catch (Exception ex) when (ex is not OutOfMemoryException){- _log?.LogWarning(ex, "Could not render spreadsheet preview for {File}", _workbook.Path);- Status = ex.Message;+ _log?.LogWarning(ex, "Could not render spreadsheet preview for {File}", _file);+ Status = _loc["error.conversion_failed"];}finally{@@ -356,10 +411,99 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,}}+ private async Task InitializeAsync()+ {+ try+ {+ var workbook = await Task.Run(() => _service.Inspect(_file));+ if (_closed)+ return;+ _workbook = workbook;+ foreach (var sheet in workbook.Sheets.Where(sheet => !sheet.IsHidden))+ Sheets.Add(new SpreadsheetSheetPlan(sheet, _loc, SchedulePreview));+ SelectedSheet = Sheets.FirstOrDefault();+ if (SelectedSheet is null)+ Status = _loc["error.unsupported_source"];+ }+ catch (Exception ex) when (ex is not OutOfMemoryException)+ {+ _log?.LogWarning(ex, "Could not inspect spreadsheet {File}", _file);+ Status = _loc["error.conversion_failed"];+ }+ finally+ {+ IsBusy = false;+ OnPropertyChanged(nameof(CanExport));+ }+ }++ private async Task LoadThumbnailsAsync(SpreadsheetRenderedRegion rendered, CancellationToken cancellationToken)+ {+ var bitmaps = await Task.Run(() => rendered.Preview.RenderThumbnails(220, cancellationToken).Select(page =>+ {+ using var stream = new MemoryStream(page.Png, writable: false);+ return (page.PageNumber, Image: new Bitmap(stream));+ }).ToArray(), cancellationToken);+ foreach (var (pageNumber, bitmap) in bitmaps)+ {+ if (_closed || cancellationToken.IsCancellationRequested || _rendered != rendered)+ {+ bitmap.Dispose();+ continue;+ }+ Pages.FirstOrDefault(page => page.Number == pageNumber)!.Thumbnail = bitmap;+ }+ }++ private void ScheduleLargePreview(SpreadsheetPreviewPage? page)+ {+ _pageCancellation?.Cancel();+ _pageCancellation?.Dispose();+ _pageCancellation = null;+ if (_closed || page is null || _rendered is not { } rendered)+ return;+ _pageCancellation = new CancellationTokenSource();+ _ = LoadLargePreviewAsync(rendered, page.Number, _pageCancellation.Token);+ }++ private async Task LoadLargePreviewAsync(SpreadsheetRenderedRegion rendered, int pageNumber,+ CancellationToken cancellationToken)+ {+ try+ {+ var bitmap = await RenderBitmapAsync(rendered.Preview, pageNumber, 1400, cancellationToken);+ if (_closed || cancellationToken.IsCancellationRequested || _rendered != rendered+ || SelectedPage?.Number != pageNumber)+ {+ bitmap.Dispose();+ return;+ }+ var old = PreviewImage;+ PreviewImage = bitmap;+ old?.Dispose();+ }+ catch (OperationCanceledException) { }+ catch (Exception ex) when (ex is not OutOfMemoryException)+ {+ _log?.LogWarning(ex, "Could not render spreadsheet preview page {Page}", pageNumber);+ }+ }++ private static Task<Bitmap> RenderBitmapAsync(Filee.Engines.Pdf.PdfPreviewDocument document, int pageNumber,+ int maxLongEdge, CancellationToken cancellationToken) => Task.Run(() =>+ {+ var rendered = document.RenderPage(pageNumber, maxLongEdge, cancellationToken);+ using var stream = new MemoryStream(rendered.Png, writable: false);+ return new Bitmap(stream);+ }, cancellationToken);+private void ClearPages(){foreach (var page in Pages) page.Dispose();Pages.Clear();+ var preview = PreviewImage;+ PreviewImage = null;+ preview?.Dispose();}public void Dispose()@@ -367,6 +511,9 @@ public sealed partial class SpreadsheetPrintStudioViewModel : ObservableObject,_closed = true;_previewCancellation?.Cancel();_previewCancellation?.Dispose();+ _pageCancellation?.Cancel();+ _pageCancellation?.Dispose();+ _exportCancellation?.Cancel();ClearPages();SpreadsheetPrintService.Release(_rendered);}diff --git a/src/Filee.App/Views/SpreadsheetPrintStudioWindow.axaml b/src/Filee.App/Views/SpreadsheetPrintStudioWindow.axamlindex 2cbd0e7a..bd7e8f5f 100644--- a/src/Filee.App/Views/SpreadsheetPrintStudioWindow.axaml+++ b/src/Filee.App/Views/SpreadsheetPrintStudioWindow.axaml@@ -6,7 +6,7 @@x:DataType="vm:SpreadsheetPrintStudioViewModel"Title="{DynamicResource sheet_studio.title}"Icon="avares://Filee/Assets/Icons/filee.ico"- Width="1320" Height="820" MinWidth="1000" MinHeight="640"+ Width="1380" Height="860" MinWidth="1040" MinHeight="680"WindowStartupLocation="CenterScreen"><Grid RowDefinitions="Auto,*,Auto"><Border Grid.Row="0" Padding="20,14" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource SubtleBorderBrush}"@@ -17,17 +17,20 @@</StackPanel></Border>- <Grid Grid.Row="1" ColumnDefinitions="258,*,372">+ <Grid Grid.Row="1" ColumnDefinitions="276,*,388" IsEnabled="{Binding !IsExporting}"><!-- Sheets / output order. --><Border Grid.Column="0" Padding="14" BorderThickness="0,0,1,0" BorderBrush="{DynamicResource SubtleBorderBrush}"><DockPanel>- <TextBlock DockPanel.Dock="Top" Margin="6,2,6,10" Classes="h3" Text="{DynamicResource sheet_studio.sheets}" />+ <TextBlock DockPanel.Dock="Top" Margin="6,2,6,10" Classes="h2" Text="{DynamicResource sheet_studio.sheets}" /><StackPanel DockPanel.Dock="Bottom" Margin="4,10,4,0" Spacing="6"><Button Content="{DynamicResource sheet_studio.add_region}" Command="{Binding AddRegionCommand}" /><Grid ColumnDefinitions="*,*,*" ColumnSpacing="5">- <Button Grid.Column="0" Content="↑" Command="{Binding MoveRegionUpCommand}" ToolTip.Tip="{DynamicResource group.move_up}" />- <Button Grid.Column="1" Content="↓" Command="{Binding MoveRegionDownCommand}" ToolTip.Tip="{DynamicResource group.move_down}" />- <Button Grid.Column="2" Content="×" Command="{Binding RemoveRegionCommand}" ToolTip.Tip="{DynamicResource common.delete}" />+ <Button Grid.Column="0" Content="↑" Command="{Binding MoveRegionUpCommand}" ToolTip.Tip="{DynamicResource group.move_up}"+ AutomationProperties.Name="{DynamicResource group.move_up}" />+ <Button Grid.Column="1" Content="↓" Command="{Binding MoveRegionDownCommand}" ToolTip.Tip="{DynamicResource group.move_down}"+ AutomationProperties.Name="{DynamicResource group.move_down}" />+ <Button Grid.Column="2" Content="×" Command="{Binding RemoveRegionCommand}" ToolTip.Tip="{DynamicResource common.delete}"+ AutomationProperties.Name="{DynamicResource common.delete}" IsEnabled="{Binding CanRemoveSelectedRegion}" /></Grid></StackPanel><ListBox ItemsSource="{Binding Sheets}" SelectedItem="{Binding SelectedSheet}"@@ -38,7 +41,8 @@<ListBox.ItemTemplate><DataTemplate x:DataType="vm:SpreadsheetSheetPlan"><Grid ColumnDefinitions="Auto,*" Margin="2,6">- <CheckBox Grid.Column="0" VerticalAlignment="Center" IsChecked="{Binding Included}" />+ <CheckBox Grid.Column="0" VerticalAlignment="Center" IsChecked="{Binding Included}"+ AutomationProperties.Name="{Binding Name}" /><StackPanel Grid.Column="1" Margin="8,0,0,0" Spacing="2"><Grid ColumnDefinitions="*,Auto" ColumnSpacing="6"><TextBlock Grid.Column="0" Text="{Binding Name}" FontWeight="SemiBold" TextTrimming="CharacterEllipsis" />@@ -55,11 +59,11 @@</Border><!-- Exact PDF preview. -->- <Grid Grid.Column="1" RowDefinitions="*,122" Background="{DynamicResource LayerBrush}">+ <Grid Grid.Column="1" RowDefinitions="*,132" Background="{DynamicResource PageBrush}"><Grid Grid.Row="0" Margin="22"><Border HorizontalAlignment="Center" VerticalAlignment="Center" Background="White"BoxShadow="0 8 28 0 #55000000" CornerRadius="2" MaxWidth="700" MaxHeight="540">- <Image Source="{Binding SelectedPage.Image}" Stretch="Uniform" />+ <Image Source="{Binding PreviewImage}" Stretch="Uniform" /></Border><StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="10"IsVisible="{Binding IsBusy}">@@ -75,7 +79,10 @@<ListBox.ItemTemplate><DataTemplate x:DataType="vm:SpreadsheetPreviewPage"><StackPanel Spacing="3">- <Border Width="62" Height="82" Background="White"><Image Source="{Binding Image}" Stretch="Uniform" /></Border>+ <Border Width="70" Height="92" Background="White" CornerRadius="2"+ BorderBrush="{DynamicResource SubtleBorderBrush}" BorderThickness="1">+ <Image Source="{Binding Thumbnail}" Stretch="Uniform" />+ </Border><TextBlock HorizontalAlignment="Center" Classes="caption" Text="{Binding Number}" /></StackPanel></DataTemplate>@@ -86,9 +93,9 @@<!-- Settings apply to the selected sheet. --><Border Grid.Column="2" BorderThickness="1,0,0,0" BorderBrush="{DynamicResource SubtleBorderBrush}">- <ScrollViewer Padding="18" IsVisible="{Binding SelectedSheet}">+ <ScrollViewer Padding="18" IsVisible="{Binding SelectedSheet, Converter={x:Static ObjectConverters.IsNotNull}}"><StackPanel Spacing="13">- <TextBlock Classes="h3" Text="{DynamicResource sheet_studio.page_setup}" />+ <TextBlock Classes="h2" Text="{DynamicResource sheet_studio.page_setup}" /><TextBlock Classes="caption" Text="{Binding SelectedSheet.Warning}" TextWrapping="Wrap"Foreground="{DynamicResource WarningBrush}" IsVisible="{Binding SelectedSheet.HasWarning}" /><Button HorizontalAlignment="Left" Classes="accent" Content="{DynamicResource sheet_studio.apply_fix}"@@ -122,15 +129,18 @@<Grid ColumnDefinitions="*,*" RowDefinitions="Auto,Auto" ColumnSpacing="8" RowSpacing="8"><StackPanel Grid.Row="0" Grid.ColumnSpan="2" Spacing="4"><TextBlock Classes="caption" Text="{DynamicResource sheet_studio.percent}" />- <NumericUpDown Minimum="10" Maximum="400" Increment="5" Value="{Binding SelectedSheet.ScalePercent}" />+ <NumericUpDown Minimum="10" Maximum="400" Increment="5" Value="{Binding SelectedSheet.ScalePercent}"+ AutomationProperties.Name="{DynamicResource sheet_studio.percent}" /></StackPanel><StackPanel Grid.Row="1" Grid.Column="0" Spacing="4"><TextBlock Classes="caption" Text="{DynamicResource sheet_studio.pages_wide}" />- <NumericUpDown Minimum="1" Maximum="100" Value="{Binding SelectedSheet.FitWidth}" />+ <NumericUpDown Minimum="1" Maximum="100" Value="{Binding SelectedSheet.FitWidth}"+ AutomationProperties.Name="{DynamicResource sheet_studio.pages_wide}" /></StackPanel><StackPanel Grid.Row="1" Grid.Column="1" Spacing="4"><TextBlock Classes="caption" Text="{DynamicResource sheet_studio.pages_tall}" />- <NumericUpDown Minimum="0" Maximum="100" Value="{Binding SelectedSheet.FitHeight}" />+ <NumericUpDown Minimum="0" Maximum="100" Value="{Binding SelectedSheet.FitHeight}"+ AutomationProperties.Name="{DynamicResource sheet_studio.pages_tall}" /></StackPanel></Grid>@@ -138,19 +148,23 @@<Grid ColumnDefinitions="*,*" RowDefinitions="Auto,Auto" ColumnSpacing="8" RowSpacing="8"><StackPanel Grid.Row="0" Grid.Column="0" Spacing="4"><TextBlock Classes="caption" Text="{DynamicResource sheet_studio.margin_top}" />- <NumericUpDown Minimum="0" Maximum="100" Increment="1" FormatString="0.# mm" Value="{Binding SelectedSheet.MarginTopMm}" />+ <NumericUpDown Minimum="0" Maximum="100" Increment="1" FormatString="0.# mm" Value="{Binding SelectedSheet.MarginTopMm}"+ AutomationProperties.Name="{DynamicResource sheet_studio.margin_top}" /></StackPanel><StackPanel Grid.Row="0" Grid.Column="1" Spacing="4"><TextBlock Classes="caption" Text="{DynamicResource sheet_studio.margin_bottom}" />- <NumericUpDown Minimum="0" Maximum="100" Increment="1" FormatString="0.# mm" Value="{Binding SelectedSheet.MarginBottomMm}" />+ <NumericUpDown Minimum="0" Maximum="100" Increment="1" FormatString="0.# mm" Value="{Binding SelectedSheet.MarginBottomMm}"+ AutomationProperties.Name="{DynamicResource sheet_studio.margin_bottom}" /></StackPanel><StackPanel Grid.Row="1" Grid.Column="0" Spacing="4"><TextBlock Classes="caption" Text="{DynamicResource sheet_studio.margin_left}" />- <NumericUpDown Minimum="0" Maximum="100" Increment="1" FormatString="0.# mm" Value="{Binding SelectedSheet.MarginLeftMm}" />+ <NumericUpDown Minimum="0" Maximum="100" Increment="1" FormatString="0.# mm" Value="{Binding SelectedSheet.MarginLeftMm}"+ AutomationProperties.Name="{DynamicResource sheet_studio.margin_left}" /></StackPanel><StackPanel Grid.Row="1" Grid.Column="1" Spacing="4"><TextBlock Classes="caption" Text="{DynamicResource sheet_studio.margin_right}" />- <NumericUpDown Minimum="0" Maximum="100" Increment="1" FormatString="0.# mm" Value="{Binding SelectedSheet.MarginRightMm}" />+ <NumericUpDown Minimum="0" Maximum="100" Increment="1" FormatString="0.# mm" Value="{Binding SelectedSheet.MarginRightMm}"+ AutomationProperties.Name="{DynamicResource sheet_studio.margin_right}" /></StackPanel></Grid>@@ -174,9 +188,9 @@<ProgressBar Height="3" Maximum="100" Value="{Binding ExportProgress}" IsVisible="{Binding IsExporting}" /></StackPanel><StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8">- <Button Content="{DynamicResource common.cancel}" Click="OnClose" />+ <Button Content="{DynamicResource common.cancel}" Click="OnClose" IsCancel="True" /><Button Classes="accent" Content="{DynamicResource sheet_studio.export_pdf}" Click="OnExport"- IsEnabled="{Binding CanExport}" />+ IsEnabled="{Binding CanExport}" IsDefault="True" /></StackPanel></Grid></Border>diff --git a/src/Filee.App/Views/SpreadsheetPrintStudioWindow.axaml.cs b/src/Filee.App/Views/SpreadsheetPrintStudioWindow.axaml.csindex 64457fef..bf69feca 100644--- a/src/Filee.App/Views/SpreadsheetPrintStudioWindow.axaml.cs+++ b/src/Filee.App/Views/SpreadsheetPrintStudioWindow.axaml.cs@@ -22,7 +22,8 @@ public partial class SpreadsheetPrintStudioWindow : Windowvar name = Path.GetFileNameWithoutExtension(vm.FileName) + "_prepared.pdf";var target = await StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions{- Title = "Export PDF",+ Title = this.TryFindResource("sheet_studio.export_pdf", out var title)+ ? title?.ToString() : "PDF",SuggestedFileName = name,DefaultExtension = "pdf",FileTypeChoices = [new FilePickerFileType("PDF") { Patterns = ["*.pdf"] }],@@ -31,5 +32,9 @@ public partial class SpreadsheetPrintStudioWindow : Windowawait vm.ExportAsync(path);}- private void OnClose(object? sender, RoutedEventArgs e) => Close();+ private void OnClose(object? sender, RoutedEventArgs e)+ {+ (DataContext as SpreadsheetPrintStudioViewModel)?.CancelExport();+ Close();+ }}diff --git a/src/Filee.Engines/Office/Sheets/SpreadsheetPrintPlan.cs b/src/Filee.Engines/Office/Sheets/SpreadsheetPrintPlan.csindex deb89821..beed4ebb 100644--- a/src/Filee.Engines/Office/Sheets/SpreadsheetPrintPlan.cs+++ b/src/Filee.Engines/Office/Sheets/SpreadsheetPrintPlan.cs@@ -4,6 +4,7 @@using System.Globalization;using System.IO.Compression;using System.Text.RegularExpressions;+using System.Xml;using System.Xml.Linq;using Filee.Engines.Office.Ooxml;@@ -100,7 +101,8 @@ public sealed record SpreadsheetPrintRegion(double MarginTopMm,double MarginBottomMm,bool IncludeHidden,- bool KeepManualBreaks)+ bool KeepManualBreaks,+ bool WritePrintArea){public static SpreadsheetPrintRegion FromSource(SpreadsheetSheetInfo sheet) => new(sheet,@@ -117,7 +119,8 @@ public sealed record SpreadsheetPrintRegion(sheet.PageSetup.MarginTopMm,sheet.PageSetup.MarginBottomMm,IncludeHidden: false,- KeepManualBreaks: true);+ KeepManualBreaks: true,+ WritePrintArea: sheet.PrintArea is not null);}/// <summary>Reads worksheet names, content bounds and print settings without opening Excel or LibreOffice.</summary>@@ -129,6 +132,7 @@ public static partial class SpreadsheetPrintInspectorpublic static SpreadsheetWorkbookInfo Read(string path){using var package = new OpcPackage(path);+ using var archive = ZipFile.OpenRead(path);var workbookPath = package.MainPartPath ?? "xl/workbook.xml";var workbook = package.Part(workbookPath)?.Root?? throw new InvalidDataException("The file is not an Excel workbook (no xl/workbook.xml).");@@ -139,64 +143,65 @@ public static partial class SpreadsheetPrintInspector{index++;var target = package.Target(workbookPath, (string?)sheet.Attribute(R + "id"));- if (target is null || package.Part(target)?.Root is not { } xml || xml.Name != S + "worksheet")+ if (target is null || archive.GetEntry(target) is not { } entry)continue;+ var xml = ReadWorksheet(entry);var name = (string?)sheet.Attribute("name") ?? $"Sheet {index + 1}";var printArea = DefinedRange(names, index, "_xlnm.Print_Area");var repeatRows = DefinedRange(names, index, "_xlnm.Print_Titles", rowsOnly: true);- var used = ContentRange(xml);- var pageSetup = xml.Element(S + "pageSetup");- var margins = xml.Element(S + "pageMargins");- var scale = Int(pageSetup, "scale");- var fitWidth = Int(pageSetup, "fitToWidth");- var fitHeight = Int(pageSetup, "fitToHeight");- var orientation = (string?)pageSetup?.Attribute("orientation") switch+ var scale = xml.Scale;+ var fitWidth = xml.FitWidth;+ var fitHeight = xml.FitHeight;+ var orientation = xml.Orientation switch{"portrait" => SpreadsheetPageOrientation.Portrait,"landscape" => SpreadsheetPageOrientation.Landscape,_ => SpreadsheetPageOrientation.Source,};- var order = (string?)pageSetup?.Attribute("pageOrder") switch+ var order = xml.PageOrder switch{"downThenOver" => SpreadsheetPageOrder.DownThenOver,"overThenDown" => SpreadsheetPageOrder.OverThenDown,_ => SpreadsheetPageOrder.Source,};- var hiddenRows = xml.Element(S + "sheetData")?.Elements(S + "row").Count(row => On(row.Attribute("hidden"))) ?? 0;- var hiddenColumns = HiddenColumnCount(xml);result.Add(new SpreadsheetSheetInfo(index,name,target,(string?)sheet.Attribute("state") is "hidden" or "veryHidden",- used.Reference,+ xml.Reference,printArea,repeatRows,- used.Rows,- used.Columns,- hiddenRows,- hiddenColumns,+ xml.Rows,+ xml.Columns,+ xml.HiddenRows,+ xml.HiddenColumns,new SpreadsheetSourcePageSetup(- SpreadsheetPaper.FromCode(Int(pageSetup, "paperSize")),+ SpreadsheetPaper.FromCode(xml.PaperSize),orientation,scale,fitWidth,fitHeight,order,- Inches(margins, "left", 0.7),- Inches(margins, "right", 0.7),- Inches(margins, "top", 0.75),- Inches(margins, "bottom", 0.75))));+ xml.MarginLeftInches * 25.4,+ xml.MarginRightInches * 25.4,+ xml.MarginTopInches * 25.4,+ xml.MarginBottomInches * 25.4)));}return new SpreadsheetWorkbookInfo(path, workbookPath, result);}/// <summary>Whether a comma-separated A1 range can safely become an Excel print area.</summary>public static bool IsValidRange(string? range) => !string.IsNullOrWhiteSpace(range)- && range.Split(',').All(part =>+ && SplitAreas(range).All(part =>{- var cells = part.Trim().Split(':');- return cells.Length is 1 or 2 && cells.All(cell => TryCell(cell, out _, out _));+ var value = part.Trim().Replace("$", "", StringComparison.Ordinal);+ var cells = value.Split(':');+ return cells.Length is 1 or 2 && cells.All(cell => TryCell(cell, out _, out _))+ || cells.Length == 2 && cells.All(TryColumn)+ || cells.Length == 2 && cells.All(cell => RowPattern().IsMatch(cell)+ && int.TryParse(cell, NumberStyles.None, CultureInfo.InvariantCulture, out var row)+ && row is >= 1 and <= 1_048_576);});private static string? DefinedRange(List<XElement> names, int sheetIndex, string kind, bool rowsOnly = false)@@ -205,34 +210,97 @@ public static partial class SpreadsheetPrintInspector&& (string?)n.Attribute("localSheetId") == sheetIndex.ToString(CultureInfo.InvariantCulture))?.Value;if (string.IsNullOrWhiteSpace(value))return null;- var ranges = value.Split(',').Select(part => part[(part.LastIndexOf('!') + 1)..].Replace("$", "", StringComparison.Ordinal).Trim());+ var ranges = SplitAreas(value).Select(part =>+ part[(part.LastIndexOf('!') + 1)..].Replace("$", "", StringComparison.Ordinal).Trim());if (rowsOnly)ranges = ranges.Where(part => RowRangePattern().IsMatch(part));var joined = string.Join(',', ranges);return joined.Length > 0 ? joined : null;}- private static (string Reference, int Rows, int Columns) ContentRange(XElement sheet)+ private static WorksheetSummary ReadWorksheet(ZipArchiveEntry entry){var top = int.MaxValue;var left = int.MaxValue;var bottom = -1;var right = -1;- foreach (var cell in sheet.Element(S + "sheetData")?.Descendants(S + "c") ?? [])+ var hiddenRows = 0;+ var hiddenColumns = 0;+ var merges = new List<string>();+ int? paperSize = null, scale = null, fitWidth = null, fitHeight = null;+ string? orientation = null, pageOrder = null;+ var marginLeft = 0.7;+ var marginRight = 0.7;+ var marginTop = 0.75;+ var marginBottom = 0.75;+ using var stream = entry.Open();+ using var reader = XmlReader.Create(stream, new XmlReaderSettings{- // A styled empty cell can push Excel's dimension to XFD1048576; it must not shrink the printed table.- if (cell.Element(S + "v") is null && cell.Element(S + "is") is null && cell.Element(S + "f") is null)- continue;- if (!TryCell((string?)cell.Attribute("r"), out var row, out var column))+ IgnoreComments = true,+ IgnoreWhitespace = true,+ DtdProcessing = DtdProcessing.Prohibit,+ });+ while (reader.Read())+ {+ if (reader.NodeType != XmlNodeType.Element || reader.NamespaceURI != S.NamespaceName)continue;- top = Math.Min(top, row);- left = Math.Min(left, column);- bottom = Math.Max(bottom, row);- right = Math.Max(right, column);+ switch (reader.LocalName)+ {+ case "row" when On(reader.GetAttribute("hidden")):+ hiddenRows++;+ break;+ case "col" when On(reader.GetAttribute("hidden")):+ var min = Math.Max(1, Int(reader.GetAttribute("min")) ?? 1);+ var max = Math.Min(16384, Int(reader.GetAttribute("max")) ?? min);+ hiddenColumns += Math.Max(0, max - min + 1);+ break;+ case "c":+ var reference = reader.GetAttribute("r");+ var hasContent = false;+ using (var cell = reader.ReadSubtree())+ {+ while (cell.Read())+ {+ if (cell.NodeType == XmlNodeType.Element && cell.NamespaceURI == S.NamespaceName+ && cell.LocalName is "v" or "is" or "f")+ {+ hasContent = true;+ break;+ }+ }+ }+ // A styled empty cell can push Excel's dimension to XFD1048576.+ if (hasContent && TryCell(reference, out var row, out var column))+ {+ top = Math.Min(top, row);+ left = Math.Min(left, column);+ bottom = Math.Max(bottom, row);+ right = Math.Max(right, column);+ }+ break;+ case "mergeCell":+ if (reader.GetAttribute("ref") is { } merge)+ merges.Add(merge);+ break;+ case "pageSetup":+ paperSize = Int(reader.GetAttribute("paperSize"));+ scale = Int(reader.GetAttribute("scale"));+ fitWidth = Int(reader.GetAttribute("fitToWidth"));+ fitHeight = Int(reader.GetAttribute("fitToHeight"));+ orientation = reader.GetAttribute("orientation");+ pageOrder = reader.GetAttribute("pageOrder");+ break;+ case "pageMargins":+ marginLeft = Double(reader.GetAttribute("left")) ?? marginLeft;+ marginRight = Double(reader.GetAttribute("right")) ?? marginRight;+ marginTop = Double(reader.GetAttribute("top")) ?? marginTop;+ marginBottom = Double(reader.GetAttribute("bottom")) ?? marginBottom;+ break;+ }}- foreach (var merge in sheet.Element(S + "mergeCells")?.Elements(S + "mergeCell") ?? [])+ foreach (var merge in merges){- var parts = ((string?)merge.Attribute("ref") ?? "").Split(':');+ var parts = merge.Split(':');if (parts.Length != 2 || !TryCell(parts[0], out var r1, out var c1) || !TryCell(parts[1], out var r2, out var c2))continue;if (bottom >= 0 && r1 >= top && c1 >= left && r1 <= bottom && c1 <= right)@@ -242,32 +310,42 @@ public static partial class SpreadsheetPrintInspector}}if (bottom < 0)- return ("A1", 0, 0);- return ($"{Cell(left, top)}:{Cell(right, bottom)}", bottom - top + 1, right - left + 1);+ return new("A1", 0, 0, hiddenRows, hiddenColumns, paperSize, scale, fitWidth, fitHeight,+ orientation, pageOrder, marginLeft, marginRight, marginTop, marginBottom);+ return new($"{Cell(left, top)}:{Cell(right, bottom)}", bottom - top + 1, right - left + 1,+ hiddenRows, hiddenColumns, paperSize, scale, fitWidth, fitHeight, orientation, pageOrder,+ marginLeft, marginRight, marginTop, marginBottom);}- private static int HiddenColumnCount(XElement sheet)+ internal static IEnumerable<string> SplitAreas(string value){- var count = 0;- foreach (var column in sheet.Element(S + "cols")?.Elements(S + "col") ?? [])+ var start = 0;+ var quoted = false;+ for (var index = 0; index < value.Length; index++){- if (!On(column.Attribute("hidden")))+ if (value[index] == '\'' && index + 1 < value.Length && value[index + 1] == '\'')+ {+ index++;continue;- var min = Math.Max(1, Int(column, "min") ?? 1);- var max = Math.Min(16384, Int(column, "max") ?? min);- count += Math.Max(0, max - min + 1);+ }+ if (value[index] == '\'')+ quoted = !quoted;+ else if (value[index] == ',' && !quoted)+ {+ yield return value[start..index];+ start = index + 1;+ }}- return count;+ yield return value[start..];}- private static int? Int(XElement? element, string name) =>- int.TryParse((string?)element?.Attribute(name), NumberStyles.Integer, CultureInfo.InvariantCulture, out var value) ? value : null;+ private static int? Int(string? value) =>+ int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var result) ? result : null;- private static double Inches(XElement? element, string name, double fallback) =>- double.TryParse((string?)element?.Attribute(name), NumberStyles.Float, CultureInfo.InvariantCulture, out var value)- ? value * 25.4 : fallback * 25.4;+ private static double? Double(string? value) =>+ double.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out var result) ? result : null;- private static bool On(XAttribute? value) => value?.Value is "1" or "true";+ private static bool On(string? value) => value is "1" or "true";private static bool TryCell(string? reference, out int row, out int column){@@ -289,6 +367,16 @@ public static partial class SpreadsheetPrintInspectorreturn true;}+ private static bool TryColumn(string value)+ {+ if (!ColumnPattern().IsMatch(value))+ return false;+ var column = 0;+ foreach (var ch in value)+ column = column * 26 + (char.ToUpperInvariant(ch) - 'A' + 1);+ return column <= 16_384;+ }+private static string Cell(int column, int row){var letters = "";@@ -302,15 +390,26 @@ public static partial class SpreadsheetPrintInspector[GeneratedRegex(@"^\d+:\d+$", RegexOptions.CultureInvariant)]private static partial Regex RowRangePattern();++ [GeneratedRegex(@"^[A-Za-z]{1,3}$", RegexOptions.CultureInvariant)]+ private static partial Regex ColumnPattern();++ [GeneratedRegex(@"^\d{1,7}$", RegexOptions.CultureInvariant)]+ private static partial Regex RowPattern();++ private sealed record WorksheetSummary(string Reference, int Rows, int Columns, int HiddenRows, int HiddenColumns,+ int? PaperSize, int? Scale, int? FitWidth, int? FitHeight, string? Orientation, string? PageOrder,+ double MarginLeftInches, double MarginRightInches, double MarginTopInches, double MarginBottomInches);}/// <summary>Writes a temporary XLSX with one printable sheet and one region, preserving every other package part.</summary>-public static class SpreadsheetPrintPackage+public static partial class SpreadsheetPrintPackage{private static readonly XNamespace S = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";private const double MillimetresPerInch = 25.4;- public static void Create(string source, string destination, SpreadsheetWorkbookInfo workbook, SpreadsheetPrintRegion region)+ public static void Create(string source, string destination, SpreadsheetWorkbookInfo workbook,+ SpreadsheetPrintRegion region, CompressionLevel compressionLevel = CompressionLevel.Fastest){if (!SpreadsheetPrintInspector.IsValidRange(region.Range))throw new ArgumentException("The print area is not a valid A1 cell range.", nameof(region));@@ -319,13 +418,15 @@ public static class SpreadsheetPrintPackageusing var output = ZipFile.Open(destination, ZipArchiveMode.Create);foreach (var entry in input.Entries){- var written = output.CreateEntry(entry.FullName, CompressionLevel.Optimal);+ var written = output.CreateEntry(entry.FullName, compressionLevel);written.LastWriteTime = entry.LastWriteTime;using var to = written.Open();if (entry.FullName.Equals(workbook.WorkbookPartPath, StringComparison.OrdinalIgnoreCase))RewriteWorkbook(entry, to, region);else if (entry.FullName.Equals(region.Sheet.PartPath, StringComparison.OrdinalIgnoreCase))RewriteSheet(entry, to, region);+ else if (workbook.Sheets.Any(sheet => entry.FullName.Equals(sheet.PartPath, StringComparison.OrdinalIgnoreCase)))+ RewriteSheetSelection(entry, to, selected: false);else{using var from = entry.Open();@@ -343,38 +444,49 @@ public static class SpreadsheetPrintPackagethrow new InvalidDataException("The selected worksheet is no longer in the workbook.");var selected = sheets[region.Sheet.Index];selected.Attribute("state")?.Remove();- sheets.Where(sheet => sheet != selected).Remove();- var view = root.Element(S + "bookViews")?.Elements(S + "workbookView").FirstOrDefault();- view?.SetAttributeValue("activeTab", 0);-- var defined = root.Element(S + "definedNames");- if (defined is null)+ foreach (var sheet in sheets.Where(sheet => sheet != selected))+ sheet.SetAttributeValue("state", "hidden");+ var bookViews = root.Element(S + "bookViews");+ if (bookViews is null){- defined = new XElement(S + "definedNames");- root.Element(S + "sheets")?.AddAfterSelf(defined);+ bookViews = new XElement(S + "bookViews");+ root.Element(S + "sheets")?.AddBeforeSelf(bookViews);}- // This disposable workbook lists one sheet only. Local names of removed sheets are invalid here; names of- // the selected sheet move to index 0. This also prevents LibreOffice exporting a stale selected tab first.- foreach (var name in defined.Elements(S + "definedName").ToList())+ var view = bookViews.Elements(S + "workbookView").FirstOrDefault();+ if (view is null){- if (!int.TryParse((string?)name.Attribute("localSheetId"), NumberStyles.Integer,- CultureInfo.InvariantCulture, out var local))- continue;- if (local == region.Sheet.Index)- name.SetAttributeValue("localSheetId", 0);- else- name.Remove();+ view = new XElement(S + "workbookView");+ bookViews.Add(view);}- defined.Elements(S + "definedName").Where(name =>+ view.SetAttributeValue("activeTab", region.Sheet.Index);+ view.SetAttributeValue("firstSheet", region.Sheet.Index);++ var defined = root.Element(S + "definedNames");+ defined?.Elements(S + "definedName").Where(name =>(string?)name.Attribute("name") == "_xlnm.Print_Area"- && (string?)name.Attribute("localSheetId") == "0").Remove();- var escaped = region.Sheet.Name.Replace("'", "''", StringComparison.Ordinal);- var qualified = string.Join(',', region.Range.Split(',').Select(part =>- $"'{escaped}'!{AbsoluteRange(part)}"));- defined.Add(new XElement(S + "definedName",- new XAttribute("name", "_xlnm.Print_Area"),- new XAttribute("localSheetId", 0),- qualified));+ && (string?)name.Attribute("localSheetId") == region.Sheet.Index.ToString(CultureInfo.InvariantCulture)).Remove();+ if (region.WritePrintArea)+ {+ if (defined is null)+ {+ defined = new XElement(S + "definedNames");+ root.Element(S + "sheets")?.AddAfterSelf(defined);+ }+ var escaped = region.Sheet.Name.Replace("'", "''", StringComparison.Ordinal);+ var qualified = string.Join(',', SpreadsheetPrintInspector.SplitAreas(region.Range).Select(part =>+ $"'{escaped}'!{AbsoluteRange(part)}"));+ defined.Add(new XElement(S + "definedName",+ new XAttribute("name", "_xlnm.Print_Area"),+ new XAttribute("localSheetId", region.Sheet.Index),+ qualified));+ }+ document.Save(output, SaveOptions.DisableFormatting);+ }++ private static void RewriteSheetSelection(ZipArchiveEntry entry, Stream output, bool selected)+ {+ var document = Load(entry);+ SetSheetSelected(document.Root!, selected);document.Save(output, SaveOptions.DisableFormatting);}@@ -480,12 +592,20 @@ public static class SpreadsheetPrintPackageelement.SetAttributeValue(name, value.ToString("0.####", CultureInfo.InvariantCulture));private static string AbsoluteRange(string range) => string.Join(':',- range.Replace("$", "", StringComparison.Ordinal).Trim().Split(':').Select(cell =>+ range.Replace("$", "", StringComparison.Ordinal).Trim().Split(':').Select(value =>{- var split = cell.IndexOfAny("0123456789".ToCharArray());- return split > 0 ? $"${cell[..split]}${cell[split..]}" : cell;+ if (ColumnPattern().IsMatch(value)) return $"${value.ToUpperInvariant()}";+ if (RowPattern().IsMatch(value)) return $"${value}";+ var split = value.IndexOfAny("0123456789".ToCharArray());+ return split > 0 ? $"${value[..split].ToUpperInvariant()}${value[split..]}" : value;}));+ [GeneratedRegex(@"^[A-Za-z]{1,3}$", RegexOptions.CultureInvariant)]+ private static partial Regex ColumnPattern();++ [GeneratedRegex(@"^\d{1,7}$", RegexOptions.CultureInvariant)]+ private static partial Regex RowPattern();+private static void SetEnum<T>(XElement element, string name, T value, T source, params (T Value, string Text)[] choices)where T : struct, Enum{diff --git a/src/Filee.Engines/Pdf/PdfPagePreview.cs b/src/Filee.Engines/Pdf/PdfPagePreview.csindex a314dd47..36f3a5b4 100644--- a/src/Filee.Engines/Pdf/PdfPagePreview.cs+++ b/src/Filee.Engines/Pdf/PdfPagePreview.cs@@ -11,22 +11,68 @@ namespace Filee.Engines.Pdf;public sealed record RenderedPdfPage(int PageNumber, int Width, int Height, byte[] Png);-public static class PdfPagePreviewRenderer+/// <summary>+/// A reusable PDF preview source. The file is read and its page geometry is discovered once; callers request only+/// the thumbnail or large page they currently need instead of eagerly rasterising an entire document.+/// </summary>+public sealed class PdfPreviewDocument{- public static IReadOnlyList<RenderedPdfPage> Render(string path, int maxLongEdge = 1400,- CancellationToken cancellationToken = default)+ private readonly byte[] _bytes;+ private readonly (double Width, double Height)[] _sizes;++ private PdfPreviewDocument(byte[] bytes, (double Width, double Height)[] sizes)+ {+ _bytes = bytes;+ _sizes = sizes;+ }++ public int PageCount => _sizes.Length;++ public static PdfPreviewDocument Open(string path){var bytes = File.ReadAllBytes(path);- var count = Conversion.GetPageCount(bytes);- var result = new List<RenderedPdfPage>(count);- for (var index = 0; index < count; index++)+ var sizes = Conversion.GetPageSizes(bytes)+ .Select(size => ((double)size.Width, (double)size.Height)).ToArray();+ return new PdfPreviewDocument(bytes, sizes);+ }++ public RenderedPdfPage RenderPage(int pageNumber, int maxLongEdge,+ CancellationToken cancellationToken = default)+ {+ if (pageNumber < 1 || pageNumber > PageCount)+ throw new ArgumentOutOfRangeException(nameof(pageNumber));+ cancellationToken.ThrowIfCancellationRequested();+ var size = _sizes[pageNumber - 1];+ var dpi = (int)Math.Ceiling(Math.Clamp(maxLongEdge * 72d / Math.Max(size.Width, size.Height), 24d, 180d));+ using var page = Conversion.ToImage(_bytes, pageNumber - 1, options: new RenderOptions(+ Dpi: dpi, WithAnnotations: true, WithFormFill: true, BackgroundColor: SKColors.White));+ cancellationToken.ThrowIfCancellationRequested();+ using var shown = Downscale(page, maxLongEdge);+ using var png = shown.Encode(SKEncodedImageFormat.Png, 88);+ return new RenderedPdfPage(pageNumber, shown.Width, shown.Height, png.ToArray());+ }++ /// <summary>Renders the thumbnail strip in one PDFium document load.</summary>+ public IReadOnlyList<RenderedPdfPage> RenderThumbnails(int maxLongEdge,+ CancellationToken cancellationToken = default)+ {+ if (PageCount == 0)+ return [];+ var largestPage = _sizes.Max(size => Math.Max(size.Width, size.Height));+ var dpi = (int)Math.Ceiling(Math.Clamp(maxLongEdge * 72d / largestPage, 24d, 180d));+ var result = new List<RenderedPdfPage>(PageCount);+ var number = 1;+ var options = new RenderOptions(Dpi: dpi, WithAnnotations: true, WithFormFill: true,+ BackgroundColor: SKColors.White);+ foreach (var page in Conversion.ToImages(_bytes, Enumerable.Range(0, PageCount), null, options)){- cancellationToken.ThrowIfCancellationRequested();- using var page = Conversion.ToImage(bytes, index, options: new RenderOptions(- Dpi: 112, WithAnnotations: true, WithFormFill: true, BackgroundColor: SKColors.White));- using var shown = Downscale(page, maxLongEdge);- using var png = shown.Encode(SKEncodedImageFormat.Png, 92);- result.Add(new RenderedPdfPage(index + 1, shown.Width, shown.Height, png.ToArray()));+ using (page)+ {+ cancellationToken.ThrowIfCancellationRequested();+ using var shown = Downscale(page, maxLongEdge);+ using var png = shown.Encode(SKEncodedImageFormat.Png, 82);+ result.Add(new RenderedPdfPage(number++, shown.Width, shown.Height, png.ToArray()));+ }}return result;}@@ -43,3 +89,13 @@ public static class PdfPagePreviewRenderer?? throw new InvalidOperationException("The PDF preview could not be resized.");}}++public static class PdfPagePreviewRenderer+{+ public static IReadOnlyList<RenderedPdfPage> Render(string path, int maxLongEdge = 1400,+ CancellationToken cancellationToken = default)+ {+ var document = PdfPreviewDocument.Open(path);+ return document.RenderThumbnails(maxLongEdge, cancellationToken);+ }+}diff --git a/tests/Filee.App.Tests/SpreadsheetPrintStudioTests.cs b/tests/Filee.App.Tests/SpreadsheetPrintStudioTests.csnew file mode 100644index 00000000..52babf38--- /dev/null+++ b/tests/Filee.App.Tests/SpreadsheetPrintStudioTests.cs@@ -0,0 +1,78 @@+using System.IO.Compression;+using System.Text;+using Avalonia.Headless.XUnit;+using Filee.App.Services;+using Filee.App.ViewModels;+using Filee.Core.Conversion;+using Filee.Core.Localization;+using Filee.Core.Settings;++namespace Filee.App.Tests;++public class SpreadsheetPrintStudioTests+{+ [AvaloniaFact]+ public async Task Closing_during_export_cancels_LibreOffice_and_removes_temporary_files()+ {+ TestServices.EnsureInitialized();+ var service = AppHost.Get<SpreadsheetPrintService>();+ Assert.SkipUnless(service.Status.IsAvailable, "LibreOffice not found");+ var folder = Directory.CreateTempSubdirectory("filee-sheet-studio-test-").FullName;+ try+ {+ var source = Path.Combine(folder, "large.xlsx");+ WriteWorkbook(source);+ var output = Path.Combine(folder, "cancelled.pdf");+ var before = WorkFolders();+ var vm = new SpreadsheetPrintStudioViewModel(source, service, AppHost.Get<ILocalizer>(),+ AppHost.Get<UserDataStore>());+ await vm.Initialization;++ var export = vm.ExportAsync(output);+ await WaitUntilAsync(() => WorkFolders().Except(before).Any(), TimeSpan.FromSeconds(10));+ vm.Dispose();+ await export;+ await WaitUntilAsync(() => !WorkFolders().Except(before).Any(), TimeSpan.FromSeconds(10));++ Assert.False(File.Exists(output + ".filee-tmp"));+ Assert.Empty(WorkFolders().Except(before));+ }+ finally+ {+ try { Directory.Delete(folder, recursive: true); } catch (IOException) { }+ }+ }++ private static HashSet<string> WorkFolders() => Directory.Exists(JobQueue.DefaultWorkRoot)+ ? Directory.GetDirectories(JobQueue.DefaultWorkRoot).ToHashSet(StringComparer.Ordinal)+ : [];++ private static async Task WaitUntilAsync(Func<bool> condition, TimeSpan timeout)+ {+ var deadline = DateTime.UtcNow + timeout;+ while (!condition() && DateTime.UtcNow < deadline)+ await Task.Delay(25);+ Assert.True(condition());+ }++ private static void WriteWorkbook(string path)+ {+ var rows = new StringBuilder();+ for (var row = 1; row <= 4000; row++)+ rows.Append($"<row r=\"{row}\"><c r=\"A{row}\"><v>{row}</v></c></row>");+ var parts = new Dictionary<string, string>+ {+ ["_rels/.rels"] = "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\"><Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument\" Target=\"xl/workbook.xml\"/></Relationships>",+ ["xl/workbook.xml"] = "<workbook xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\"><bookViews><workbookView activeTab=\"0\"/></bookViews><sheets><sheet name=\"Data\" sheetId=\"1\" r:id=\"rId1\"/></sheets></workbook>",+ ["xl/_rels/workbook.xml.rels"] = "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\"><Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet\" Target=\"worksheets/sheet1.xml\"/></Relationships>",+ ["xl/worksheets/sheet1.xml"] = $"<worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\"><sheetViews><sheetView workbookViewId=\"0\" tabSelected=\"1\"/></sheetViews><sheetData>{rows}</sheetData></worksheet>",+ ["[Content_Types].xml"] = "<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\"><Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/><Default Extension=\"xml\" ContentType=\"application/xml\"/><Override PartName=\"/xl/workbook.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml\"/><Override PartName=\"/xl/worksheets/sheet1.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml\"/></Types>",+ };+ using var zip = ZipFile.Open(path, ZipArchiveMode.Create);+ foreach (var (name, xml) in parts)+ {+ using var writer = new StreamWriter(zip.CreateEntry(name).Open(), new UTF8Encoding(false));+ writer.Write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + xml);+ }+ }+}diff --git a/tests/Filee.App.Tests/ToolbarEditorTests.cs b/tests/Filee.App.Tests/ToolbarEditorTests.csindex 9c814ced..50101f0c 100644--- a/tests/Filee.App.Tests/ToolbarEditorTests.cs+++ b/tests/Filee.App.Tests/ToolbarEditorTests.cs@@ -511,6 +511,8 @@ public class PresetAvailabilityTestsAssert.Null(f.Availability.Check(studio, [Fixture.Format("xlsx")]));Assert.Equal(f.Loc["error.unsupported_source"],f.Availability.Check(studio, [Fixture.Format("ods")]));+ Assert.Equal(f.Loc["error.unsupported_source"],+ f.Availability.Check(studio, [Fixture.Format("xlsx"), Fixture.Format("xlsx")]));libreOffice.Available = false;Assert.Equal(f.Loc["error.no_route"],diff --git a/tests/Filee.Engines.Tests/SpreadsheetPrintPlanTests.cs b/tests/Filee.Engines.Tests/SpreadsheetPrintPlanTests.csindex 4a91691f..bbcf6f2d 100644--- a/tests/Filee.Engines.Tests/SpreadsheetPrintPlanTests.cs+++ b/tests/Filee.Engines.Tests/SpreadsheetPrintPlanTests.cs@@ -1,6 +1,10 @@using System.IO.Compression;using System.Xml.Linq;+using Filee.Core.Conversion;+using Filee.Core.Presets;+using Filee.Engines.Office;using Filee.Engines.Office.Sheets;+using Filee.Engines.Infrastructure;using static Filee.Engines.Tests.XlsxBuilder;namespace Filee.Engines.Tests;@@ -57,11 +61,14 @@ public class SpreadsheetPrintPlanTeststry{var builder = new XlsxBuilder();- builder.Sheet("First", Row(1, builder.Text("A1", "leave me")));+ builder.Sheet("First", Row(1, builder.Text("A1", "leave me")),+ before: "<sheetViews><sheetView workbookViewId=\"0\" tabSelected=\"1\"/></sheetViews>");builder.Sheet("Plan's page", Row(1, builder.Text("A1", "show me")) +"<row r=\"2\" hidden=\"1\"><c r=\"A2\" t=\"inlineStr\"><is><t>hidden</t></is></c></row>",+ before: "<sheetViews><sheetView workbookViewId=\"0\" tabSelected=\"1\"/></sheetViews>",after: "<rowBreaks count=\"1\" manualBreakCount=\"1\"><brk id=\"2\" max=\"16383\" man=\"1\"/></rowBreaks>");var source = builder.Save(Path.Combine(folder, "source.xlsx"));+ AddWorkbookView(source);var original = File.ReadAllBytes(source);var book = SpreadsheetPrintInspector.Read(source);var selected = book.Sheets[1];@@ -80,6 +87,7 @@ public class SpreadsheetPrintPlanTestsMarginBottomMm = 10,IncludeHidden = true,KeepManualBreaks = false,+ WritePrintArea = true,};var output = Path.Combine(folder, "temporary.xlsx");@@ -89,14 +97,23 @@ public class SpreadsheetPrintPlanTestsusing var zip = ZipFile.OpenRead(output);var workbook = Xml(zip, "xl/workbook.xml").Root!;var sheets = workbook.Element(S + "sheets")!.Elements(S + "sheet").ToList();- Assert.Single(sheets);- Assert.Equal("Plan's page", (string?)sheets[0].Attribute("name"));- Assert.Null(sheets[0].Attribute("state"));+ Assert.Equal(2, sheets.Count);+ Assert.Equal("hidden", (string?)sheets[0].Attribute("state"));+ Assert.Equal("Plan's page", (string?)sheets[1].Attribute("name"));+ Assert.Null(sheets[1].Attribute("state"));+ var view = workbook.Element(S + "bookViews")!.Element(S + "workbookView")!;+ Assert.Equal("1", (string?)view.Attribute("activeTab"));+ Assert.Equal("1", (string?)view.Attribute("firstSheet"));var area = workbook.Element(S + "definedNames")!.Elements(S + "definedName").Single();Assert.Equal("'Plan''s page'!$A$1:$C$20", area.Value);- Assert.Equal("0", (string?)area.Attribute("localSheetId"));+ Assert.Equal("1", (string?)area.Attribute("localSheetId"));++ var first = Xml(zip, "xl/worksheets/sheet1.xml").Root!;+ Assert.All(first.Element(S + "sheetViews")?.Elements(S + "sheetView") ?? [],+ sheetView => Assert.Null(sheetView.Attribute("tabSelected")));var sheet = Xml(zip, "xl/worksheets/sheet2.xml").Root!;+ Assert.Equal("1", (string?)sheet.Element(S + "sheetViews")!.Element(S + "sheetView")!.Attribute("tabSelected"));Assert.Null(sheet.Element(S + "sheetData")!.Elements(S + "row").Last().Attribute("hidden"));Assert.Null(sheet.Element(S + "rowBreaks"));Assert.Equal("8", (string?)sheet.Element(S + "pageSetup")!.Attribute("paperSize"));@@ -116,6 +133,8 @@ public class SpreadsheetPrintPlanTests[InlineData("A1", true)][InlineData("$A$1:$S$52", true)][InlineData("A1:S52,T1:Z80", true)]+ [InlineData("A:H", true)]+ [InlineData("1:40", true)][InlineData("A0:S52", false)][InlineData("XFE1", false)][InlineData("A1048577", false)]@@ -123,6 +142,100 @@ public class SpreadsheetPrintPlanTestspublic void Print_ranges_are_validated(string range, bool valid) =>Assert.Equal(valid, SpreadsheetPrintInspector.IsValidRange(range));+ [Fact]+ public void Temporary_copy_keeps_cross_sheet_formulas_and_named_ranges()+ {+ var folder = Directory.CreateTempSubdirectory("filee-print-formula-").FullName;+ try+ {+ var builder = new XlsxBuilder();+ builder.Sheet("Inputs", Row(1, XlsxBuilder.Number("A1", 21)),+ before: "<sheetViews><sheetView workbookViewId=\"0\" tabSelected=\"1\"/></sheetViews>");+ builder.Sheet("Report", "<row r=\"1\"><c r=\"A1\"><f>Inputs!A1*3</f></c>" ++ "<c r=\"B1\"><f>Rate*10</f></c></row>",+ before: "<sheetViews><sheetView workbookViewId=\"0\"/></sheetViews>");+ var source = builder.Save(Path.Combine(folder, "formula.xlsx"));+ AddWorkbookView(source);+ AddDefinedNames(source,+ "<definedName name=\"Rate\">Inputs!$A$1</definedName>" ++ "<definedName name=\"LocalReport\" localSheetId=\"1\">Report!$A$1</definedName>");+ var book = SpreadsheetPrintInspector.Read(source);+ var output = Path.Combine(folder, "temporary.xlsx");++ SpreadsheetPrintPackage.Create(source, output, book, SpreadsheetPrintRegion.FromSource(book.Sheets[1]));++ using var zip = ZipFile.OpenRead(output);+ var workbook = Xml(zip, "xl/workbook.xml").Root!;+ var sheets = workbook.Element(S + "sheets")!.Elements(S + "sheet").ToList();+ Assert.Equal(2, sheets.Count);+ Assert.Equal("hidden", (string?)sheets[0].Attribute("state"));+ Assert.Null(sheets[1].Attribute("state"));+ var names = workbook.Element(S + "definedNames")!.Elements(S + "definedName").ToList();+ Assert.Contains(names, name => (string?)name.Attribute("name") == "Rate" && name.Value == "Inputs!$A$1");+ Assert.Contains(names, name => (string?)name.Attribute("name") == "LocalReport"+ && (string?)name.Attribute("localSheetId") == "1");+ Assert.Equal(["Inputs!A1*3", "Rate*10"],+ Xml(zip, "xl/worksheets/sheet2.xml").Descendants(S + "f").Select(formula => formula.Value));+ Assert.Null(workbook.Element(S + "definedNames")!.Elements(S + "definedName")+ .FirstOrDefault(name => (string?)name.Attribute("name") == "_xlnm.Print_Area"));+ }+ finally { Directory.Delete(folder, recursive: true); }+ }++ [Fact]+ public void Inspector_handles_a_comma_in_the_sheet_name()+ {+ var folder = Directory.CreateTempSubdirectory("filee-print-comma-").FullName;+ try+ {+ var builder = new XlsxBuilder();+ var source = builder.Sheet("Sales, West", Row(1, builder.Text("A1", "x")))+ .Save(Path.Combine(folder, "comma.xlsx"));+ AddDefinedNames(source,+ "<definedName name=\"_xlnm.Print_Area\" localSheetId=\"0\">'Sales, West'!$A:$H,'Sales, West'!$1:$40</definedName>");++ var sheet = Assert.Single(SpreadsheetPrintInspector.Read(source).Sheets);++ Assert.Equal("A:H,1:40", sheet.PrintArea);+ }+ finally { Directory.Delete(folder, recursive: true); }+ }++ [Fact]+ public async Task LibreOffice_round_trip_recalculates_a_cross_sheet_named_formula()+ {+ var folder = Directory.CreateTempSubdirectory("filee-print-lo-").FullName;+ try+ {+ var libreOffice = new LibreOfficeConverter(new EngineEnvironment(Path.Combine(folder, "data")));+ Assert.SkipUnless(libreOffice.GetStatus().IsAvailable, "LibreOffice not found");+ var builder = new XlsxBuilder();+ builder.Sheet("Inputs", Row(1, XlsxBuilder.Number("A1", 21)));+ builder.Sheet("Report", "<row r=\"1\"><c r=\"A1\"><f>Inputs!A1*3</f></c>" ++ "<c r=\"B1\"><f>Rate*10</f></c></row>");+ var source = builder.Save(Path.Combine(folder, "formula.xlsx"));+ AddWorkbookView(source);+ AddDefinedNames(source, "<definedName name=\"Rate\">Inputs!$A$1</definedName>");+ var book = SpreadsheetPrintInspector.Read(source);+ var temporary = Path.Combine(folder, "temporary.xlsx");+ SpreadsheetPrintPackage.Create(source, temporary, book,+ SpreadsheetPrintRegion.FromSource(book.Sheets[1]) with { Range = "A1:B1", WritePrintArea = true });+ var pdf = Path.Combine(folder, "formula.pdf");++ var results = await libreOffice.ConvertAsync(new ConversionStep(temporary, "xlsx", "pdf",+ new Preset { TargetFormat = "pdf" }, new ExactOutput(pdf), folder), null,+ TestContext.Current.CancellationToken);++ Assert.Single(results);+ Assert.True(File.Exists(pdf));+ using var document = UglyToad.PdfPig.PdfDocument.Open(pdf);+ var text = document.GetPage(1).Text;+ Assert.Contains("63", text);+ Assert.Contains("210", text);+ }+ finally { Directory.Delete(folder, recursive: true); }+ }+[Fact]public void Pdf_preview_preserves_the_page_shape(){@@ -170,4 +283,24 @@ public class SpreadsheetPrintPlanTestsusing var output = zip.CreateEntry("xl/workbook.xml").Open();document.Save(output);}++ private static void AddWorkbookView(string path)+ {+ using var zip = ZipFile.Open(path, ZipArchiveMode.Update);+ var entry = zip.GetEntry("xl/workbook.xml")!;+ XDocument document;+ using (var stream = entry.Open())+ document = XDocument.Load(stream);+ document.Root!.Element(S + "sheets")!.AddBeforeSelf(+ new XElement(S + "bookViews", new XElement(S + "workbookView",+ new XAttribute("activeTab", 0), new XAttribute("firstSheet", 0))));+ entry.Delete();+ using var output = zip.CreateEntry("xl/workbook.xml").Open();+ document.Save(output);+ }++ private sealed class ExactOutput(string path) : IOutputAllocator+ {+ public string? Allocate(string extension, string? suffix = null) => path;+ }}