Move PageLinks down.

Author: pawchen

converter/generator/DocBookTransformer.cs

@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using System.Xml.Linq;
+using System.Xml.Linq;
 using AngleSharp.Dom;
 using AngleSharp.Html.Dom;
 using OriginLab.DocumentGeneration.Templates;

converter/generator/DocToStaticPagesTransformer.cs

@@ -1,5 +1,6 @@
 using System.Buffers;
 using System.Net;
+using System.Xml.Linq;
 using AngleSharp.Dom;
 using AngleSharp.Html.Dom;
 using AngleSharp.Html.Parser;
@@ -11,6 +12,8 @@ internal abstract partial class DocToStaticPagesTransformer : DocTransformer
 {
     public const int MaxSiblingNodes = 10 * 2;
 
+    private readonly Dictionary<string, (string book, string url, string titleEn)> PageLinks;
+
     private readonly bool UseWebp;
 
     #region Language specific members
@@ -25,6 +28,25 @@ internal abstract partial class DocToStaticPagesTransformer : DocTransformer
 
     protected DocToStaticPagesTransformer(DocToStaticPagesTransformerArgs args, ProblemRecorder problems) : base(args, problems)
     {
+        var pages = new List<(string file, string book, string url, string title)>();
+
+        foreach (var xmlFile in Directory.EnumerateFiles(BooksXmlFolder, "*.xml"))
+        {
+            var dirName = Path.GetFileNameWithoutExtension(xmlFile);
+
+            foreach (var p in XElement.Load(xmlFile).Descendants("page"))
+            {
+                var file = $"{dirName}/{p.Attribute("file")!.Value}";
+                var url = p.Attribute("url")!.Value;
+                var sep = url.IndexOf('/');
+                var title = p.Attribute("title")!.Value;
+
+                pages.Add((file, book: sep < 0 ? url : url[..sep], url: sep < 0 ? "" : url[(sep + 1)..], title));
+            }
+        }
+
+        PageLinks = pages.ToDictionary(p => p.file, p => (p.book.ToLowerInvariant(), p.url.ToLowerInvariant(), p.title), StringComparer.OrdinalIgnoreCase);
+
         UseWebp = args.UseWebp;
     }
 

converter/generator/DocTransformer.cs

@@ -22,8 +22,6 @@ internal abstract partial class DocTransformer : IDocTransformer
 
     protected string[] AvailableLanguages { get; }
 
-    protected readonly Dictionary<string, (string book, string url, string titleEn)> PageLinks;
-
     protected Dictionary<string, string> MovedPages => field ??= GetMovedPages();
 
     protected static Dictionary<string, string> SharedImages => field ??= GetSharedImages();
@@ -63,25 +61,6 @@ protected DocTransformer(DocTransformerArgs args, ProblemRecorder problems)
         }
 
         AvailableLanguages = languages;
-
-        var pages = new List<(string file, string book, string url, string title)>();
-
-        foreach (var xmlFile in Directory.EnumerateFiles(booksXmlFolder, "*.xml"))
-        {
-            var dirName = Path.GetFileNameWithoutExtension(xmlFile);
-
-            foreach (var p in XElement.Load(xmlFile).Descendants("page"))
-            {
-                var file = $"{dirName}/{p.Attribute("file")!.Value}";
-                var url = p.Attribute("url")!.Value;
-                var sep = url.IndexOf('/');
-                var title = p.Attribute("title")!.Value;
-
-                pages.Add((file, book: sep < 0 ? url : url[..sep], url: sep < 0 ? "" : url[(sep + 1)..], title));
-            }
-        }
-
-        PageLinks = pages.ToDictionary(p => p.file, p => (p.book.ToLowerInvariant(), p.url.ToLowerInvariant(), p.title), StringComparer.OrdinalIgnoreCase);
     }
 
     private Dictionary<string, string> GetMovedPages()