From 0d194ba645d7823e09c1805381f47a846d02c7f5 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sat, 23 Oct 2021 13:36:00 +0800 Subject: [PATCH] [Desktop] Update card audit - only display the missing cards and not implemented cards. --- .../home/settings/VSubmenuDownloaders.java | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java index 9390f274961..92e8462acec 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java @@ -262,8 +262,9 @@ public enum VSubmenuDownloaders implements IVSubmenu { for (CardEdition e : editions) { if (CardEdition.Type.FUNNY.equals(e.getType())) continue; - nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n"); - cniSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n"); + boolean nifHeader = false; + boolean cniHeader = false; + boolean tokenHeader = false; String imagePath; int artIndex = 1; @@ -289,6 +290,10 @@ public enum VSubmenuDownloaders implements IVSubmenu { } if (cp == null) { + if (!cniHeader) { + cniSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n"); + cniHeader = true; + } cniSB.append(" ").append(c).append("\n"); notImplementedCount++; continue; @@ -302,6 +307,10 @@ public enum VSubmenuDownloaders implements IVSubmenu { if (imagePath != null) { File file = ImageKeys.getImageFile(imagePath); if (file == null) { + if (!nifHeader) { + nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n"); + nifHeader = true; + } nifSB.append(" ").append(imagePath).append("\n"); missingCount++; } @@ -315,6 +324,10 @@ public enum VSubmenuDownloaders implements IVSubmenu { if (imagePath != null) { File file = ImageKeys.getImageFile(imagePath); if (file == null) { + if (!nifHeader) { + nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n"); + nifHeader = true; + } nifSB.append(" ").append(imagePath).append("\n"); missingCount++; } @@ -322,8 +335,6 @@ public enum VSubmenuDownloaders implements IVSubmenu { } } - nifSB.append("\nTOKENS\n"); - // TODO: Audit token images here... for(Entry tokenEntry : e.getTokens().entrySet()) { String name = tokenEntry.getKey(); @@ -338,6 +349,14 @@ public enum VSubmenuDownloaders implements IVSubmenu { String imgKey = token.getImageKey(i); File file = ImageKeys.getImageFile(imgKey); if (file == null) { + if (!nifHeader) { + nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n"); + nifHeader = true; + } + if (!tokenHeader) { + nifSB.append("\nTOKENS\n"); + tokenHeader = true; + } nifSB.append(" ").append(token.getImageFilename(i + 1)).append("\n"); missingCount++; } @@ -346,7 +365,8 @@ public enum VSubmenuDownloaders implements IVSubmenu { System.out.println("No Token found: " + name + " in " + e.getName()); } } - nifSB.append("\n"); + if (nifHeader) + nifSB.append("\n"); }