Fascinated/PIA-Servers
1
1
Fork 0
Code Issues 1 Pull Requests Actions Activity

update logging

Browse Source
This commit is contained in:
Lee 2024-04-29 07:40:25 +01:00
parent aeec428d48
commit 88b62cc225
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/cc/fascinated/piaservers/pia/PiaManager.java
View File

@ -31,7 +31,7 @@ public class PiaManager {
public PiaManager() { public PiaManager() {
File serversFile = new File("servers.json"); File serversFile = new File("servers.json");
if (!serversFile.exists()) { if (!serversFile.exists()) {
System.out.println("servers.json does not exist, creating..."); System.out.println("The servers file doesn't exist, creating it...");
serversFile.createNewFile(); serversFile.createNewFile();
} }
// Load the serversFile from the file // Load the serversFile from the file
@ -39,7 +39,7 @@ public class PiaManager {
if (SERVERS == null) { if (SERVERS == null) {
SERVERS = new HashSet<>(); SERVERS = new HashSet<>();
} }
System.out.println("Loaded " + SERVERS.size() + " servers from the file"); System.out.printf("Loaded %s servers from the file%n", SERVERS.size());
// Set the DNS resolver to Cloudflare // Set the DNS resolver to Cloudflare
Lookup.setDefaultResolver(new SimpleResolver("1.1.1.1")); Lookup.setDefaultResolver(new SimpleResolver("1.1.1.1"));
@ -67,11 +67,8 @@ public class PiaManager {
@SneakyThrows @SneakyThrows
public static void updateServers(File serversFile) { public static void updateServers(File serversFile) {
List<PiaServer> servers = getPiaServers(); List<PiaServer> servers = getPiaServers();
System.out.println("Found " + servers.size() + " pia server tokens");
List<PiaServer> toRemove = new ArrayList<>(); List<PiaServer> toRemove = new ArrayList<>();
System.out.println("Removing old servers...");
// Get the servers that need to be removed // Get the servers that need to be removed
for (PiaServer server : SERVERS) { for (PiaServer server : SERVERS) {
if (server.getLastSeen().getTime() < System.currentTimeMillis() - REMOVAL_THRESHOLD) { if (server.getLastSeen().getTime() < System.currentTimeMillis() - REMOVAL_THRESHOLD) {
@ -79,7 +76,7 @@ public class PiaManager {
} }
} }
toRemove.forEach(SERVERS::remove); // Remove the servers toRemove.forEach(SERVERS::remove); // Remove the servers
System.out.printf("Removed %s old servers\n", toRemove.size()); System.out.printf("Removed %s servers that haven't been active in 2 weeks\n", toRemove.size());
int newServers = 0; int newServers = 0;
@ -96,11 +93,12 @@ public class PiaManager {
// Save the servers to the file // Save the servers to the file
Files.writeString(serversFile.toPath(), Main.GSON.toJson(SERVERS)); Files.writeString(serversFile.toPath(), Main.GSON.toJson(SERVERS));
System.out.printf("Wrote %s new servers to the file\n", newServers); System.out.printf("Wrote %s servers to the file (+%s new)%n", SERVERS.size(), newServers);
} }
@SneakyThrows @SneakyThrows
private static List<PiaServer> getPiaServers() { private static List<PiaServer> getPiaServers() {
long start = System.currentTimeMillis();
HttpRequest request = HttpRequest.newBuilder() HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(PIA_OPENVPN_CONFIGS_URL)) .uri(URI.create(PIA_OPENVPN_CONFIGS_URL))
.GET() .GET()
@ -111,6 +109,7 @@ public class PiaManager {
System.out.println("Failed to get the PIA OpenVPN configs, status code: " + response.statusCode()); System.out.println("Failed to get the PIA OpenVPN configs, status code: " + response.statusCode());
System.exit(1); System.exit(1);
} }
System.out.printf("Downloaded the OpenVPN configs in %sms%n", System.currentTimeMillis() - start);
Path downloadedFile = response.body(); Path downloadedFile = response.body();
File tempDir = Files.createTempDirectory("openvpn").toFile(); File tempDir = Files.createTempDirectory("openvpn").toFile();
ZipUnArchiver unArchiver = new ZipUnArchiver(); ZipUnArchiver unArchiver = new ZipUnArchiver();
@ -127,6 +126,8 @@ public class PiaManager {
System.exit(1); System.exit(1);
} }
System.out.printf("Found %s regions%n", files.length - 1);
// Search for the servers // Search for the servers
List<PiaServer> servers = new ArrayList<>(); List<PiaServer> servers = new ArrayList<>();
for (File file : files) { for (File file : files) {

2
src/main/java/cc/fascinated/piaservers/readme/ReadMeManager.java
View File

@ -19,6 +19,7 @@ public class ReadMeManager {
@SneakyThrows @SneakyThrows
public static Path updateReadme() { public static Path updateReadme() {
System.out.println("Updating README.md");
InputStream readmeStream = Main.class.getResourceAsStream("/README.md"); InputStream readmeStream = Main.class.getResourceAsStream("/README.md");
if (readmeStream == null) { if (readmeStream == null) {
System.out.println("Failed to find README.md"); System.out.println("Failed to find README.md");
@ -49,6 +50,7 @@ public class ReadMeManager {
.reduce((a, b) -> a + "\n" + b).orElse("")); // Reduce the entries to a single string .reduce((a, b) -> a + "\n" + b).orElse("")); // Reduce the entries to a single string
Files.write(readmeFile.toPath(), contents.getBytes()); Files.write(readmeFile.toPath(), contents.getBytes());
System.out.println("Finished updating README.md");
return readmeFile.toPath(); return readmeFile.toPath();
} }
} }