161sh/CatgirlIntelligenceAgency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Serve assets from search service instead of resource-store,' (#100) from master into release

Browse Source 
Reviewed-on: https://git.marginalia.nu/marginalia/marginalia.nu/pulls/100
This commit is contained in:
Viktor Lofgren 2022-08-24 00:41:51 +02:00
commit 204635e1c7
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/EdgeSearchService.java
View File

@ -15,10 +15,12 @@ import nu.marginalia.wmsa.configuration.server.MetricsServer;
import nu.marginalia.wmsa.configuration.server.Service;
import nu.marginalia.wmsa.edge.index.client.EdgeIndexClient;
import nu.marginalia.wmsa.edge.search.command.CommandEvaluator;
import nu.marginalia.wmsa.edge.search.command.IndexCommand;
import nu.marginalia.wmsa.edge.search.command.SearchJsParameter;
import nu.marginalia.wmsa.edge.search.command.SearchParameters;
import nu.marginalia.wmsa.edge.search.exceptions.RedirectException;
import nu.marginalia.wmsa.edge.search.query.model.EdgeUserSearchParameters;
import nu.marginalia.wmsa.resource_store.StaticResources;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import spark.Request;
@ -36,6 +38,8 @@ public class EdgeSearchService extends Service {
private final EdgeSearchOperator searchOperator;
private final CommandEvaluator searchCommandEvaulator;
private final WebsiteUrl websiteUrl;
private StaticResources staticResources;
private static final Logger logger = LoggerFactory.getLogger(EdgeSearchService.class);
@SneakyThrows
@ -47,13 +51,16 @@ public class EdgeSearchService extends Service {
MetricsServer metricsServer,
EdgeSearchOperator searchOperator,
CommandEvaluator searchCommandEvaulator,
WebsiteUrl websiteUrl) {
WebsiteUrl websiteUrl,
StaticResources staticResources,
IndexCommand indexCommand) {
super(ip, port, initialization, metricsServer);
this.indexClient = indexClient;
this.searchOperator = searchOperator;
this.searchCommandEvaulator = searchCommandEvaulator;
this.websiteUrl = websiteUrl;
this.staticResources = staticResources;
Spark.staticFiles.expireTime(600);
@ -63,8 +70,12 @@ public class EdgeSearchService extends Service {
Spark.get("/api/search", this::apiSearch, gson::toJson);
Spark.get("/public/search", this::pathSearch);
Spark.get("/site-search/:site/*", this::siteSearchRedir);
Spark.get("/public/site-search/:site/*", this::siteSearchRedir);
Spark.get("/public/", indexCommand::render);
Spark.get("/public/:resource", this::serveStatic);
Spark.get("/site-search/:site/*", this::siteSearchRedir);
Spark.exception(Exception.class, (e,p,q) -> {
logger.error("Error during processing", e);
@ -74,6 +85,12 @@ public class EdgeSearchService extends Service {
Spark.awaitInitialization();
}
private Object serveStatic(Request request, Response response) {
String resource = request.params("resource");
staticResources.serveStatic("edge", resource, request, response);
return "";
}
private Object siteSearchRedir(Request request, Response response) {
final String site = request.params("site");
final String queryRaw = request.splat()[0];