From c828d1534dada063509cab3a3658b74eb5e4fa2e Mon Sep 17 00:00:00 2001 From: RhiobeT Date: Wed, 1 Dec 2021 16:49:21 +0100 Subject: [PATCH] Some minor bugfixes --- .../sh/rhiobet/lalafin/file/FileInfoService.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/sh/rhiobet/lalafin/file/FileInfoService.java b/src/main/java/sh/rhiobet/lalafin/file/FileInfoService.java index d5c30c7..f3da2ea 100644 --- a/src/main/java/sh/rhiobet/lalafin/file/FileInfoService.java +++ b/src/main/java/sh/rhiobet/lalafin/file/FileInfoService.java @@ -108,6 +108,10 @@ public class FileInfoService { try { thumbPath = Paths.get("/lalafin/file" + requestedPath + "/.thumbnails/" + fileName + ".jpg"); + if (!Files.exists(thumbPath)) { + thumbPath = Paths.get("/lalafin/file" + requestedPath + + "/.thumbnails/" + fileName + ".png"); + } } catch (Exception ignored) { } @@ -134,7 +138,12 @@ public class FileInfoService { if ((thumbPath != null && Files.exists(thumbPath)) || thumbnailService.generateThumbnail(contentInfo, thumbPath)) { contentInfo.thumbnailUrl = - "/file" + requestedUri + "/.thumbnails/" + fileUri + ".jpg"; + "/file" + requestedUri + "/.thumbnails/" + fileUri; + if (thumbPath.toString().endsWith(".jpg")) { + contentInfo.thumbnailUrl += ".jpg"; + } else if (thumbPath.toString().endsWith(".png")) { + contentInfo.thumbnailUrl += ".png"; + } } folderInfo.content.add(contentInfo); }); @@ -154,9 +163,9 @@ public class FileInfoService { + "/" + requestedFilenameUri; } if (requestedFilename.endsWith(".zip")) { - fileInfo.viewUrl = "/view" + requestedUri + "/" + requestedFilenameUri + "/1"; + fileInfo.viewUrl = "/view" + requestedUri + "/1"; } else if (requestedFilename.endsWith(".epub")) { - fileInfo.viewUrl = "/view" + requestedUri + "/" + requestedFilenameUri + "/0"; + fileInfo.viewUrl = "/view" + requestedUri + "/0"; } return fileInfo; }