Update Windows installer script

TODO.txt

@@ -1,3 +1,32 @@
+magick "2026-01-29 — \$210 — WORK PERMIT.pdf" -background white -alpha background -alpha off -density 288 -resize 25% page-%03d.jpg
+https://github.com/dlemstra/Magick.NET/blob/main/docs/ConvertPDF.md
+https://stackoverflow.com/questions/65089839/add-an-external-pdf-page-to-pdfsharp-migradoc
+https://github.com/mephraim/ghostscriptsharp
+https://stackoverflow.com/a/71485279/3938401
+
+need a PDF viewer that works with annotations
+https://github.com/BobLd/PdfPig.Rendering.Skia/ works but quality is low for some reason, I don't know why. probably need a bug report or some option that is hidden.
+                using (var document = UglyToad.PdfPig.PdfDocument.Open(filePath, UglyToad.PdfPig.Rendering.Skia.SkiaRenderingParsingOptions.Instance))
+                {
+
+                    document.AddSkiaPageFactory(); // Same as document.AddPageFactory<SKPicture, SkiaPageFactory>() and document.AddPageFactory<PdfPageSize, PageSizeFactory>()
+
+                    for (int p = 1; p <= document.NumberOfPages; p++)
+                    {
+                        using var skBitmap = document.GetPageAsSKBitmap(p, 1);
+                        using (var fs = new FileStream(Path.Combine(convertedDir, $"{fileName}_{p}PIG.jpeg"), FileMode.Create))
+                        using (var ms = document.GetPageAsPng(p, 1, 4))
+                        {
+                            MemoryStream memoryStream = new MemoryStream();
+                            skBitmap.Encode(memoryStream, SkiaSharp.SKEncodedImageFormat.Jpeg, 100);
+                            memoryStream.Position = 0L;
+
+                            ms.WriteTo(fs);
+                        }
+                    }
+                }
+https://github.com/GowenGit/docnet -- may need to fork this and publish our own package if some OS doesn't work
+
 *-add more items
 *-save last opened folder to settings somewhere
 

installers/WindowsInstallerScript.iss

@@ -3,7 +3,7 @@
 ; Non-commercial use only
 
 #define MyAppName "MayShow"
-#define MyAppVersion "1.2.0"
+#define MyAppVersion "1.3.0"
 #define MyAppPublisher "Quickity Quack Productions"
 #define MyAppExeName "MayShow.exe"
 
@@ -45,7 +45,9 @@ Source: "..\src\bin\Release\net10.0\win-x64\publish\{#MyAppExeName}"; DestDir: "
 Source: "..\src\bin\Release\net10.0\win-x64\publish\av_libglesv2.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\src\bin\Release\net10.0\win-x64\publish\libHarfBuzzSharp.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\src\bin\Release\net10.0\win-x64\publish\libSkiaSharp.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\src\bin\Release\net10.0\win-x64\publish\Magick.Native-Q16-x64.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\src\bin\Release\net10.0\win-x64\publish\LICENSE"; DestDir: "{app}"; DestName: "PDFium-license.txt"; Flags: ignoreversion 
+Source: "..\src\bin\Release\net10.0\win-x64\publish\Magick.Native-Q8-x64.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\src\bin\Release\net10.0\win-x64\publish\pdfium.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\src\bin\Release\net10.0\win-x64\publish\Assets\*"; DestDir: "{app}\Assets"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 

installers/build-linux.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+VERSION="1.3.0"
 SRC_DIR="src" # user ran script from main folder
 if [ ! -d "$SRC_DIR" ]; then
     SRC_DIR= "../src" # try 
@@ -11,6 +12,12 @@ fi
 cd "$SRC_DIR"
 echo "Building release for linux-x64..."
 dotnet publish -c Release -r linux-x64 -p:StripSymbols=False -p:PublishAot=False
+echo "Zipping up linux-x64..."
+cd bin/Release/net10.0/linux-x64/publish
+zip -r "../../../../MayShow $VERSION linux-arm64.zip" .
+cd ../../../../../
 echo "Building release for linux-arm64..."
 dotnet publish -c Release -r linux-arm64 -p:StripSymbols=False -p:PublishAot=False
