Update wordle.db

src/Game.java

@@ -1,6 +1,5 @@
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
-import java.util.Iterator;
 
 public class Game {
 
@@ -38,6 +37,8 @@ public class Game {
 		this.ip = pClientIP;
 		this.port = pClientPort;
 
+		words = new String[5];
+
 		send("+OK Hello there");
 	}
 
@@ -46,9 +47,11 @@ public class Game {
 		msg = msg.toLowerCase().trim();
 
 		if (msg.equals("quit")) {
+			if (user != null) {
+				saveGame();
+			}
 			send("+OK bye");
 			wordleServer.closeConnection(ip, port);
-			System.exit(0); // TODO remove: Einfacher zum testen
 		}
 
 		switch (phase) {
@@ -108,7 +111,11 @@ public class Game {
 			if (result != null && result.getData().length > 0) {
 				wordle = result.getData()[0][0].toLowerCase();
 				phase = GAME_PHASE;
-				send("+OK game ready");
+				if (user != null) {
+					loadGame();
+				} else {
+					send("+OK game ready");
+				}
 			} else {
 				send("-ERR fatal error: WOTD could not be generated.");
 			}
@@ -118,14 +125,15 @@ public class Game {
 			if (user == null) {
 				send("-ERR not logged in.");
 			} else {
-				databaseConnector.executeStatement("SELECT word FROM words WHERE id = " + (int) (Math.random() * 950));
+				databaseConnector
+						.executeStatement("SELECT lastFinishedWotdDay FROM User WHERE name = '" + user.getName() + "'");
 				QueryResult result = databaseConnector.getCurrentQueryResult();
 				if (result != null && result.getData().length > 0) {
-					wordle = result.getData()[0][0].toLowerCase();
-					phase = GAME_PHASE;
-					send("+OK game ready");
-				} else {
-					send("-ERR fatal error: Wordle could not be generated.");
+					if (result.getData()[0][0] != null && Integer.parseInt(result.getData()[0][0]) == currentDay()) {
+						playRandomWordle();
+					} else {
+						send("-ERR WOTD not finished.");
+					}
 				}
 			}
 		} else {
@@ -146,40 +154,43 @@ public class Game {
 				if (result.getData().length > 0) {
 
 					String input = result.getData()[0][0].toLowerCase();
-					String code = "";
+					String code = generateCode(input);
 
-					outer: for (int i = 0; i < input.length(); i++) {
-						char c = input.charAt(i);
-						if (c == wordle.charAt(i)) {
-							code += "2";
-						} else {
-							for (int j = 0; j < wordle.length(); j++) {
-								if (c == wordle.charAt(j)) {
-									code += "1";
-									continue outer;
-								}
-							}
-							code += "0";
-						}
-					}
-
-					send(code);
+					send("+OK " + code);
 					if (code.equals("22222")) { // und ein wordle ist 5 Buchstaben lang :D
 						send("game won");
+						wordle = null;
 						if (user != null) {
+							setLastPlayedTimestamp();
+							user.increaseCurrentStreak();
+							if (user.getMaxStreak() < user.getCurrentStreak()) {
+								user.setMaxStreak(user.getCurrentStreak());
+							}
+							user.increaseWonInTurn(count + 1);
+							updateStats();
 							phase = END_PHASE;
 						} else {
 							phase = LOGIN_PHASE;
 						}
-					} else if (count == 6) {
+						count = 0;
+						clearWords();
+					} else if (count == 5) {
 						send("game lost");
+						wordle = null;
 						if (user != null) {
+							setLastPlayedTimestamp();
+							user.setCurrentStreak(0);
+							updateStats();
 							phase = END_PHASE;
 						} else {
 							phase = LOGIN_PHASE;
 						}
+						count = 0;
+						clearWords();
 					} else {
+						words[count] = input;
 						send("game continues");
+						count++;
 					}
 
 				} else {
@@ -192,10 +203,44 @@ public class Game {
 
 		} else if (msg.startsWith("info")) {
 
+			if (msg.length() == 4) {
+				send("+OK");
+				for (int i = 0; i < words.length; i++) {
+					if (words[i] == null) {
+						break;
+					}
+					send(words[i] + " " + generateCode(words[i]));
+				}
+				send(".");
+			} else if (msg.length() == 6) {
+				
+				String rawLine = msg.substring(5);
+				int line = -1;
+				try {
+					line = Integer.parseInt(rawLine) - 1;
+				} catch (NumberFormatException e) {
+					send("-ERR wrong argument.");
+				}
+				if (line >= 0 && line < 5) {
+					if (words[line] != null) {
+						send("+OK " + words[line] + " " + generateCode(words[line]));
+					} else {
+						send("-ERR game hasn't progressed to this line yet.");
+					}
+				} else {
+					send("-ERR couldn't parse line.");
+				}
+				
+			} else {
+				sendUniversalError();
+			}
+			
 		} else if (msg.startsWith("exit")) {
 
 			if (user != null) {
+				saveGame();
 				phase = END_PHASE;
+				send("+OK");
 			} else {
 				send("-ERR not logged in.");
 			}
@@ -208,51 +253,121 @@ public class Game {
 	private void endPhase(String msg) {
 
 		if (msg.startsWith("stat")) {
+			send("+OK");
 
-			databaseConnector.executeStatement("SELECT timesPlayed FROM User Where name like " + tempLoginName + "");
-			String tP = databaseConnector.getCurrentQueryResult().getData()[0][0];
-			send("times Played: " + tP);
+			send("times Played: " + user.getTimesPlayed());
 
-			databaseConnector.executeStatement("SELECT winPercentage FROM User Where name like " + tempLoginName + "");
-			String wP = databaseConnector.getCurrentQueryResult().getData()[0][0];
-			send("win Percentage: " + wP);
+			send("win Percentage: " + (int) user.getWinPercentage() + "%");
 
-			databaseConnector.executeStatement("SELECT currentStreak FROM User Where name like " + tempLoginName + "");
-			String cS = databaseConnector.getCurrentQueryResult().getData()[0][0];
-			send("current Streak: " + cS);
+			send("current Streak: " + user.getCurrentStreak());
 
-			databaseConnector.executeStatement("SELECT maxStreak FROM User Where name like " + tempLoginName + "");
-			String mS = databaseConnector.getCurrentQueryResult().getData()[0][0];
-			send("max Streak: " + mS);
+			send("max Streak: " + user.getMaxStreak());
 
-			databaseConnector.executeStatement("SELECT wonInTurn1 FROM User Where name like " + tempLoginName + "");
-			String wIT1 = databaseConnector.getCurrentQueryResult().getData()[0][0];
-			send("won in Turn1: " + wIT1);
-
-			databaseConnector.executeStatement("SELECT wonInTurn1 FROM User Where name like " + tempLoginName + "");
-			String wIT2 = databaseConnector.getCurrentQueryResult().getData()[0][0];
-			send("won in Turn2: " + wIT2);
-
-			databaseConnector.executeStatement("SELECT wonInTurn1 FROM User Where name like " + tempLoginName + "");
-			String wIT3 = databaseConnector.getCurrentQueryResult().getData()[0][0];
-			send("won in Turn3: " + wIT3);
-
-			databaseConnector.executeStatement("SELECT wonInTurn1 FROM User Where name like " + tempLoginName + "");
-			String wIT4 = databaseConnector.getCurrentQueryResult().getData()[0][0];
-			send("won in Turn4: " + wIT4);
-
-			databaseConnector.executeStatement("SELECT wonInTurn1 FROM User Where name like " + tempLoginName + "");
-			String wIT5 = databaseConnector.getCurrentQueryResult().getData()[0][0];
-			send("won in Turn5: " + wIT5);
-
-			databaseConnector.executeStatement("SELECT wonInTurn1 FROM User Where name like " + tempLoginName + "");
-			String wIT6 = databaseConnector.getCurrentQueryResult().getData()[0][0];
-			send("won in Turn6: " + wIT6);
+			for (int i = 1; i <= 6; i++) {
+				send("won in Turn" + i + ": " + user.getWonInTurn(i));
+			}
+			
+			send(".");
 
 		} else if (msg.startsWith("play")) {
+			if (wordle == null) {
+				playRandomWordle();
+			} else {
+				loadGame();
+				phase = GAME_PHASE;
+			}
+		} else {
+			sendUniversalError();
+		}
+	}
 
+	private void saveGame() {
+		databaseConnector.executeStatement("SELECT * FROM Spielstand WHERE Username LIKE '" + user.getName() + "'");
+		QueryResult result = databaseConnector.getCurrentQueryResult();
+		if (result == null || result.getData().length == 0) {
+			databaseConnector.executeStatement("INSERT INTO Spielstand (Username) VALUES('" + user.getName() + "')");
+		}
+		for (int i = 0; i < words.length; i++) {
+			databaseConnector.executeStatement("UPDATE Spielstand SET word" + (i + 1) + " = '" + words[i]
+					+ "' WHERE Username LIKE '" + user.getName() + "'");
+		}
+	}
+
+	private void loadGame() {
+
+		databaseConnector.executeStatement("SELECT * FROM Spielstand WHERE Username = '" + user.getName() + "'");
+		QueryResult result = databaseConnector.getCurrentQueryResult();
+		if (result != null && result.getData().length > 0 && !result.getData()[0][0].equals("null")) {
+			boolean foundEnd = false;
+			for (int i = 0; i < 5; i++) {
+				if (!result.getData()[0][i].equals("null")) {
+					words[i] = result.getData()[0][i];
+				} else if (!foundEnd) {
+					count = i;
+					foundEnd = true;
+				}
+			}
+			send("+OK game running");
+		} else {
+			send("+OK game ready");
+		}
+	}
+
+	private void setLastPlayedTimestamp() {
+		databaseConnector.executeStatement(
+				"UPDATE User SET lastFinishedWotdDay = " + currentDay() + " WHERE name LIKE '" + user.getName() + "'");
+	}
+
+	private void clearWords() {
+
+		for (int i = 0; i < words.length; i++) {
+			words[i] = null;
+		}
+	}
+
+	private String generateCode(String input) {
+
+		String code = "";
+		outer: for (int i = 0; i < input.length(); i++) {
+			char c = input.charAt(i);
+			if (c == wordle.charAt(i)) {
+				code += "2";
+			} else {
+				for (int j = 0; j < wordle.length(); j++) {
+					if (c == wordle.charAt(j)) {
+						code += "1";
+						continue outer;
+					}
+				}
+				code += "0";
+			}
+		}
+		return code;
+	}
+
+	private void updateStats() {
+
+		user.increaseTimesPlayed();
+
+		int totalWins = 0;
+		for (int i = 1; i <= 6; i++) {
+			totalWins += user.getWonInTurn(i);
+		}
+		float winP = (float) totalWins / user.getTimesPlayed();
+
+		user.setWinPercentage(Math.round(winP * 100));
+	}
+
+	private void playRandomWordle() {
+
+		databaseConnector.executeStatement("SELECT word FROM words WHERE id = " + (int) (Math.random() * 950));
+		QueryResult result = databaseConnector.getCurrentQueryResult();
+		if (result != null && result.getData().length > 0) {
+			wordle = result.getData()[0][0].toLowerCase();
 			phase = GAME_PHASE;
-
+			send("+OK game ready");
+		} else {
+			send("-ERR fatal error: Wordle could not be generated.");
 		}
 	}
 
@@ -268,11 +383,16 @@ public class Game {
 
 	private int getWOTDIndex() {
 
-		long days = ChronoUnit.DAYS.between(LocalDate.ofEpochDay(0), LocalDate.now());
+		int days = currentDay();
 		int hash = ("" + days).hashCode();
 		return hash % 949 + 1;
 	}
 
+	private int currentDay() {
+
+		return (int) ChronoUnit.DAYS.between(LocalDate.ofEpochDay(0), LocalDate.now());
+	}
+
 	public String getIp() {
 
 		return ip;

src/User.java

@@ -1,154 +1,137 @@
 public class User {
-    
-    private String name = "default";
 
-    /**
-     * Konstruktor für Objekte der Klasse User
-     */
-    public User(String name)
-    {
-        setName(name);
-    }
+	private String name = "default";
+
+	/**
+	 * Konstruktor für Objekte der Klasse User
+	 */
+	public User(String name) {
+		this.name = name;
+	}
+
+	public void setPassword(String password) {
+		Game.databaseConnector
+				.executeStatement("UPDATE User SET password = " + password + " Where name LIKE '" + this.name + "'");
+	}
+
+	public String getPassword() {
+		Game.databaseConnector.executeStatement("SELECT password FROM User Where name LIKE '" + this.name + "'");
+		String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
+		return result;
+	}
+
+	public void setName(String name) {
+		Game.databaseConnector
+				.executeStatement("UPDATE User SET name = " + name + " Where name LIKE '" + this.name + "'");
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setWinPercentage(float winPercentage) {
+		Game.databaseConnector.executeStatement(
+				"UPDATE User SET winPercentage = " + winPercentage + " Where name LIKE '" + this.name + "'");
+	}
+
+	public float getWinPercentage() {
+		Game.databaseConnector.executeStatement("SELECT winPercentage FROM User Where name LIKE '" + this.name + "'");
+		String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
+		if (result == null) {
+			return 0f;
+		} else {
+			return Float.parseFloat(result);
+		}
+	}
+
+	public void setTimesPlayed(int timesPlayed) {
+		Game.databaseConnector.executeStatement(
+				"UPDATE User SET timesPlayed = " + timesPlayed + " Where name LIKE '" + this.name + "'");
+	}
+
+	public int getTimesPlayed() {
+		Game.databaseConnector.executeStatement("SELECT timesPlayed FROM User Where name LIKE '" + this.name + "'");
+		String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
+		if (result == null) {
+			return 0;
+		} else {
+			return Integer.parseInt(result);
+		}
+	}
+
+	public void increaseTimesPlayed() {
+		int temp = getTimesPlayed();
+		temp++;
+		setTimesPlayed(temp);
+	}
+
+	public void setCurrentStreak(int currentStreak) {
+		Game.databaseConnector.executeStatement(
+				"UPDATE User SET currentStreak = " + currentStreak + " Where name LIKE '" + this.name + "'");
+	}
+
+	public int getCurrentStreak() {
+		Game.databaseConnector.executeStatement("SELECT currentStreak FROM User Where name LIKE '" + this.name + "'");
+		String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
+		if (result == null) {
+			return 0;
+		} else {
+			return Integer.parseInt(result);
+		}
+	}
+
+	public void increaseCurrentStreak() {
+		int temp = getCurrentStreak();
+		temp++;
+		setCurrentStreak(temp);
+	}
+
+	public void setMaxStreak(int maxStreak) {
+		Game.databaseConnector
+				.executeStatement("UPDATE User SET maxStreak = " + maxStreak + " Where name LIKE '" + this.name + "'");
+	}
+
+	public int getMaxStreak() {
+		Game.databaseConnector.executeStatement("SELECT maxStreak FROM User Where name LIKE '" + this.name + "'");
+		String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
+		if (result == null) {
+			return 0;
+		} else {
+			return Integer.parseInt(result);
+		}
+	}
+
+	public void increaseMaxStreak() {
+		int temp = getMaxStreak();
+		temp++;
+		setMaxStreak(temp);
+	}
+
+	public void setWonInTurn(int row, int value) {
+		Game.databaseConnector.executeStatement(
+				"UPDATE User SET wonInTurn" + row + " = " + value + " Where name LIKE '" + this.name + "'");
+	}
+
+	public int getWonInTurn(int row) {
+		Game.databaseConnector
+				.executeStatement("SELECT wonInTurn" + row + " FROM User Where name LIKE '" + this.name + "'");
+		String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
+		if (result == null) {
+			return 0;
+		} else {
+			return Integer.parseInt(result);
+		}
+	}
+
+	public void increaseWonInTurn(int row) {
+		int temp = getWonInTurn(row) + 1;
+		setWonInTurn(row, temp);
+	}
+
+	public int[] getWonInTurnFull() {
+		int[] result = { getWonInTurn(1), getWonInTurn(2), getWonInTurn(3), getWonInTurn(4), getWonInTurn(5),
+				getWonInTurn(6) };
+		return result;
+	}
 
-   
-    
-     public void setPassword(String password)
-    {
-        Game.databaseConnector.executeStatement("UPDATE User SET password = " + password + " Where name = " + this.name);       
-    }
-        
-    
-    public String getPassword()
-    {
-        Game.databaseConnector.executeStatement("SELECT password FROM User Where name =" + this.name);
-        String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
-        return result;
-    } 
-     
-    
-    
-    public void setName(String name)
-    {
-    	Game.databaseConnector.executeStatement("UPDATE User SET name = " + name + " Where name = " + this.name);
-    }
-    
-    
-    public String getName()
-    {
-        return name;
-    }         
-    
-    
-    
-    public void setWinPercentage(float winPercentage)
-    {
-    	Game.databaseConnector.executeStatement("UPDATE User SET winPercentage = " + winPercentage + " Where name = " + this.name);
-    }
-    
-    
-    public float getWinPercentage()
-    {
-    	Game.databaseConnector.executeStatement("SELECT winPercentage FROM User Where name =" + this.name);
-        String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];      
-        return Float.parseFloat(result);
-    }
-    
-    
-    
-    public void setTimesPlayed(int timesPlayed)
-    {
-    	Game.databaseConnector.executeStatement("UPDATE User SET timesPlayed = " + timesPlayed + " Where name = " + this.name);
-    }
-    
-    
-    public int getTimesPlayed()
-    {
-    	Game.databaseConnector.executeStatement("SELECT timesPlayed FROM User Where name =" + this.name);
-        String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
-        return Integer.parseInt(result);
-    } 
-    
-    
-    public void increaseTimesPlayed()
-    {
-        int temp = getTimesPlayed();
-        temp++;
-        setTimesPlayed(temp);
-    }
-       
-    
-    
-    public void setCurrentStreak(int currentStreak)
-    {
-    	Game.databaseConnector.executeStatement("UPDATE User SET currentStreak = " + currentStreak + " Where name = " + this.name);
-    }
-    
-    
-    public int getCurrentStreak()
-    {
-    	Game.databaseConnector.executeStatement("SELECT currentStreak FROM User Where name =" + this.name);
-        String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
-        return Integer.parseInt(result);
-    } 
-    
-    
-    public void increaseCurrentStreak()
-    {
-        int temp = getCurrentStreak();
-        temp++;
-        setCurrentStreak(temp);
-    }
-    
-    
-    
-    public void setMaxStreak(int maxStreak)
-    {
-    	Game.databaseConnector.executeStatement("UPDATE User SET maxStreak = " + maxStreak + " Where name = " + this.name);
-    }
-    
-    
-    public int getMaxStreak()
-    {
-    	Game.databaseConnector.executeStatement("SELECT maxStreak FROM User Where name =" + this.name);
-        String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
-        return Integer.parseInt(result);       
-    } 
-    
-    
-    public void increaseMaxStreak()
-    {
-        int temp = getMaxStreak();
-        temp++;
-        setMaxStreak(temp);
-    }
-    
-    
-    
-    public void setWonInTurn(int row, int value)
-    {
-    	Game.databaseConnector.executeStatement("UPDATE User SET wonInTurn" + row + " = " + value + " Where name = " + this.name);
-    }
-       
-    
-    public int getWonInTurn(int row)
-    {
-    	Game.databaseConnector.executeStatement("SELECT wonInTurn" + row + " FROM User Where name =" + this.name);
-        String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
-        return Integer.parseInt(result);  
-    }   
-    
-    public void increaseWonInTurn(int row)
-    {
-        int temp = getWonInTurn(row) + 1;
-        setWonInTurn(row, temp);
-    }
-    
-    public int[] getWonInTurnFull()
-    {
-        int[] result = {getWonInTurn(1),getWonInTurn(2),getWonInTurn(3),getWonInTurn(4),getWonInTurn(5),getWonInTurn(6)};
-        return result;
-    }
-    
-    
-    
 }

src/WordleServer.java

@@ -11,18 +11,12 @@ public class WordleServer extends Server {
         new WordleServer();
     }
 
-
-    private DatabaseConnector db;
-
-
     public WordleServer() {
         this(DEFAULT_PORT);
     }
 
     public WordleServer( int pPort ) {
         super(pPort);
-
-        db = new DatabaseConnector("", 0, "wordle.db", "", "");
       
         games = new List<>();
     }