Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Export to csv #1941

Merged
merged 4 commits into from
Nov 10, 2024
Merged

Export to csv #1941

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32990c7
feat(image): record contribution events
jo-elimu Nov 9, 2024
0a43bcf
feat(image): display image in discord
jo-elimu Nov 9, 2024
31ccc76
feat(image): export to csv
jo-elimu Nov 10, 2024
4078d1f
perf(image): improve performance of rest api
jo-elimu Nov 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions src/main/java/ai/elimu/web/content/multimedia/image/ImageEditController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public class ImageEditController {
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
public String handleRequest(
HttpServletRequest request,
HttpSession session,
Model model,
@PathVariable Long id) {
logger.info("handleRequest");
Expand All @@ -89,10 +90,32 @@ public String handleRequest(

if (image.getCid() == null) {
// Pin file to IPFS
long timeMillisBeforePinning = System.currentTimeMillis();
String filename = request.getServerName() + "_image" + image.getId() + "-r" + image.getRevisionNumber() + "_" + image.getTitle();
String ipfsHash = IpfsHelper.pinFileToIpfs(image.getBytes(), filename);
image.setCid(ipfsHash);
imageDao.update(image);

jo-elimu marked this conversation as resolved.
Show resolved Hide resolved
ImageContributionEvent imageContributionEvent = new ImageContributionEvent();
imageContributionEvent.setContributor((Contributor) session.getAttribute("contributor"));
imageContributionEvent.setTimestamp(Calendar.getInstance());
imageContributionEvent.setImage(image);
imageContributionEvent.setRevisionNumber(image.getRevisionNumber());
imageContributionEvent.setComment("Pinned file to IPFS (🤖 auto-generated comment)");
imageContributionEvent.setTimeSpentMs(System.currentTimeMillis() - timeMillisBeforePinning);
imageContributionEventDao.create(imageContributionEvent);
jo-elimu marked this conversation as resolved.
Show resolved Hide resolved

if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {
String contentUrl = "http://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/multimedia/image/edit/" + image.getId();
String embedThumbnailUrl = image.getUrl();
DiscordHelper.sendChannelMessage(
"Image edited: " + contentUrl,
"\"" + image.getTitle() + "\"",
"Comment: \"" + imageContributionEvent.getComment() + "\"",
null,
embedThumbnailUrl
);
}
jo-elimu marked this conversation as resolved.
Show resolved Hide resolved
}

model.addAttribute("image", image);
Expand Down Expand Up @@ -208,8 +231,8 @@ public String handleSubmit(
imageContributionEventDao.create(imageContributionEvent);

if (!EnvironmentContextLoaderListener.PROPERTIES.isEmpty()) {
String contentUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/multimedia/image/edit/" + image.getId();
String embedThumbnailUrl = "https://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/image/" + image.getId() + "_r" + image.getRevisionNumber() + "." + image.getImageFormat().toString().toLowerCase();
String contentUrl = "http://" + EnvironmentContextLoaderListener.PROPERTIES.getProperty("content.language").toLowerCase() + ".elimu.ai/content/multimedia/image/edit/" + image.getId();
String embedThumbnailUrl = image.getUrl();
DiscordHelper.sendChannelMessage(
"Image edited: " + contentUrl,
"\"" + image.getTitle() + "\"",
Expand Down
Loading
Loading