Accept Steam profile URLs as player IDs

Author: joelamos

src/com/joelchristophel/sourceradio/FileUtilities.java

@@ -4,6 +4,9 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
@@ -171,10 +174,38 @@ static boolean removeLine(String path, String line, boolean commentAware) throws
 		return hasLine;
 	}
 
+	static void writeFile(String path, String text) throws IOException {
+		File file = new File(path);
+		file.delete();
+		Files.write(Paths.get(path), text.getBytes(), StandardOpenOption.CREATE);
+		FileUtilities.trimFile(path);
+	}
+	
+	static void writeFile(String path, String[] lines) throws IOException {
+		String text = "";
+		for (int i = 0; i < lines.length; i++) {
+			text += lines[i] + (i == lines.length - 1 ? "" : System.lineSeparator());
+		}
+		writeFile(path, text);
+	}
+	
 	static String normalizeDirectoryPath(String path) {
 		if (path != null && !path.endsWith(File.separator)) {
 			path += File.separator;
 		}
 		return path;
 	}
+
+	static String getHtml(String url) throws Exception {
+		StringBuilder result = new StringBuilder();
+		HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection();
+		conn.setRequestMethod("GET");
+		BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+		String line;
+		while ((line = reader.readLine()) != null) {
+			result.append(line);
+		}
+		reader.close();
+		return result.toString();
+	}
 }

src/com/joelchristophel/sourceradio/Player.java

