From 10f74b79792f66c3f44b54c23119467137186845 Mon Sep 17 00:00:00 2001 From: Rainnny7 Date: Sat, 27 Apr 2024 01:36:50 -0400 Subject: [PATCH] Fix date format? --- src/main/java/me/braydon/pia/PIAServerList.java | 5 ++++- .../java/me/braydon/pia/readme/ReadMeManager.java | 11 ++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/braydon/pia/PIAServerList.java b/src/main/java/me/braydon/pia/PIAServerList.java index dab31ea99..86b84de3c 100644 --- a/src/main/java/me/braydon/pia/PIAServerList.java +++ b/src/main/java/me/braydon/pia/PIAServerList.java @@ -16,7 +16,10 @@ import org.xbill.DNS.Type; import java.io.*; import java.net.URL; import java.nio.file.Files; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import java.util.concurrent.TimeUnit; /** diff --git a/src/main/java/me/braydon/pia/readme/ReadMeManager.java b/src/main/java/me/braydon/pia/readme/ReadMeManager.java index 56eb9c377..36d6c0742 100644 --- a/src/main/java/me/braydon/pia/readme/ReadMeManager.java +++ b/src/main/java/me/braydon/pia/readme/ReadMeManager.java @@ -12,14 +12,17 @@ import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.text.DecimalFormat; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; /** * @author Braydon */ public final class ReadMeManager { private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#,##0"); - private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("MMMM d yyyy h:m a"); + private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("MMMM d yyyy HH:mm z"); /** * Copy the template README.md file from the jar @@ -31,8 +34,6 @@ public final class ReadMeManager { System.out.println("Updating README.md..."); try (InputStream templateResource = ReadMeManager.class.getClassLoader().getResourceAsStream("README_TEMPLATE.md")) { assert templateResource != null; // Ensure the template is present - Calendar calendarTime = Calendar.getInstance(TimeZone.getTimeZone("America/Toronto")); - calendarTime.setTime(new Date()); // Copy the template README.md to the root directory Path localReadMe = new File("README.md").toPath(); // The local README.md file @@ -41,7 +42,7 @@ public final class ReadMeManager { // Replace variables in the README.md file String contents = new String(Files.readAllBytes(localReadMe)); contents = contents.replace("", DECIMAL_FORMAT.format(servers.size())); // Total servers variable - contents = contents.replace("", DATE_FORMAT.format(calendarTime.getTime()).replace(" ", "_")); // Total servers variable + contents = contents.replace("", DATE_FORMAT.format(new Date()).replace(" ", "_")); // Total servers variable // Write the total servers per-region table Map regionCounts = new HashMap<>();