Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-24 05:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request 'Tweak screenshot service' (#41) from master into release

Browse Source 
Reviewed-on: https://git.marginalia.nu/marginalia/marginalia.nu/pulls/41
This commit is contained in:
Viktor Lofgren 2022-07-26 17:11:12 +02:00
commit b057ba4792
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/assistant/screenshot/ScreenshotService.java
View File

@ -7,6 +7,7 @@ import lombok.SneakyThrows;
import nu.marginalia.wmsa.edge.data.dao.EdgeDataStoreDao; import nu.marginalia.wmsa.edge.data.dao.EdgeDataStoreDao;
import nu.marginalia.wmsa.edge.model.EdgeDomain; import nu.marginalia.wmsa.edge.model.EdgeDomain;
import nu.marginalia.wmsa.edge.model.EdgeId; import nu.marginalia.wmsa.edge.model.EdgeId;
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import spark.Request; import spark.Request;
@ -39,7 +40,9 @@ public class ScreenshotService {
""")) { """)) {
ps.setInt(1, domainId.id()); ps.setInt(1, domainId.id());
var rs = ps.executeQuery(); var rs = ps.executeQuery();
return rs.next(); if (rs.next()) {
return rs.getBoolean(1);
}
} }
catch (SQLException ex) { catch (SQLException ex) {
logger.warn("SQL error", ex); logger.warn("SQL error", ex);
@ -67,7 +70,10 @@ public class ScreenshotService {
var rsp = ps.executeQuery(); var rsp = ps.executeQuery();
if (rsp.next()) { if (rsp.next()) {
response.type(rsp.getString(1)); response.type(rsp.getString(1));
rsp.getBlob(2).getBinaryStream().transferTo(response.raw().getOutputStream()); response.status(200);
response.header("Cache-control", "public,max-age=3600");
IOUtils.copy(rsp.getBlob(2).getBinaryStream(), response.raw().getOutputStream());
return ""; return "";
} }
} }