fix: Fix rendering order and remove unused variables

- Adjust the drawing order in NodeRenderer to ensure metadata inheritance is completed before rendering
- Remove unused variable `j` in ListService and simplify logic

Author: Yushu2606

README.md

@@ -13,7 +13,7 @@
 ![Static Badge](https://img.shields.io/badge/Ver-LI26.14--A-blue)
 ![Static Badge](https://img.shields.io/badge/License-AGPLv3-orange)
 [![CodeFactor](https://www.codefactor.io/repository/github/derakkumadev/limekuma-printer/badge)](https://www.codefactor.io/repository/github/derakkumadev/limekuma-printer)
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/679c7eab2c8d48af8069da446f5ff8ae)](https://app.codacy.com/gh/DerakkumaDev/limekuma-printer/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/34a3bb83aa2a4182ac748954c18aac89)](https://app.codacy.com/gh/DerakkumaDev/limekuma-printer/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![QQ](https://img.shields.io/badge/Bot-迪拉熊-grey?style=social&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMTIuODIgMTMwLjg5Ij48ZyBkYXRhLW5hbWU9IuWbvuWxgiAyIj48ZyBkYXRhLW5hbWU9IuWbvuWxgiAxIj48cGF0aCBkPSJNNTUuNjMgMTMwLjhjLTcgMC0xMy45LjA4LTIwLjg2IDAtMTkuMTUtLjI1LTMxLjcxLTExLjQtMzQuMjItMzAuMy00LjA3LTMwLjY2IDE0LjkzLTU5LjIgNDQuODMtNjYuNjQgMi0uNTEgNS4yMS0uMzEgNS4yMS0xLjYzIDAtMi4xMy4xNC0yLjEzLjE0LTUuNTcgMC0uODktMS4zLTEuNDYtMi4yMi0yLjMxLTYuNzMtNi4yMy03LjY3LTEzLjQxLTEtMjAuMTggNS40LTUuNTIgMTEuODctNS40IDE3LjgtLjU5IDYuNDkgNS4yNiA2LjMxIDEzLjA4LS44NiAyMS0uNjguNzQtMS43OCAxLjYtMS43OCAyLjY3djQuMjFjMCAxLjM1IDIuMiAxLjYyIDQuNzkgMi4zNSAzMS4wOSA4LjY1IDQ4LjE3IDM0LjEzIDQ1IDY2LjM3LTEuNzYgMTguMTUtMTQuNTYgMzAuMjMtMzIuNyAzMC42My04LjAyLjE5LTE2LjA3LS4wMS0yNC4xMy0uMDF6IiBmaWxsPSIjMDI5OWZlIi8+PHBhdGggZD0iTTMxLjQ2IDExOC4zOGMtMTAuNS0uNjktMTYuOC02Ljg2LTE4LjM4LTE3LjI3LTMtMTkuNDIgMi43OC0zNS44NiAxOC40Ni00Ny44MyAxNC4xNi0xMC44IDI5Ljg3LTEyIDQ1LjM4LTMuMTkgMTcuMjUgOS44NCAyNC41OSAyNS44MSAyNCA0NS4yOS0uNDkgMTUuOS04LjQyIDIzLjE0LTI0LjM4IDIzLjUtNi41OS4xNC0xMy4xOSAwLTE5Ljc5IDAiIGZpbGw9IiNmZWZlZmUiLz48cGF0aCBkPSJNNDYuMDUgNzkuNThjLjA5IDUgLjIzIDkuODItNyA5Ljc3LTcuODItLjA2LTYuMS01LjY5LTYuMjQtMTAuMTktLjE1LTQuODItLjczLTEwIDYuNzMtOS44NHM2LjM3IDUuNTUgNi41MSAxMC4yNnoiIGZpbGw9IiMxMDlmZmUiLz48cGF0aCBkPSJNODAuMjcgNzkuMjdjLS41MyAzLjkxIDEuNzUgOS42NC01Ljg4IDEwLTcuNDcuMzctNi44MS00LjgyLTYuNjEtOS41LjItNC4zMi0xLjgzLTEwIDUuNzgtMTAuNDJzNi41OSA0Ljg5IDYuNzEgOS45MnoiIGZpbGw9IiMwODljZmUiLz48L2c+PC9nPjwvc3ZnPg==)](https://qun.qq.com/qunpro/robot/qunshare?robot_appid=102613765&robot_uin=3889525249)
 [![QQ](https://img.shields.io/badge/Bot-迪拉熊-gray?logo=qq&style=social)](https://qm.qq.com/cgi-bin/qm/qr?k=LyQOTRI7ViXYSTg0zbS2sGgcmkbYrxbP)
 [![QQ](https://img.shields.io/badge/Group-迪拉熊开发者交流群-gray?logo=qq&style=social)](https://qm.qq.com/cgi-bin/qm/qr?k=g-3hU7eFmvcFUuCKdCE-3COu8Ej9LfnD&jump_from=webapi&authKey=IpqRZXflOY9UKkYPn0Ho2RrVBw+UF2pfTZk6WnhU39idA4AyJt65nAwfuPfn1yZ+)

src/Render/NodeRenderer.Rendering.cs

@@ -66,11 +66,11 @@ private static void RenderResizedNode(Image canvas, ResizedNode resize, AssetPro
         height = Math.Max(1, (int)Math.Round(height * resize.Scale));
         rendered.Mutate(ctx => ctx.Resize(width, height, GetResampler(resize.Resampler)));
         bool shouldInheritMetadata = canvas.Frames.Count <= 1 && rendered.Frames.Count > 1;
-        canvas.Mutate(ctx => ctx.DrawImage(rendered, origin, inheritedOpacity, GetForegroundRepeatCount(rendered)));
         if (shouldInheritMetadata)
         {
             InheritCanvasFramesAndMetadataOnFirstDraw(canvas, rendered);
         }
+        canvas.Mutate(ctx => ctx.DrawImage(rendered, origin, inheritedOpacity, GetForegroundRepeatCount(rendered)));
     }
 
     private static void RenderStackNode(Image canvas, StackNode stack, AssetProvider assets, AssetProvider measurer,
@@ -272,12 +272,12 @@ private static void RenderImageNode(Image canvas, ImageNode image, AssetProvider
         }
 
         bool shouldInheritMetadata = canvas.Frames.Count <= 1 && img.Frames.Count > 1;
-        canvas.Mutate(c => c.DrawImage(img, origin, image.ColorBlending, image.AlphaComposition, inheritedOpacity,
-            image.ForegroundRepeatCount));
         if (shouldInheritMetadata)
         {
             InheritCanvasFramesAndMetadataOnFirstDraw(canvas, img);
         }
+        canvas.Mutate(c => c.DrawImage(img, origin, image.ColorBlending, image.AlphaComposition, inheritedOpacity,
+            image.ForegroundRepeatCount));
     }
 
     private static void RenderTextNode(Image canvas, TextNode textNode, AssetProvider assets, PointF origin,
@@ -375,11 +375,11 @@ private static void RenderCanvasNode(Image canvasImage, CanvasNode canvas, Asset
     {
         using Image subCanvas = Render(canvas, assets, measurer);
         bool shouldInheritMetadata = canvasImage.Frames.Count <= 1 && subCanvas.Frames.Count > 1;
-        canvasImage.Mutate(c => c.DrawImage(subCanvas, origin, inheritedOpacity, GetForegroundRepeatCount(subCanvas)));
         if (shouldInheritMetadata)
         {
             InheritCanvasFramesAndMetadataOnFirstDraw(canvasImage, subCanvas);
         }
+        canvasImage.Mutate(c => c.DrawImage(subCanvas, origin, inheritedOpacity, GetForegroundRepeatCount(subCanvas)));
     }
 
     private static void InheritCanvasFramesAndMetadataOnFirstDraw(Image canvas, Image foreground)

src/Render/NodeRenderer.cs

@@ -96,6 +96,9 @@ private static void RenderNode(Image canvas, Node node, AssetProvider assets, As
             case CanvasNode subCanvas:
                 RenderCanvasNode(canvas, subCanvas, assets, measurer, origin, inheritedOpacity);
                 break;
+
+            default:
+                throw new NotImplementedException();
         }
     }
 }

src/Services/ListService.cs

@@ -20,10 +20,8 @@ public sealed partial class ListService : ListApi.ListApiBase
         int[] counts = new int[16];
         counts[15] = count;
 
-        int j = i;
         int end = Math.Min(i + 55, count);
         await ServiceHelper.PrepareRecordDataAsync(records[i..end]);
-        j = end;
 
         Parallel.ForEach(records, () => new int[15], (record, _, local) =>
         {
@@ -119,6 +117,6 @@ public sealed partial class ListService : ListApi.ListApiBase
             }
         });
 
-        return (counts, i, j);
+        return (counts, i, end);
     }
 }