@@ -2,6 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 class Player {
 
@@ -10,7 +12,7 @@ class Player {
 	private static List<Player> players = new ArrayList<Player>();
 
 	private Player(String steamId, String username) {
-		steamId3 = toSteamId3(steamId);
+		steamId3 = asSteamId3(steamId);
 		this.username = username == null ? null : username.trim();
 	}
 
@@ -36,7 +38,7 @@ static Player getPlayerFromUsername(String username, boolean caseSensitive) {
 	}
 
 	static Player getPlayerFromSteamId(String steamId) {
-		String steamId3 = toSteamId3(steamId);
+		String steamId3 = asSteamId3(steamId);
 		Player matchingPlayer = null;
 		for (Player player : players) {
 			if (player.getSteamId3() != null && player.getSteamId3().equals(steamId3)) {
@@ -52,7 +54,7 @@ static Player getPlayerFromSteamId(String steamId) {
 	}
 
 	static boolean addPlayer(String steamId, String username) {
-		String steamId3 = toSteamId3(steamId);
+		String steamId3 = asSteamId3(steamId);
 		username = username.trim();
 		int playersBefore = players.size();
 		if (steamId3 == null) {
@@ -112,7 +114,7 @@ static void changeUsername(String oldUsername, String newUsername) {
 		}
 	}
 
-	private static String toSteamId3(String steamId) {
+	static String asSteamId3(String steamId) {
 		String steamId3 = steamId;
 		if (steamId != null) {
 			String[] chunks = steamId.split(":");
@@ -131,6 +133,29 @@ private static String toSteamId3(String steamId) {
 		return steamId3;
 	}
 
+	static String getSteamId3FromProfile(String profileId) throws Exception {
+		String steamId3 = null;
+		if (profileId != null) {
+			String html = FileUtilities.getHtml("https://steamrep.com/search?q=" + profileId);
+			String needle = "steam3ID:";
+			int needlePosition = html.indexOf(needle);
+			if (needlePosition != -1) {
+				steamId3 = html.substring(needlePosition + needle.length(), html.indexOf('|', needlePosition)).trim();
+			}
+		}
+		return steamId3;
+	}
+
+	static String getSteamProfileId(String profileUrl) {
+		String profileId = null;
+		Pattern pattern = Pattern.compile("^(?:http(?:s?):\\/\\/)?(?:www\\.)?steamcommunity\\.com\\/(?:profiles|id)\\/(.+)$");
+		Matcher matcher = pattern.matcher(profileUrl);
+		if (matcher.find()) {
+			profileId = matcher.group(1);
+		}
+		return profileId;
+	}
+	
 	String getSteamId3() {
 		return steamId3;
 	}

src/com/joelchristophel/sourceradio/Playlist.java

@@ -1044,18 +1044,9 @@ private static String normalizeQuery(String query) {
 	}
 
 	static String getLatestVersion(String githubUser, String repository) throws Exception {
-		StringBuilder result = new StringBuilder();
-		URL url = new URL("https://github.com/" + githubUser + "/" + repository + "/releases/latest");
-		HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-		conn.setRequestMethod("GET");
-		BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-		String line;
-		while ((line = reader.readLine()) != null) {
-			result.append(line);
-		}
-		reader.close();
+		String url = "https://github.com/" + githubUser + "/" + repository + "/releases/latest";
+		String html = FileUtilities.getHtml(url);
 		String needle = repository + "/tree/";
-		String html = result.toString();
 		int needlePosition = html.indexOf(needle);
 		String version = html.substring(needlePosition + needle.length(), html.indexOf('"', needlePosition));
 		return version.charAt(0) == 'v' ? version.substring(1) : version;

src/com/joelchristophel/sourceradio/Properties.java

@@ -166,15 +166,10 @@ private File getUserDirectory(String steamPath) {
 	Set<Player> getAdmins() {
 		Set<Player> admins = new HashSet<Player>();
 		try {
-			for (String steamId : FileUtilities.getLines(ADMINS_PATH, false)) {
-				if (steamId.matches("[0-9]+(\\s*//.*)?")) {
-					admins.add(Player.getPlayerFromSteamId(steamId.split("\\s*//")[0]));
-				}
-			}
+			admins = getPlayers(ADMINS_PATH);
 		} catch (IOException e) {
-			new IOException("Error: Failed to read the admins list at " + ADMINS_PATH + ".", e).printStackTrace();
+			new IOException("Error: Failed to read the admins list from " + ADMINS_PATH + ".", e).printStackTrace();
 		}
-		admins.add(getOwner());
 		return admins;
 	}
 
@@ -186,17 +181,46 @@ Set<Player> getAdmins() {
 	Set<Player> getBannedPlayers() {
 		Set<Player> bannedPlayers = new HashSet<Player>();
 		try {
-			for (String line : FileUtilities.getLines(BANNED_PLAYERS_PATH, false)) {
-				if (line.matches("[0-9]+(\\s*//.*)?")) {
-					bannedPlayers.add(Player.getPlayerFromSteamId(line.split("\\s*//")[0]));
-				}
-			}
+			bannedPlayers = getPlayers(BANNED_PLAYERS_PATH);
 		} catch (IOException e) {
-			new IOException("Error: Failed to read the banned players list from " + BANNED_PLAYERS_PATH + ".", e);
+			String message = "Error: Failed to read the banned players list from " + BANNED_PLAYERS_PATH + ".";
+			new IOException(message, e).printStackTrace();
 		}
 		return bannedPlayers;
 	}
 
+	private Set<Player> getPlayers(String path) throws IOException {
+		Set<Player> players = new HashSet<Player>();
+		boolean rewriteFile = false;
+		String[] lines = FileUtilities.getLines(path, false);
+		for (int i = 0; i < lines.length; i++) {
+			lines[i] = lines[i].replaceAll("http(?:s?)://", "").trim();
+			String steamId = lines[i].split("\\s*//")[0];
+			String profileId = Player.getSteamProfileId(steamId); // if line is a profile URL
+			try {
+				if (profileId != null) {
+					rewriteFile = true;
+					int commentPosition = lines[i].indexOf("//");
+					String comment = commentPosition == -1 ? steamId : lines[i].split("//")[1].trim();
+					if (lines[i].contains("profiles")) {
+						steamId = profileId;
+					} else {
+						steamId = Player.getSteamId3FromProfile(profileId);
+					}
+					lines[i] = steamId + " // " + comment;
+				}
+				players.add(Player.getPlayerFromSteamId(steamId));
+			} catch (Exception e) {
+				String message = "Error: Failed while converting Steam profile URL to SteamID.";
+				new Exception(message, e).printStackTrace();
+			}
+		}
+		if (rewriteFile) {
+			FileUtilities.writeFile(path, lines);
+		}
+		return players;
+	}
+
 	Set<String> getBlockedSongs() {
 		Set<String> blockedSongs = new HashSet<String>();
 		try {
@@ -256,10 +280,7 @@ void writeProperty(String property, String value) {
 				if (!foundProperty) {
 					fileText += property + DELIMITER + " " + value + System.lineSeparator();
 				}
-				File file = new File(PROPERTIES_PATH);
-				file.delete();
-				Files.write(Paths.get(PROPERTIES_PATH), fileText.getBytes(), StandardOpenOption.CREATE);
-				FileUtilities.trimFile(PROPERTIES_PATH);
+				FileUtilities.writeFile(PROPERTIES_PATH, fileText);
 			} catch (IOException e) {
 				String message = "Error: Failed to write \"" + property + "\" property to " + PROPERTIES_PATH + ".";
 				new IOException(message, e).printStackTrace();
@@ -400,10 +421,7 @@ private void updateAndSyncProperties(Map<String, String> newProperties) {
 				fileText += propertyNames[i] + DELIMITER + " " + properties.get(propertyNames[i]) + seperator;
 			}
 			try {
-				File file = new File(PROPERTIES_PATH);
-				file.delete();
-				Files.write(Paths.get(PROPERTIES_PATH), fileText.getBytes(), StandardOpenOption.CREATE);
-				FileUtilities.trimFile(PROPERTIES_PATH);
+				FileUtilities.writeFile(PROPERTIES_PATH, fileText);
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
@@ -434,8 +452,8 @@ private Map<String, String> readProperties(String path, String[] propertiesToRea
 				for (String property : properties.keySet()) {
 					if (line.toLowerCase().startsWith(property + DELIMITER)) {
 						if (propertiesRead.contains(property)) {
-							throw new IOException("The property \"" + property
-									+ "\" is listed more than once in \"" + filename + "\".");
+							throw new IOException("The property \"" + property + "\" is listed more than once in \""
+									+ filename + "\".");
 						}
 						if (line.matches(".*//.*")) {
 							line = line.replaceAll("\\s*//.*", "");