shardegger/storycove
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Stefan Hardegger
2026-06-08 09:41:56 +02:00
parent f4908637b3
commit a2ed2f7b79
1 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
backend/src/main/java/com/storycove/service/EPUBImportService.java
View File

@@ -481,18 +481,23 @@ public class EPUBImportService {
return htmlContent; return htmlContent;
} }
// Index all image resources by href and by bare filename for flexible lookup // Index all image resources by href and by bare filename for flexible lookup.
// Also index resources whose media type epublib could not recognise (returns null for formats
// like WebP that are absent from its built-in type registry) by falling back to the href extension.
Map<String, Resource> byHref = new HashMap<>(); Map<String, Resource> byHref = new HashMap<>();
Map<String, Resource> byFilename = new HashMap<>(); Map<String, Resource> byFilename = new HashMap<>();
for (Resource resource : book.getResources().getAll()) { for (Resource resource : book.getResources().getAll()) {
if (resource.getMediaType() != null && String href = resource.getHref();
resource.getMediaType().toString().startsWith("image/")) { if (href == null) continue;
String href = resource.getHref();
if (href != null) { boolean isImageByMediaType = resource.getMediaType() != null &&
byHref.put(href, resource); resource.getMediaType().toString().startsWith("image/");
String filename = href.contains("/") ? href.substring(href.lastIndexOf('/') + 1) : href; boolean isImageByExtension = hasImageExtension(href);
byFilename.putIfAbsent(filename, resource);
} if (isImageByMediaType || isImageByExtension) {
byHref.put(href, resource);
String filename = href.contains("/") ? href.substring(href.lastIndexOf('/') + 1) : href;
byFilename.putIfAbsent(filename, resource);
} }
} }
@@ -530,7 +535,7 @@ public class EPUBImportService {
} }
String mediaType = resource.getMediaType() != null ? String mediaType = resource.getMediaType() != null ?
resource.getMediaType().toString() : "image/jpeg"; resource.getMediaType().toString() : getMediaTypeFromHref(resource.getHref());
String extension = getExtensionFromMediaType(mediaType); String extension = getExtensionFromMediaType(mediaType);
String filename = "epub-img-" + System.currentTimeMillis() + "-" + String filename = "epub-img-" + System.currentTimeMillis() + "-" +
(int) (Math.random() * 100000) + "." + extension; (int) (Math.random() * 100000) + "." + extension;
@@ -619,6 +624,32 @@ public class EPUBImportService {
return "jpg"; // Default fallback return "jpg"; // Default fallback
} }
} }
/**
* Determine MIME type from the file extension in an EPUB resource href.
* Used as a fallback when epublib does not recognise the media type (e.g. WebP).
*/
private String getMediaTypeFromHref(String href) {
if (href == null) return "image/jpeg";
String lower = href.toLowerCase();
if (lower.endsWith(".png")) return "image/png";
if (lower.endsWith(".gif")) return "image/gif";
if (lower.endsWith(".webp")) return "image/webp";
if (lower.endsWith(".svg")) return "image/svg+xml";
return "image/jpeg"; // covers .jpg, .jpeg and unknown formats
}
/**
* Returns true if the href path ends with a known image file extension.
* Used to index EPUB resources whose media type epublib could not determine.
*/
private boolean hasImageExtension(String href) {
if (href == null) return false;
String lower = href.toLowerCase();
return lower.endsWith(".jpg") || lower.endsWith(".jpeg") ||
lower.endsWith(".png") || lower.endsWith(".gif") ||
lower.endsWith(".webp") || lower.endsWith(".svg");
}
private ReadingPositionDto convertToDto(ReadingPosition position) { private ReadingPositionDto convertToDto(ReadingPosition position) {
if (position == null) return null; if (position == null) return null;