0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix exceptions

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-07-16 23:04:59 +09:00
parent c874d0290a
commit 958626a037
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/org/codelibs/fess/thumbnail/impl/BaseThumbnailGenerator.java
View file

@ -31,6 +31,7 @@ import org.codelibs.fess.crawler.builder.RequestDataBuilder;
import org.codelibs.fess.crawler.client.CrawlerClient;
import org.codelibs.fess.crawler.client.CrawlerClientFactory;
import org.codelibs.fess.crawler.entity.ResponseData;
import org.codelibs.fess.crawler.exception.CrawlingAccessException;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.es.config.exentity.CrawlingConfig;
import org.codelibs.fess.exception.ThumbnailGenerationException;
@ -186,6 +187,12 @@ public abstract class BaseThumbnailGenerator implements ThumbnailGenerator {
}
try (final ResponseData responseData = client.execute(RequestDataBuilder.newRequestData().get().url(url).build())) {
return consumer.test(responseData);
} catch (final CrawlingAccessException e) {
if (logger.isDebugEnabled()) {
throw new ThumbnailGenerationException("Failed to process a thumbnail content: " + url, e);
} else {
throw new ThumbnailGenerationException(e.getMessage());
}
} catch (final Exception e) {
throw new ThumbnailGenerationException("Failed to process a thumbnail content: " + url, e);
}

20
src/main/java/org/codelibs/fess/thumbnail/impl/HtmlTagBasedGenerator.java
View file

@ -21,7 +21,9 @@ import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.regex.Pattern;
import javax.imageio.ImageIO;
import javax.imageio.ImageReadParam;
@ -30,6 +32,7 @@ import javax.imageio.stream.ImageInputStream;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.Tuple3;
import org.codelibs.fess.crawler.entity.ResponseData;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocumentUtil;
@ -80,7 +83,7 @@ public class HtmlTagBasedGenerator extends BaseThumbnailGenerator {
return process(
thumbnailId,
responseData -> {
if (!isImageMimeType(responseData.getMimeType())) {
if (!isImageMimeType(responseData)) {
if (logger.isDebugEnabled()) {
logger.debug("Thumbnail is not image: " + thumbnailId + " : " + responseData.getUrl());
}
@ -125,7 +128,20 @@ public class HtmlTagBasedGenerator extends BaseThumbnailGenerator {
}
protected boolean isImageMimeType(final String mimeType) {
protected boolean isImageMimeType(final ResponseData responseData) {
final String mimeType = responseData.getMimeType();
if (mimeType == null) {
final String url = responseData.getUrl().split(Pattern.quote("?"))[0].toLowerCase(Locale.ROOT);
if (url.endsWith(".png")//
|| url.endsWith(".gif")//
|| url.endsWith(".jpg")//
|| url.endsWith(".jpeg")//
|| url.endsWith(".bmp")) {
return true;
}
return false;
}
switch (mimeType) {
case "image/png":
case "image/gif":