-# TODO: add automatic zipping and version number setting for ease of use
+cd bin/Release/net10.0/linux-arm64/publish
+zip -r "../../../../MayShow $VERSION linux-arm64.zip" .
+cd ../../../../../

src/App.axaml

@@ -106,6 +106,9 @@
         <DataTemplate DataType="{x:Type viewModels:ConfirmViewModel}">
             <views:ConfirmView/>
         </DataTemplate>
+        <DataTemplate DataType="{x:Type viewModels:SettingsViewModel}">
+            <views:SettingsView/>
+        </DataTemplate>
     </Application.DataTemplates>
     <Application.Resources>
         <ResourceDictionary>

src/Helpers/Constants.cs

@@ -5,7 +5,7 @@ namespace MayShow.Helpers;
 
 class Constants
 {
-    public static string AppVersion = "1.2.0";
+    public static string AppVersion = "1.3.0";
 
     public static string[] AllowedFileExtensionPatterns = [ "*.png", "*.jpg", "*.jpeg", "*.gif", "*.bmp", "*.webp", "*.pdf", "*.heic", ];
     public static string[] AllowedFileExtensionsNoStar = [ "png", "jpg", "jpeg", "gif", "bmp", "webp", "pdf", "heic", ];

src/MayShow.csproj

@@ -12,12 +12,17 @@
     <PublishTrimmed>true</PublishTrimmed>
     <PublishAot>true</PublishAot>
     <AssemblyName>MayShow</AssemblyName>
-    <AssemblyVersion>1.2.0</AssemblyVersion> <!-- Also update Constants version -->
+    <AssemblyVersion>1.3.0</AssemblyVersion> <!-- Also update Constants version -->
     <ApplicationIcon>MayShow-icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <TrimmerRootAssembly Include="MigraDoc.DocumentObjectModel" />
+    <TrimmerRootAssembly Include="MigraDoc.Rendering" />
+    <TrimmerRootAssembly Include="MigraDoc.RtfRendering" />
     <TrimmerRootAssembly Include="PdfSharp" />
     <TrimmerRootAssembly Include="Avalonia.Controls.DataGrid" />
+    <!-- <TrimmerRootAssembly Include="Docnet.Core" />
+    <TrimmerRootAssembly Include="SixLabors.ImageSharp" /> -->
   </ItemGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
@@ -46,10 +51,12 @@
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="PDFsharp-MigraDoc" Version="6.2.3" />
-    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.10.2" />
+    <PackageReference Include="PDFsharp-MigraDoc" Version="6.2.4" />
+    <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.10.3" />
     <PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.10.11-preview20251127001" />
     <PackageReference Include="DialogHost.Avalonia" Version="0.10.4" />
     <PackageReference Include="Xaml.Behaviors.Interactions.DragAndDrop.DataGrid" Version="11.3.9.5" />
+    <PackageReference Include="Docnet.Core" Version="2.6.0" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
   </ItemGroup>
 </Project>

src/Models/Settings.cs

@@ -12,10 +12,12 @@ namespace MayShow.Models;
 class Settings : ChangeNotifier
 {
     private string _lastUsedPath;
+    private bool _useDocnetPDFImageRendering;
 
     public Settings()
     {
         _lastUsedPath = "";
+        _useDocnetPDFImageRendering = true;
     }
 
     [JsonInclude]
@@ -25,6 +27,13 @@ class Settings : ChangeNotifier
         set { _lastUsedPath = value; NotifyPropertyChanged(); }
     }
 
+    [JsonInclude]
+    public bool UseDocnetPFDImageRendering
+    {
+        get => _useDocnetPDFImageRendering;
+        set { _useDocnetPDFImageRendering = value; NotifyPropertyChanged(); }
+    }
+
     public static string GetSettingsFileName()
     {
         return "settings.json";

src/ViewModels/MainViewModel.cs

@@ -21,6 +21,14 @@ using MayShow.Interfaces;
 using MayShow.Models;
 using MayShows.Helpers;
 
+using Docnet.Core.Models;
+using Docnet.Core;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+using System.Reflection.Metadata.Ecma335;
+using Docnet.Core.Readers;
+
 namespace MayShow.ViewModels;
 
 class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
@@ -230,10 +238,7 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
                 {
                     AddFileBasedOnPath(filePath);
                 }
-                if (!_isPerformingInitialLoad)
-                {
-                    ResortPDFItemsByDate();
-                }
+                ResortPDFItemsByDate();
                 HasUnsavedWork = true;
             }
         }
