Scheduled update

Reviewed-on: #1

.gitea/workflows/ci.yml

@@ -0,0 +1,32 @@
+name: Deploy to Dokku
+
+on:
+  push:
+    branches: ["master"]
+    paths-ignore:
+      - .gitignore
+      - README.md
+      - LICENSE
+      - servers.json
+
+jobs:
+  docker:
+    strategy:
+      matrix:
+        arch: ["ubuntu-latest"]
+    runs-on: ${{ matrix.arch }}
+
+    # Steps to run
+    steps:
+      # Checkout the repo
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # Deploy to Dokku
+      - name: Push to dokku
+        uses: dokku/github-action@master
+        with:
+          git_remote_url: "ssh://dokku@10.0.50.65:22/pia-servers"
+          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}

.gitea/workflows/fetch-new.yml

@@ -1,52 +0,0 @@
-name: Fetch new Pia Servers
-
-on:
-  schedule:
-    - cron: "@hourly"
-  push:
-    branches: ["master"]
-    paths-ignore:
-      - .gitignore
-      - README.md
-      - LICENSE
-      - servers.json
-
-jobs:
-  docker:
-    strategy:
-      matrix:
-        arch: ["ubuntu-latest"]
-        git-version: ["2.44.0"]
-        java-version: ["17"]
-        maven-version: ["3.8.5"]
-    runs-on: ${{ matrix.arch }}
-
-    # Steps to run
-    steps:
-      # Checkout the repo
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      # Setup Java and Maven
-      - name: Set up JDK and Maven
-        uses: s4u/setup-maven-action@v1.12.0
-        with:
-          java-version: ${{ matrix.java-version }}
-          distribution: "zulu"
-          maven-version: ${{ matrix.maven-version }}
-
-      - name: Build PIA Servers
-        run: mvn clean package -T 2C -q
-
-      - name: Fetch new PIA servers
-        run: java -jar target/PIA-Servers.jar
-
-      - name: Commit and push changes
-        run: |
-          git config --global user.email "liam@fascinated.cc"
-          git config --global user.name "Liam"
-          git add servers.json
-          git add README.md
-          git commit -m "Scheduled update"
-          git push https://fascinated:${{ secrets.AUTH_TOKEN }}@git.fascinated.cc/Fascinated/PIA-Servers
-          

Dockerfile

@@ -0,0 +1,32 @@
+# Stage 1: Build the application
+FROM maven:3.9.6-eclipse-temurin-17-alpine AS builder
+
+# Set the working directory
+WORKDIR /home/container
+
+# Copy the current directory contents into the container at /home/container
+COPY . .
+
+# Build the jar
+RUN mvn package -q -Dmaven.test.skip -DskipTests -T2C
+
+# Stage 2: Create the final lightweight image
+FROM eclipse-temurin:17.0.11_9-jre-focal
+
+# Install Git
+RUN apt-get update && apt-get install -y git
+
+# Set the app to be in production mode
+ENV ENVIRONMENT=production
+
+# Set the working directory
+WORKDIR /home/container
+
+# Copy the built jar file from the builder stage
+COPY --from=builder /home/container/target/PIA-Servers.jar .
+
+# Copy the old servers.json file
+COPY --from=builder /home/container/servers.json .
+
+# Run the jar file
+CMD java -jar PIA-Servers.jar -Djava.awt.headless=true

README.md

@@ -1,106 +1,109 @@
 # PIA Server List
 
