YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
Horis
2023-12-08 23:50:45 +08:00
parent d8cc932527
commit 27d27b892a
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/book/src/main/java/me/ag2s/epublib/domain/MediaTypes.java
+8 -2
View File
@@ -32,6 +32,8 @@ public class MediaTypes {
public static final MediaType SVG = new MediaType("image/svg+xml", ".svg"); public static final MediaType SVG = new MediaType("image/svg+xml", ".svg");
public static final MediaType WEBP = new MediaType("image/webp", ".webp");
// fonts // fonts
public static final MediaType TTF = new MediaType( public static final MediaType TTF = new MediaType(
"application/x-truetype-font", ".ttf"); "application/x-truetype-font", ".ttf");
@@ -56,7 +58,7 @@ public class MediaTypes {
public static final MediaType UNKNOWN = new MediaType("application/octet-stream", ""); public static final MediaType UNKNOWN = new MediaType("application/octet-stream", "");
public static final MediaType[] mediaTypes = new MediaType[]{ public static final MediaType[] mediaTypes = new MediaType[]{
XHTML, EPUB, JPG, PNG, GIF, CSS, SVG, TTF, NCX, XPGT, OPENTYPE, WOFF, XHTML, EPUB, JPG, PNG, GIF, WEBP, CSS, SVG, TTF, NCX, XPGT, OPENTYPE, WOFF,
SMIL, PLS, JAVASCRIPT, MP3, MP4, OGG, UNKNOWN SMIL, PLS, JAVASCRIPT, MP3, MP4, OGG, UNKNOWN
}; };
@@ -69,7 +71,11 @@ public class MediaTypes {
} }
public static boolean isBitmapImage(MediaType mediaType) { public static boolean isBitmapImage(MediaType mediaType) {
return mediaType == JPG || mediaType == PNG || mediaType == GIF; return mediaType == JPG || mediaType == PNG || mediaType == GIF || mediaType == WEBP;
}
public static boolean isImage(MediaType mediaType) {
return mediaType == JPG || mediaType == PNG || mediaType == GIF || mediaType == SVG || mediaType == WEBP;
} }
/** /**
modules/book/src/main/java/me/ag2s/epublib/epub/PackageDocumentReader.java
+1 -1
View File
@@ -107,7 +107,7 @@ public class PackageDocumentReader extends PackageDocumentBase {
//如果有图片资源未定义在 originItemElements ，则加入该图片信息得到 fixedElements 中 //如果有图片资源未定义在 originItemElements ，则加入该图片信息得到 fixedElements 中
for (Resource resource : resources.getAll()) { for (Resource resource : resources.getAll()) {
MediaType currentMediaType = resource.getMediaType(); MediaType currentMediaType = resource.getMediaType();
if (currentMediaType == MediaTypes.JPG || currentMediaType == MediaTypes.PNG) { if (MediaTypes.isImage(currentMediaType)) {
String imageHref = resource.getHref(); String imageHref = resource.getHref();
//确保该图片信息 resource 在原 originItemHrefSet 集合中没有出现过 //确保该图片信息 resource 在原 originItemHrefSet 集合中没有出现过
if (!originItemHrefSet.contains(imageHref)) { if (!originItemHrefSet.contains(imageHref)) {