server: removed useless fastDbMode, improved db stats logs on updating

magefree · Sep 17, 2023 · 11528e7 · 11528e7
1 parent c515ff3
commit 11528e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/Mage.Server/src/main/java/mage/server/Main.java b/Mage.Server/src/main/java/mage/server/Main.java
@@ -55,7 +55,6 @@ public final class Main {
     // priority: default setting -> prop setting -> arg setting
     private static final String testModeArg = "-testMode=";
     private static final String testModeProp = "xmage.testMode";
-    private static final String fastDBModeArg = "-fastDbMode="; // TODO: outdated, must be deleted
     private static final String adminPasswordArg = "-adminPassword=";
     private static final String adminPasswordProp = "xmage.adminPassword";
     private static final String configPathProp = "xmage.config.path";
@@ -76,11 +75,6 @@ public final class Main {
     // - debug main menu for GUI and rendering testing (must use -debug arg for client app);
     private static boolean testMode;
 
-    private static boolean fastDbMode;
-
-    /**
-     * @param args the command line arguments
-     */
     public static void main(String[] args) {
         System.setProperty("java.util.Arrays.useLegacyMergeSort", "true");
         logger.info("Starting MAGE server version " + version);
@@ -112,8 +106,6 @@ public static void main(String[] args) {
             } else if (arg.startsWith(adminPasswordArg)) {
                 adminPassword = arg.replace(adminPasswordArg, "");
                 adminPassword = SystemUtil.sanitize(adminPassword);
-            } else if (arg.startsWith(fastDBModeArg)) {
-                fastDbMode = Boolean.parseBoolean(arg.replace(fastDBModeArg, ""));
             }
         }
 
@@ -169,11 +161,7 @@ public static void main(String[] args) {
         }
 
         logger.info("Loading cards...");
-        if (fastDbMode) {
-            CardScanner.scanned = true;
-        } else {
-            CardScanner.scan();
-        }
+        CardScanner.scan();
         logger.info("Done.");
 
         // cards preload with ratings

diff --git a/Mage/src/main/java/mage/cards/repository/RepositoryUtil.java b/Mage/src/main/java/mage/cards/repository/RepositoryUtil.java
@@ -29,11 +29,12 @@ public static void bootstrapLocalDb() {
         TokenRepository.instance.getAll().size();
 
         // stats
+        int totalSets = ExpansionRepository.instance.getAll().size();
         int totalCards = CardRepository.instance.findCards(new CardCriteria().nightCard(false)).size()
                 + CardRepository.instance.findCards(new CardCriteria().nightCard(true)).size();
         logger.info("Database stats:");
-        logger.info(" - sets: " + ExpansionRepository.instance.getAll().size());
-        logger.info(" - cards: " + totalCards);
+        logger.info(" - sets: " + (totalSets == 0 ? "updating" : totalSets));
+        logger.info(" - cards: " + (totalCards == 0 ? "updating" : totalCards));
         logger.info(" - tokens: " + TokenRepository.instance.getByType(TokenType.TOKEN).size());
         logger.info(" - emblems: " + TokenRepository.instance.getByType(TokenType.EMBLEM).size());
         logger.info(" - planes: " + TokenRepository.instance.getByType(TokenType.PLANE).size());