-![Servers](https://img.shields.io/badge/servers-1552-brightgreen) ![Last update](https://img.shields.io/badge/Sat_Apr_27_05:00:33_GMT_2024-brightgreen)
+![Servers](https://img.shields.io/badge/servers-18,240-blue)
+![Regions](https://img.shields.io/badge/regions-97-blue)
+![Last update](https://img.shields.io/badge/last_updated-Wed_Jul_31_17:54:31_UTC_2024-blue)
 
-This is a list of the OpenVPN servers provided by Private Internet Access (PIA). The list is updated hourly.
+This is a list of the OpenVPN servers provided by Private Internet Access (PIA). The list is updated hourly. </br>
+Servers that have not been active in the last 2 weeks will be automatically removed.
 
 ## Servers
 | Region               | Servers |
 |----------------------|---------|
-| japan | 16 |
-| albania | 16 |
-| poland | 16 |
-| us_florida | 16 |
-| andorra | 16 |
-| venezuela | 16 |
-| moldova | 16 |
-| estonia | 16 |
-| ca_vancouver | 16 |
-| sweden | 16 |
-| united_arab_emirates | 16 |
-| us_seattle | 16 |
-| saudi_arabia | 16 |
-| philippines | 16 |
-| us_las_vegas | 16 |
-| us_east | 16 |
-| de_berlin | 16 |
-| uk_manchester | 16 |
-| switzerland | 16 |
-| armenia | 16 |
-| vietnam | 16 |
-| turkey | 16 |
-| ukraine | 16 |
-| austria | 16 |
-| spain | 16 |
-| algeria | 16 |
-| portugal | 16 |
-| cambodia | 16 |
-| lithuania | 16 |
-| monaco | 16 |
-| hungary | 16 |
-| greenland | 16 |
-| panama | 16 |
-| greece | 16 |
-| us_california | 16 |
-| luxembourg | 16 |
-| mongolia | 16 |
-| us_west | 16 |
-| cyprus | 16 |
-| italy | 16 |
-| finland | 16 |
-| nigeria | 16 |
-| hong_kong | 16 |
-| singapore | 16 |
-| mexico | 16 |
-| us_denver | 16 |
-| bahamas | 16 |
-| norway | 16 |
-| au_perth | 16 |
-| bulgaria | 16 |
-| ca_toronto | 16 |
-| us_new_york | 16 |
-| uk_london | 16 |
-| macao | 16 |
-| georgia | 16 |
-| argentina | 16 |
-| liechtenstein | 16 |
-| france | 16 |
-| serbia | 16 |
-| slovakia | 16 |
-| us_chicago | 16 |
-| belgium | 16 |
-| us_washington_dc | 16 |
-| netherlands | 16 |
-| isle_of_man | 16 |
-| taiwan | 16 |
-| sri_lanka | 16 |
-| czech_republic | 16 |
-| morocco | 16 |
-| us_texas | 16 |
-| uk_southampton | 16 |
-| brazil | 16 |
-| de_frankfurt | 16 |
-| romania | 16 |
-| india | 16 |
-| us_silicon_valley | 16 |
-| au_sydney | 16 |
-| denmark | 16 |
-| au_melbourne | 16 |
-| ca_ontario | 16 |
-| latvia | 16 |
-| kazakhstan | 16 |
-| new_zealand | 16 |
-| us_houston | 16 |
-| south_africa | 16 |
-| egypt | 16 |
-| malta | 16 |
-| iceland | 16 |
-| macedonia | 16 |
-| ca_montreal | 16 |
-| montenegro | 16 |
-| qatar | 16 |
-| china | 16 |
-| israel | 16 |
-| bangladesh | 16 |
-| us_atlanta | 16 |
-| ireland | 16 |
+| ca_montreal | 816 |
+| netherlands | 811 |
+| us_texas | 708 |
+| us_chicago | 702 |
+| ca_toronto | 643 |
+| us_silicon_valley | 601 |
+| us_washington_dc | 589 |
+| us_atlanta | 565 |
+| us_west | 559 |
+| ca_vancouver | 547 |
+| us_las_vegas | 542 |
+| us_new_york | 541 |
+| us_east | 536 |
+| uk_london | 533 |
+| us_california | 526 |
+| us_florida | 496 |
+| us_seattle | 496 |
+| ca_ontario | 430 |
+| au_melbourne | 426 |
+| switzerland | 420 |
+| de_frankfurt | 417 |
+| us_houston | 384 |
+| au_sydney | 355 |
+| uk_southampton | 318 |
+| japan | 308 |
+| de_berlin | 261 |
+| us_denver | 231 |
+| uk_manchester | 224 |
+| singapore | 218 |
+| france | 202 |
+| sweden | 192 |
+| au_perth | 183 |
+| new_zealand | 183 |
+| mexico | 139 |
+| ireland | 132 |
+| romania | 120 |
+| estonia | 117 |
+| norway | 112 |
+| belgium | 102 |
+| israel | 100 |
+| spain | 99 |
+| denmark | 96 |
+| czech_republic | 94 |
+| italy | 87 |
+| finland | 84 |
+| bahamas | 78 |
+| argentina | 75 |
+| austria | 71 |
+| panama | 71 |
+| brazil | 69 |
+| poland | 64 |
+| luxembourg | 62 |
+| latvia | 60 |
+| ukraine | 59 |
+| india | 59 |
+| lithuania | 56 |
+| greenland | 56 |
+| turkey | 52 |
+| slovakia | 52 |
+| andorra | 48 |
+| vietnam | 46 |
+| taiwan | 46 |
+| venezuela | 45 |
+| greece | 45 |
+| portugal | 43 |
+| united_arab_emirates | 38 |
+| china | 38 |
+| malta | 37 |
+| albania | 36 |
+| philippines | 36 |
+| algeria | 36 |
+| qatar | 33 |
+| bangladesh | 31 |
+| hungary | 30 |
+| liechtenstein | 29 |
+| isle_of_man | 29 |
+| saudi_arabia | 28 |
+| bulgaria | 28 |
+| south_africa | 28 |
+| macao | 26 |
+| montenegro | 26 |
+| nigeria | 25 |
+| moldova | 24 |
+| cambodia | 24 |
+| cyprus | 24 |
+| morocco | 24 |
+| egypt | 24 |
+| iceland | 24 |
+| kazakhstan | 23 |
+| macedonia | 23 |
+| monaco | 22 |
+| georgia | 22 |
+| hong_kong | 20 |
+| serbia | 15 |
+| armenia | 12 |
+| mongolia | 12 |
+| sri_lanka | 11 |

pom.xml

@@ -68,6 +68,15 @@
         </plugins>
     </build>
 
+    <!-- Repos -->
+    <repositories>
+        <!-- Jitpack - Used for dnsjava -->
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <!-- Libraries -->
         <dependency>
@@ -83,6 +92,14 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- DNS -->
+        <dependency>
+            <groupId>com.github.dnsjava</groupId>
+            <artifactId>dnsjava</artifactId>
+            <version>v3.5.2</version>
+            <scope>compile</scope>
+        </dependency>
+
         <!-- Archive Utilities -->
         <dependency>
             <groupId>org.codehaus.plexus</groupId>

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>Fascinated/renovate-config"
+  ]
+}

src/main/java/cc/fascinated/piaservers/Main.java

@@ -1,7 +1,6 @@
 package cc.fascinated.piaservers;
 
 import cc.fascinated.piaservers.pia.PiaManager;
-import cc.fascinated.piaservers.readme.ReadMeManager;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import lombok.SneakyThrows;
@@ -14,6 +13,5 @@ public class Main {
     @SneakyThrows
     public static void main(String[] args) {
         new PiaManager();
-        new ReadMeManager();
     }
 }

src/main/java/cc/fascinated/piaservers/common/Config.java

@@ -0,0 +1,13 @@
+package cc.fascinated.piaservers.common;
+
+public class Config {
+
+    /**
+     * Are we in production?
+     *
+     * @return If we are in production
+     */
+    public static boolean isProduction() {
+        return System.getenv().containsKey("ENVIRONMENT") && System.getenv("ENVIRONMENT").equals("production");
+    }
+}

src/main/java/cc/fascinated/piaservers/common/GitUtils.java

@@ -0,0 +1,55 @@
+package cc.fascinated.piaservers.common;
+
+import java.nio.file.Path;
+
+public class GitUtils {
+
+    /**
+     * Commit files to git
+     *
+     * @param message The commit message
+     * @param files The files to commit
+     */
+    public static void commitFiles(String message, Path... files) {
+        System.out.println("Committing files");
+        if (Config.isProduction()) {
+            runCommand("git", "config", "--global", "user.email", "fascinated-helper@fascinated.cc");
+            runCommand("git", "config", "--global", "user.name", "Fascinated's Helper");
+            for (Path file : files) {
+                runCommand("git", "add", file.toAbsolutePath().toString());
+            }
+            runCommand("git", "commit", "-m", message);
+            runCommand("git", "push", "https://fascinated-helper:%s@git.fascinated.cc/Fascinated/PIA-Servers".formatted(System.getenv("AUTH_TOKEN")));
+        }
+    }
+
+    /**
+     * Clone the repository
+     */
+    public static void cloneRepo() {
+        if (Config.isProduction()) {
+            System.out.println("Cloning repository");
+            runCommand("git", "clone", "https://git.fascinated.cc/Fascinated/PIA-Servers.git");
+            runCommand("mv", "PIA-Servers/.git", ".");
+            runCommand("rm", "-rf", "PIA-Servers");
+            runCommand("git", "pull"); // Pull the latest changes
+        }
+    }
+
+    /**
+     * Run a system command
+     *
+     * @param args The command to run (with arguments)
+     */
+    private static void runCommand(String... args) {
+        ProcessBuilder processBuilder = new ProcessBuilder(args);
+        processBuilder.redirectOutput(ProcessBuilder.Redirect.INHERIT);
+        processBuilder.redirectError(ProcessBuilder.Redirect.INHERIT);
+        try {
+            Process process = processBuilder.start();
+            process.waitFor();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+}

src/main/java/cc/fascinated/piaservers/model/PiaServer.java

@@ -1,15 +1,19 @@
 package cc.fascinated.piaservers.model;
 
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
-@AllArgsConstructor @Getter
+@AllArgsConstructor @Getter @Setter
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class PiaServer {
     /**
      * The IP of this server.
      */
+    @EqualsAndHashCode.Include
     private final String ip;
 
     /**

src/main/java/cc/fascinated/piaservers/model/PiaServerToken.java

@@ -1,17 +0,0 @@
-package cc.fascinated.piaservers.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor @Getter
-public class PiaServerToken {
-    /**
-     * The hostname for this server.
-     */
-    private final String hostname;
-
-    /**
-     * The region this server is in.
-     */
-    private final String region;
-}

src/main/java/cc/fascinated/piaservers/pia/PiaManager.java

@@ -1,124 +1,142 @@
 package cc.fascinated.piaservers.pia;
 
 import cc.fascinated.piaservers.Main;
+import cc.fascinated.piaservers.common.GitUtils;
 import cc.fascinated.piaservers.model.PiaServer;
-import cc.fascinated.piaservers.model.PiaServerToken;
+import cc.fascinated.piaservers.readme.ReadMeManager;
 import com.google.gson.reflect.TypeToken;
 import lombok.SneakyThrows;
 import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
+import org.xbill.DNS.Record;
+import org.xbill.DNS.*;
 
 import java.io.File;
-import java.net.InetAddress;
+import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 public class PiaManager {
-
     private static final HttpClient HTTP_CLIENT = HttpClient.newHttpClient();
     private static final String PIA_OPENVPN_CONFIGS_URL = "https://www.privateinternetaccess.com/openvpn/openvpn.zip";
     private static final long REMOVAL_THRESHOLD = TimeUnit.DAYS.toMicros(14); // 2 weeks
-    public static List<PiaServer> SERVERS = new ArrayList<>();
+    public static Set<PiaServer> SERVERS = new HashSet<>();
+    private static Path README_PATH;
 
     @SneakyThrows
     public PiaManager() {
         File serversFile = new File("servers.json");
         if (!serversFile.exists()) {
-            System.out.println("serversFile.json does not exist, creating...");
+            System.out.println("The servers file doesn't exist, creating it...");
             serversFile.createNewFile();
         }
-
-        List<PiaServerToken> piaDomain = getPiaDomains();
-        System.out.println("Found " + piaDomain.size() + " pia domains");
-
         // Load the serversFile from the file
-        SERVERS = Main.GSON.fromJson(Files.readString(serversFile.toPath()), new TypeToken<List<PiaServer>>() {}.getType());
+        SERVERS = Main.GSON.fromJson(Files.readString(serversFile.toPath()), new TypeToken<Set<PiaServer>>() {}.getType());
         if (SERVERS == null) {
-            SERVERS = new ArrayList<>();
+            SERVERS = new HashSet<>();
         }
-        List<PiaServer> toRemove = new ArrayList<>();
+        System.out.printf("Loaded %s servers from the file%n", SERVERS.size());
 
-        System.out.println("Removing old servers...");
-        // Get the servers that need to be removed
-        for (PiaServer server : SERVERS) {
-            if (server.getLastSeen().getTime() < System.currentTimeMillis() - REMOVAL_THRESHOLD) {
-                toRemove.add(server);
+        // Set the DNS resolver to Cloudflare
+        Lookup.setDefaultResolver(new SimpleResolver("1.1.1.1"));
+
+        GitUtils.cloneRepo(); // Clone the repository
+
+        // Update the servers every 5 minutes
+        new Timer().scheduleAtFixedRate(new TimerTask() {
+            @Override
+            public void run() {
+                updateServers(serversFile); // Update the servers
+                README_PATH = ReadMeManager.updateReadme(); // Update the README.md
             }
-        }
-        SERVERS.removeAll(toRemove); // Remove the servers
-        System.out.printf("Removed %s old servers\n", toRemove.size());
+        }, 0, TimeUnit.MINUTES.toMillis(5));
+
+        // Commit the files every hour
+        new Timer().scheduleAtFixedRate(new TimerTask() {
+            @Override
+            public void run() {
+                GitUtils.commitFiles("Scheduled update", serversFile.toPath(), README_PATH); // Commit the files
+            }
+        }, TimeUnit.MINUTES.toMillis(3), TimeUnit.HOURS.toMillis(1));
+    }
+
+    @SneakyThrows
+    public static void updateServers(File serversFile) {
+        List<PiaServer> servers = getPiaServers();
+
+        // Remove the servers that haven't been active in 2 weeks
+        int before = SERVERS.size();
+        SERVERS.removeIf(server -> System.currentTimeMillis() - server.getLastSeen().getTime() > REMOVAL_THRESHOLD);
+        System.out.printf("Removed %s servers that haven't been active in 2 weeks%n", before - SERVERS.size());
 
         // Add the new servers to the list
-        for (PiaServerToken serverToken : piaDomain) {
-            InetAddress address = InetAddress.getByName(serverToken.getHostname());
+        int newServers = 0;
+        for (PiaServer piaServer : servers) {
+            boolean newServer = SERVERS.stream().noneMatch(server -> server.getIp().equals(piaServer.getIp()));
+            if (newServer) {
+                newServers++;
+            }
 
             // Add the server to the list
-            SERVERS.add(new PiaServer(address.getHostAddress(), serverToken.getRegion(), new Date()));
+            SERVERS.add(piaServer);
         }
 
         // Save the servers to the file
         Files.writeString(serversFile.toPath(), Main.GSON.toJson(SERVERS));
-        System.out.printf("Wrote %s servers to the file\n", SERVERS.size());
+        System.out.printf("Wrote %s servers to the file (+%s new)%n", SERVERS.size(), newServers);
     }
 
     @SneakyThrows
-    private static List<PiaServerToken> getPiaDomains() {
+    private static List<PiaServer> getPiaServers() {
+        long start = System.currentTimeMillis();
         HttpRequest request = HttpRequest.newBuilder()
                 .uri(URI.create(PIA_OPENVPN_CONFIGS_URL))
                 .GET()
                 .build();
-        // Send the request and get the response
         HttpResponse<Path> response = HTTP_CLIENT.send(request, HttpResponse.BodyHandlers.ofFile(Files.createTempFile("openvpn", ".zip")));
         if (response.statusCode() != 200) {
-            System.out.println("Failed to get the PIA OpenVPN configs, status code: " + response.statusCode());
-            System.exit(1);
+            throw new IOException("Failed to get the PIA OpenVPN configs, status code: " + response.statusCode());
         }
+        System.out.printf("Downloaded the OpenVPN configs in %sms%n", System.currentTimeMillis() - start);
         Path downloadedFile = response.body();
         File tempDir = Files.createTempDirectory("openvpn").toFile();
         ZipUnArchiver unArchiver = new ZipUnArchiver();
-
-        // Extract the downloaded file
         unArchiver.setSourceFile(downloadedFile.toFile());
         unArchiver.setDestDirectory(tempDir);
         unArchiver.extract();
 
-        // Get the extracted files
         File[] files = tempDir.listFiles();
         if (files == null || files.length == 0) {
-            System.out.println("Failed to extract the OpenVPN configs");
-            System.exit(1);
+            throw new IOException("Failed to extract the OpenVPN configs");
         }
 
-        // Search for the server domains
-        List<PiaServerToken> domains = new ArrayList<>();
+        List<PiaServer> servers = new ArrayList<>();
         for (File file : files) {
-            if (file.isDirectory()) {
+            if (file.isDirectory() || !file.getName().endsWith(".ovpn")) {
                 continue;
             }
-            if (!file.getName().endsWith(".ovpn")) {
-                continue;
-            }
-            // Read the file and get the server domain
             List<String> lines = Files.readAllLines(file.toPath());
             for (String line : lines) {
                 if (line.startsWith("remote ")) {
                     String[] parts = line.split(" ");
-                    String domain = parts[1];
+                    String hostname = parts[1];
                     String region = file.getName().split("\\.")[0];
-
-                    domains.add(new PiaServerToken(domain, region));
+                    Record[] records = new Lookup(hostname, Type.A).run();
+                    if (records != null) {
+                        for (Record record : records) {
+                            ARecord aRecord = (ARecord) record;
+                            servers.add(new PiaServer(aRecord.getAddress().getHostAddress(), region, new Date()));
+                        }
+                    }
                     break;
                 }
             }
         }
-
-        return domains;
+        return servers;
     }
 }

src/main/java/cc/fascinated/piaservers/readme/ReadMeManager.java

@@ -5,24 +5,25 @@ import cc.fascinated.piaservers.model.PiaServer;
 import cc.fascinated.piaservers.pia.PiaManager;
 import lombok.SneakyThrows;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
 import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
+import java.nio.file.Path;
+import java.text.DecimalFormat;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class ReadMeManager {
+    private static final DecimalFormat decimalFormat = new DecimalFormat("#,###");
 
     @SneakyThrows
-    public ReadMeManager() {
+    public static Path updateReadme() {
+        System.out.println("Updating README.md");
         InputStream readmeStream = Main.class.getResourceAsStream("/README.md");
         if (readmeStream == null) {
             System.out.println("Failed to find README.md");
-            return;
+            return null;
         }
         File readmeFile = new File("README.md");
         if (!readmeFile.exists()) { // Create the file if it doesn't exist
@@ -31,20 +32,25 @@ public class ReadMeManager {
         // Get the contents of the README.md
         String contents = new String(readmeStream.readAllBytes());
 
-        // Replace the placeholders in the README.md file
-        contents = contents.replace("{server_count}", String.valueOf(PiaManager.SERVERS.size()));
-        contents = contents.replace("{last_update}", new Date().toString().replaceAll(" ", "_"));
-
-        // Write total servers per-region
         Map<String, Integer> regionCounts = new HashMap<>();
         for (PiaServer server : PiaManager.SERVERS) {
             String region = server.getRegion();
             regionCounts.put(region, regionCounts.getOrDefault(region, 0) + 1);
         }
+
+        // Replace the placeholders in the README.md file
+        contents = contents.replace("{server_count}", decimalFormat.format(PiaManager.SERVERS.size()));
+        contents = contents.replace("{last_update}", new Date().toString().replaceAll(" ", "_"));
+        contents = contents.replace("{region_count}", decimalFormat.format(regionCounts.size()));
+
+        // Write total servers per-region
         contents = contents.replace("{server_table}", regionCounts.entrySet().stream()
+                .sorted((a, b) -> Integer.compare(b.getValue(), a.getValue())) // Sort from highest to lowest
                 .map(entry -> "| " + entry.getKey() + " | " + entry.getValue() + " |") // Map the region to the count
                 .reduce((a, b) -> a + "\n" + b).orElse("")); // Reduce the entries to a single string
 
         Files.write(readmeFile.toPath(), contents.getBytes());
+        System.out.println("Finished updating README.md");
+        return readmeFile.toPath();
     }
 }

src/main/resources/README.md

@@ -1,8 +1,11 @@
 # PIA Server List
 
-![Servers](https://img.shields.io/badge/servers-{server_count}-brightgreen) ![Last update](https://img.shields.io/badge/{last_update}-brightgreen)
+![Servers](https://img.shields.io/badge/servers-{server_count}-blue)
+![Regions](https://img.shields.io/badge/regions-{region_count}-blue)
+![Last update](https://img.shields.io/badge/last_updated-{last_update}-blue)
 
-This is a list of the OpenVPN servers provided by Private Internet Access (PIA). The list is updated hourly.
+This is a list of the OpenVPN servers provided by Private Internet Access (PIA). The list is updated hourly. </br>
+Servers that have not been active in the last 2 weeks will be automatically removed.
 
 ## Servers
 | Region               | Servers |