From 78f97cb96afb01f53ae3bcc1284fe2170ca9e9b5 Mon Sep 17 00:00:00 2001 From: "Jo G." <1451036+jo-elimu@users.noreply.github.com> Date: Tue, 29 Apr 2025 17:54:36 +0700 Subject: [PATCH 1/6] feat: store file size of videos #2137 --- .../web/content/multimedia/video/VideoCreateController.java | 2 +- .../elimu/web/content/multimedia/video/VideoEditController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java b/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java index 1bfe12700..8b68f023b 100644 --- a/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java +++ b/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java @@ -89,9 +89,9 @@ public String handleSubmit( log.info("contentType: " + contentType); video.setContentType(contentType); + video.setFileSize(bytes.length); video.setBytes(bytes); video.setChecksumMd5(ChecksumHelper.calculateMD5(bytes)); - // TODO: https://github.com/elimu-ai/webapp/issues/2137 // TODO: convert to a default video format? } diff --git a/src/main/java/ai/elimu/web/content/multimedia/video/VideoEditController.java b/src/main/java/ai/elimu/web/content/multimedia/video/VideoEditController.java index d9c73017e..740082a7d 100644 --- a/src/main/java/ai/elimu/web/content/multimedia/video/VideoEditController.java +++ b/src/main/java/ai/elimu/web/content/multimedia/video/VideoEditController.java @@ -125,9 +125,9 @@ public String handleSubmit( log.info("contentType: " + contentType); video.setContentType(contentType); + video.setFileSize(bytes.length); video.setBytes(bytes); video.setChecksumMd5(ChecksumHelper.calculateMD5(bytes)); - // TODO: https://github.com/elimu-ai/webapp/issues/2137 // TODO: convert to a default video format? } From 97ded36fb006364b191402e98f20b2873a132650 Mon Sep 17 00:00:00 2001 From: "Jo G." <1451036+jo-elimu@users.noreply.github.com> Date: Tue, 29 Apr 2025 17:56:36 +0700 Subject: [PATCH 2/6] refactor #2137 --- .../web/content/multimedia/video/VideoCreateController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java b/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java index 8b68f023b..ee1a4e802 100644 --- a/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java +++ b/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java @@ -122,9 +122,9 @@ public String handleSubmit( return "content/multimedia/video/create"; } else { video.setTitle(video.getTitle().toLowerCase()); + video.setTimeLastUpdate(Calendar.getInstance()); String checksumGitHub = GitHubLfsHelper.uploadVideoToLfs(video, video.getBytes()); video.setChecksumGitHub(checksumGitHub); - video.setTimeLastUpdate(Calendar.getInstance()); videoDao.create(video); // TODO: https://github.com/elimu-ai/webapp/issues/1545 From 3281db908ae43f6c80fda575c4ffc6e3b21a7244 Mon Sep 17 00:00:00 2001 From: "Jo G." <1451036+jo-elimu@users.noreply.github.com> Date: Tue, 29 Apr 2025 19:17:58 +0700 Subject: [PATCH 3/6] feat: re-use existing file #2137 --- src/main/java/ai/elimu/dao/VideoDao.java | 2 ++ src/main/java/ai/elimu/dao/jpa/VideoDaoJpa.java | 14 ++++++++++++++ .../multimedia/video/VideoCreateController.java | 13 ++++++++++--- .../multimedia/video/VideoEditController.java | 11 ++++++++++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/main/java/ai/elimu/dao/VideoDao.java b/src/main/java/ai/elimu/dao/VideoDao.java index a75e9c311..fad2fa75b 100644 --- a/src/main/java/ai/elimu/dao/VideoDao.java +++ b/src/main/java/ai/elimu/dao/VideoDao.java @@ -10,6 +10,8 @@ public interface VideoDao extends GenericDao