@@ -249,6 +254,17 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
         DialogHost.Show(new AboutViewModel());
     }
 
+    public async Task ShowSettings()
+    {
+        var updatedSettings = await DialogHost.Show(new SettingsViewModel(_settings));
+        if (updatedSettings != null)
+        {
+            _settings = (Settings)updatedSettings;
+            await _settings.SaveSettingsAsync();
+            LogInfo("Saved updated settings!");
+        }
+    }
+
     public void RemoveFile(object f) => RemoveFileImpl((ReportFile)f);
 
     public async void RemoveFileImpl(ReportFile file)
@@ -705,41 +721,104 @@ class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
                 if (didAdjust)
                 {
                     await mImage.WriteAsync(convertedOutputPath);
-                    filePath = Path.Combine("Converted", info.Name + ".jpg");
-                    LogInfo(string.Format("Saved adjusted image to JPEG; fileName is now {0}", file.FilePath));                    
+                    filePath = convertedOutputPath;
+                    LogInfo(string.Format("Saved adjusted image to JPEG; file path is now {0}", filePath));                    
+                }
+                // write to PDF
+                var paragraph = section.AddParagraph();
+                paragraph.Format.Alignment = ParagraphAlignment.Center;
+                var image = paragraph.AddImage(filePath);
+                image.LockAspectRatio = true;
+                if (!isPDF && loadedImageHeight > 600)
+                {
+                    image.Height = 550; // make sure it will fit on one page
+                }
+                else
+                {
+                    image.Width = imageWidth; // can't be too wide now...not sure why...maybe due to margins...
                 }
