Add search functionality to Database, add search HTTP handler, add better JSON method to HttpResponse, add missing handlers to Server auth ignore list.

README.md

@@ -17,10 +17,10 @@ The server includes a (working but very WIP) HTTP API for third-party clients an
 - [x] Authentication
 - [x] Library info
 - [x] Game info
+- [x] Search
 - [x] Downloads
   - [ ] Resumable downloads
 - [ ] User Management
-- [ ] Search
 
 ### Web interface
 - [x] Authentication

src/main/java/org/adrianvictor/livingroom/data/Database.java

@@ -2,7 +2,6 @@ package org.adrianvictor.livingroom.data;
 
 import org.adrianvictor.livingroom.Logger;
 import org.adrianvictor.livingroom.Main;
-import org.adrianvictor.livingroom.config.AppConfig;
 import org.adrianvictor.livingroom.data.catalog.Item;
 import org.adrianvictor.livingroom.data.catalog.Property;
 import org.json.simple.JSONObject;
@@ -96,7 +95,7 @@ public class Database {
         String sql = "SELECT id FROM games WHERE name=?";
 
         try (Connection conn = DriverManager.getConnection(url);
-             PreparedStatement stmt = conn.prepareStatement(sql);) {
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
             stmt.setString(1, name);
             try (ResultSet rs = stmt.executeQuery()) {
                 return rs.next();
@@ -111,7 +110,7 @@ public class Database {
         String sql = "SELECT * FROM games WHERE id=?";
 
         try (Connection conn = DriverManager.getConnection(url);
-             PreparedStatement stmt = conn.prepareStatement(sql);) {
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
             stmt.setString(1, String.valueOf(id));
             try (ResultSet rs = stmt.executeQuery()) {
                 List<Item> processed = processResultSet(rs);
@@ -127,9 +126,28 @@ public class Database {
         }
     }
 
+    public List<Item> search(String term) {
+        String sql = "SELECT * FROM games WHERE name LIKE ?";
+        List<Item> result = new ArrayList<>();
+
+        try (Connection conn = DriverManager.getConnection(url);
+            PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setString(1, "%" + term + "%"); // partial match
+
+            try (ResultSet rs = stmt.executeQuery()) {
+                result.addAll(processResultSet(rs));
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e.getMessage());
+        }
+
+        return result;
+    }
+
     public List<Item> getAllGames() {
         String sql = "SELECT * FROM games";
-        JSONParser parser = new JSONParser();
         List<Item> result = new ArrayList<>();
 
         try (Connection conn = DriverManager.getConnection(url);

src/main/java/org/adrianvictor/livingroom/http/Handlers.java

@@ -15,6 +15,7 @@ public class Handlers {
         map.put(new StaticWebHandler(), "/static");
         map.put(new WebRedirectHandler(), "/");
         map.put(new LoginHandler(), "/login");
+        map.put(new SearchHandler(), "/search");
     }
 
     public static HashMap<Handler, String> getAll() {

src/main/java/org/adrianvictor/livingroom/http/HttpResponse.java

@@ -1,5 +1,7 @@
 package org.adrianvictor.livingroom.http;
 
+import org.json.simple.JSONObject;
+
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
@@ -33,6 +35,17 @@ public record HttpResponse(
         );
     }
 
+    public static HttpResponse json(int status, Map<String, Object> extraFields) {
+        JSONObject json = new JSONObject();
+        json.putAll(extraFields);
+
+        return new HttpResponse(
+                status,
+                json.toJSONString().getBytes(StandardCharsets.UTF_8),
+                Map.of("Content-Type", "application/json")
+        );
+    }
+
     public static HttpResponse ok(byte[] body, String contentType) {
         return ok(body, contentType, new HashMap<>());
     }

src/main/java/org/adrianvictor/livingroom/http/Server.java

@@ -68,7 +68,7 @@ public class Server {
                     exchange.getResponseHeaders().add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
                     exchange.getResponseHeaders().add("Access-Control-Allow-Headers", "Content-Type");
 
-                    if (!(handler instanceof WebHandler) && !(handler instanceof LoginHandler)) {
+                    if (!(handler instanceof WebHandler) && !(handler instanceof LoginHandler) && !(handler instanceof StaticWebHandler) && !(handler instanceof WebRedirectHandler)) {
                         Session session = AuthenticationHelper.getAuthenticatedSession(exchange);
                         if (session == null) {
                             try {

src/main/java/org/adrianvictor/livingroom/http/handlers/SearchHandler.java

@@ -0,0 +1,37 @@
+package org.adrianvictor.livingroom.http.handlers;
+
+import com.sun.net.httpserver.HttpExchange;
+import org.adrianvictor.livingroom.data.Database;
+import org.adrianvictor.livingroom.data.catalog.Item;
+import org.adrianvictor.livingroom.http.Handler;
+import org.adrianvictor.livingroom.http.HttpResponse;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SearchHandler implements Handler {
+
+    @Override
+    public HttpResponse result(String baseAddress, String path, HttpExchange exchange) {
+        String[] parts = path.split("/");
+
+        if (parts.length < 1) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("message", "Invalid usage. Usage: ./query");
+            return HttpResponse.json(400, map);
+        }
+
+        List<Item> games = Database.getInstance().search(parts[1]);
+        JSONArray json = new JSONArray();
+        for (Item g : games) {
+            json.add(new JSONObject(g.getPropertiesString()));
+        }
+        Map<String, Object> extraFields = new HashMap<>();
+        extraFields.put("result", json.toJSONString());
+        extraFields.put("success", "true");
+        return HttpResponse.json(200, extraFields);
+    }
+}