-            }
-            var paragraph = section.AddParagraph();
-            paragraph.Format.Alignment = ParagraphAlignment.Center;
-            var image = paragraph.AddImage(filePath);
-            image.LockAspectRatio = true;
-            if (!isPDF && loadedImageHeight > 600)
-            {
-                image.Height = 550; // make sure it will fit on one page
             }
             else
             {
-                image.Width = imageWidth; // can't be too wide now...not sure why...maybe due to margins...
-            }
-            LogInfo(string.Format("Added image: {0} ({1})", file.Title, filePath));
-            if (isPDF)
-            {
-                // add other PDF pages
-                // see: https://stackoverflow.com/a/65091204/3938401
-                var pdfFileToAdd = PdfReader.Open(filePath);
-                imageTitlePar.AddText(string.Format(" (PDF with {0} page{1}) ", 
-                    pdfFileToAdd.PageCount, 
-                    pdfFileToAdd.PageCount == 1 ? "" : "s"));
-                for (var j = 2; j <= pdfFileToAdd.PageCount; j++)
+                // need to render PDF to images
+                if (_settings.UseDocnetPFDImageRendering)
                 {
-                    section.AddPageBreak();
-                    paragraph = section.AddParagraph();
+                    // render using Docnet library (which utilizes pdfium, the chrome renderer)
+                    string RenderPdfPageToImage(IDocReader docReader, int pgNum)
+                    {
+                        Console.WriteLine("Rendering pg " + pgNum);
+                        using var pageReader = docReader.GetPageReader(pgNum);
+                        Console.WriteLine("Getting image for page " + pgNum);
+                        var rawBytes = pageReader.GetImage(RenderFlags.RenderAnnotations);
+                        Console.WriteLine("Getting width & height for page " + pgNum);
+                        var width = pageReader.GetPageWidth();
+                        var height = pageReader.GetPageHeight();
+                        Console.WriteLine("Loading pixel data for page " + pgNum);
+                        using var img = Image.LoadPixelData<Bgra32>(rawBytes, width, height);
+                        // you are likely going to want this as well otherwise you might end up with transparent parts.
+                        img.Mutate(x => x.BackgroundColor(SixLabors.ImageSharp.Color.White));
+                        var pdfPageImageOutputPath = Path.Combine(convertedDir, info.Name + "-Page-" 
+                            + (pgNum + 1).ToString().PadLeft(3, '0') + ".jpg");
+                        img.Save(pdfPageImageOutputPath);
+                        Console.WriteLine("Done rendering pg " + pgNum);
+                        return pdfPageImageOutputPath;
+                    }
+                    // render all pages to images
+                    var docReader = DocLib.Instance.GetDocReader(
+                        filePath,
+                        new PageDimensions(1080, 1920)); // TODO: are these dims right?
+                    // add to document
+                    var pgCount = docReader.GetPageCount();
+                    if (pgCount > 0)
+                    {
+                        var convertedPdfImagePath = RenderPdfPageToImage(docReader, 0);
+                        imageTitlePar.AddText(string.Format(" (PDF with {0} page{1}) ", 
+                            pgCount, 
+                            pgCount == 1 ? "" : "s"));
+                        var paragraph = section.AddParagraph();
+                        paragraph.Format.Alignment = ParagraphAlignment.Center;
+                        var image = paragraph.AddImage(convertedPdfImagePath);
+                        image.Width = imageWidth;
+                        image.LockAspectRatio = true;
+                        for (var j = 1; j < pgCount; j++)
+                        {
+                            section.AddPageBreak();
+                            paragraph = section.AddParagraph();
+                            paragraph.Format.Alignment = ParagraphAlignment.Center;
+                            convertedPdfImagePath = RenderPdfPageToImage(docReader, j);
+                            image = paragraph.AddImage(convertedPdfImagePath);
+                            image.LockAspectRatio = true;
+                            image.Width = imageWidth;
+                        }
+                    }
+                }
+                else
+                {
+                    // render first page (eventually need to improve code to just do everything in a loop)
+                    var paragraph = section.AddParagraph();
                     paragraph.Format.Alignment = ParagraphAlignment.Center;
-                    image = paragraph.AddImage(filePath + "#" + j);
+                    var image = paragraph.AddImage(filePath);
                     image.LockAspectRatio = true;
-                    image.Width = imageWidth;
+                    image.Width = imageWidth; // can't be too wide now...not sure why...maybe due to margins...
+                    // render other PDF pages, if any
+                    // see: https://stackoverflow.com/a/65091204/3938401
+                    var pdfFileToAdd = PdfReader.Open(filePath, PdfDocumentOpenMode.Import);
+                    var pgCount = pdfFileToAdd.PageCount;
+                    imageTitlePar.AddText(string.Format(" (PDF with {0} page{1}) ", 
+                        pgCount, 
+                        pgCount == 1 ? "" : "s"));
+                    for (var j = 2; j <= pgCount; j++)
+                    {
+                        section.AddPageBreak();
+                        paragraph = section.AddParagraph();
+                        paragraph.Format.Alignment = ParagraphAlignment.Center;
+                        image = paragraph.AddImage(filePath + "#" + j);
+                        image.LockAspectRatio = true;
+                        image.Width = imageWidth;
+                    }
                 }
             }
+            LogInfo(string.Format("Added image: {0} ({1})", file.Title, filePath));
             hasAddedData = true;
         }
         var pdfRenderer = new PdfDocumentRenderer

src/ViewModels/SettingsViewModel.cs

@@ -0,0 +1,58 @@
+#nullable enable
+
+using System;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Platform.Storage;
+using Avalonia.Themes.Fluent;
+using DialogHostAvalonia;
+using ImageMagick;
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.Rendering;
+using PdfSharp.Fonts;
+using PdfSharp.Pdf.IO;
+using PdfSharp.Snippets.Font;
+using MayShow.Interfaces;
+using MayShow.Models;
+using MayShow.Helpers;
+
+namespace MayShow.ViewModels;
+
+class SettingsViewModel: ChangeNotifier
+{
+    private Settings _previousSettings;
+    private Settings _settings;
+
+    public SettingsViewModel(Settings settingsToEdit)
+    {
+        _previousSettings = settingsToEdit;
+        _settings = new Settings
+        {
+            LastUsedPath = _previousSettings.LastUsedPath,
+            UseDocnetPFDImageRendering = _previousSettings.UseDocnetPFDImageRendering
+        };
+    }
+
+    public bool UseDocnetPDFImageRendering
+    {
+        get => _settings.UseDocnetPFDImageRendering;
+        set
+        {
+            _settings.UseDocnetPFDImageRendering = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    public void Cancel()
+    {
+        DialogHost.Close("DialogHost", null);
+    }
+
+    public void Save()
+    {
+        DialogHost.Close("DialogHost", _settings);
+    }
+}

src/Views/MainView.axaml

@@ -12,15 +12,23 @@
              x:DataType="vm:MainViewModel">
   <Grid ColumnDefinitions="*"
         RowDefinitions="Auto, 2*, Auto, Auto, *">
+    <Button Command="{Binding ShowSettings}"
+            Grid.Row="0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Margin="4,4,0,4">
+        <TextBlock><Run Text="&#xf013;" FontFamily="{StaticResource FontAwesomeSolid}"/> Settings</TextBlock>
+    </Button>
     <Button Command="{Binding ShowAbout}"
             Grid.Row="0"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
-            Margin="0,2,4,0">
+            Margin="0,4,4,4">
         <TextBlock><Run Text="&#xf059;" FontFamily="{StaticResource FontAwesomeSolid}"/> About</TextBlock>
     </Button>
     <StackPanel Orientation="Vertical"
-                Spacing="2">
+                Spacing="2"
+                Margin="0,4,0,0">
         <Label Content="MayShow: Report Builder"
                FontSize="20"
                FontWeight="Bold"

src/Views/SettingsView.axaml

@@ -0,0 +1,40 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d"
+             d:DesignWidth="800"
+             d:DesignHeight="450"
+             x:Class="MayShow.Views.SettingsView"
+             xmlns:models="clr-namespace:MayShow.Models"
+             xmlns:vm="clr-namespace:MayShow.ViewModels"
+             x:DataType="vm:SettingsViewModel"
+             MaxWidth="350">
+    <ScrollViewer AllowAutoHide="False">
+        <StackPanel Orientation="Vertical"
+                    Spacing="4"
+                    Margin="12,4,12,0">
+            <Label Content="Settings"
+                    HorizontalAlignment="Center"
+                    FontSize="16"
+                    FontWeight="Bold" />
+            <CheckBox IsChecked="{Binding !UseDocnetPDFImageRendering}">Use legacy PDF handling (does not work with macOS annotations)</CheckBox>
+            <StackPanel Orientation="Horizontal"
+                        Spacing="12"
+                        Margin="0,4,0,0"
+                        HorizontalAlignment="Right">
+                <Button Command="{Binding Cancel}">
+                    <TextBlock>
+                        <Run Text="&#xf0e2;"
+                            FontFamily="{StaticResource FontAwesomeSolid}" /> Cancel</TextBlock>
+                </Button>
+                <Button Command="{Binding Save}"
+                        Classes="accent">
+                    <TextBlock>
+                        <Run Text="&#xf0c7;"
+                            FontFamily="{StaticResource FontAwesomeSolid}" /> Save</TextBlock>
+                </Button>
+            </StackPanel>
+        </StackPanel>
+    </ScrollViewer>
+</UserControl>

src/Views/SettingsView.axaml.cs

@@ -0,0 +1,15 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace MayShow.Views
+{
+    public partial class SettingsView : UserControl
+    {
+        public SettingsView()
+        {
+            this.InitializeComponent();
+        }
+    }
+}

src/app.manifest

@@ -3,7 +3,7 @@
   <!-- This manifest is used on Windows only.
        Don't remove it as it might cause problems with window transparency and embedded controls.
        For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
-  <assemblyIdentity version="1.2.0.0" name="MayShow.Desktop"/>
+  <assemblyIdentity version="1.3.0.0" name="MayShow.Desktop"/>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>