moparisthebest
/
filebot
mirror of https://github.com/mitb-archive/filebot
1
0
Fork 0
Code Issues Releases Wiki Activity

Experiment with @2x artwork thumbnail support

This commit is contained in:
Reinhard Pointner 2019-05-16 23:19:42 +07:00
parent 6f0e424414
commit 674170a250
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source/net/filebot/ResourceManager.java
View File

@ -52,6 +52,14 @@ public final class ResourceManager {
return getIcon("flags/" + languageCode);
}
private static URL[] getMultiResolutionImageResource(String name) {
return Stream.of(name, name + "@2x").map(ResourceManager::getImageResource).filter(Objects::nonNull).toArray(URL[]::new);
}
private static URL getImageResource(String name) {
return ResourceManager.class.getResource("resources/" + name + ".png");
}
private static Image getMultiResolutionImage(URL[] resource) {
try {
// Load multi-resolution images only if necessary
@ -65,7 +73,7 @@ public final class ResourceManager {
}
// Windows 10: use down-scaled @2x image for non-integer scale factors 1.25 / 1.5 / 1.75
if (PRIMARY_SCALE_FACTOR > 1 && PRIMARY_SCALE_FACTOR < 2 && image.size() >= 2) {
if (PRIMARY_SCALE_FACTOR > 1 && PRIMARY_SCALE_FACTOR < 2 && image.size() > 1) {
image.add(1, scale(PRIMARY_SCALE_FACTOR / 2, image.get(1)));
}
@ -75,17 +83,30 @@ public final class ResourceManager {
}
}
private static URL[] getMultiResolutionImageResource(String name) {
return Stream.of(name, name + "@2x").map(ResourceManager::getImageResource).filter(Objects::nonNull).toArray(URL[]::new);
}
public static Image getMultiResolutionImageIcon(BufferedImage baseImage, double baseScale) {
if (PRIMARY_SCALE_FACTOR == 1 && baseScale == 1) {
return baseImage;
}
private static URL getImageResource(String name) {
return ResourceManager.class.getResource("resources/" + name + ".png");
List<BufferedImage> image = new ArrayList<BufferedImage>(3);
image.add(baseImage);
// use down-scaled @2x image as @1x base image
if (baseScale > 1) {
image.add(0, scale(1 / baseScale, baseImage));
}
// Windows 10: use down-scaled @2x image for non-integer scale factors 1.25 / 1.5 / 1.75
if (PRIMARY_SCALE_FACTOR > 1 && PRIMARY_SCALE_FACTOR < 2 && image.size() > 1) {
image.add(1, scale(PRIMARY_SCALE_FACTOR / baseScale, image.get(1)));
}
return new BaseMultiResolutionImage(image.toArray(Image[]::new));
}
public static final double PRIMARY_SCALE_FACTOR = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration().getDefaultTransform().getScaleX();
public static BufferedImage scale(double scale, BufferedImage image) {
private static BufferedImage scale(double scale, BufferedImage image) {
int w = (int) (scale * image.getWidth());
int h = (int) (scale * image.getHeight());
return Scalr.resize(image, Method.ULTRA_QUALITY, Mode.FIT_TO_WIDTH, w, h, Scalr.OP_ANTIALIAS);

27
source/net/filebot/ThumbnailServices.java
View File

@ -6,8 +6,6 @@ import static net.filebot.Logging.*;
import static net.filebot.ResourceManager.*;
import static net.filebot.util.RegularExpressions.*;
import java.awt.Image;
import java.awt.image.BaseMultiResolutionImage;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.net.URI;
@ -17,7 +15,6 @@ import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.net.http.HttpResponse.BodyHandlers;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -115,7 +112,7 @@ public enum ThumbnailServices implements ThumbnailProvider {
for (int i = 0; i < thumbnails.length; i++) {
if (thumbnails[i] != null && thumbnails[i].length > 0) {
try {
icons.put(keys.get(i), getScaledIcon(thumbnails[i], variant));
icons.put(keys.get(i), getIcon(thumbnails[i], variant));
} catch (Exception e) {
debug.log(Level.SEVERE, e, e::toString);
}
@ -125,29 +122,11 @@ public enum ThumbnailServices implements ThumbnailProvider {
return icons;
}
protected Icon getScaledIcon(byte[] bytes, ResolutionVariant variant) throws Exception {
// Load multi-resolution images only if necessary
if (PRIMARY_SCALE_FACTOR == 1 && variant == ResolutionVariant.NORMAL) {
return new ImageIcon(bytes);
}
protected Icon getIcon(byte[] bytes, ResolutionVariant variant) throws Exception {
BufferedImage baseImage = ImageIO.read(new ByteArrayInputStream(bytes));
double baseScale = variant.scaleFactor;
List<BufferedImage> image = new ArrayList<BufferedImage>(3);
image.add(baseImage);
// use down-scaled @2x image as @1x base image
if (baseScale > 1) {
image.add(0, scale(1 / baseScale, baseImage));
}
// Windows 10: use down-scaled @2x image for non-integer scale factors 1.25 / 1.5 / 1.75
if (PRIMARY_SCALE_FACTOR > 1 && PRIMARY_SCALE_FACTOR < 2 && image.size() >= 2) {
image.add(1, scale(PRIMARY_SCALE_FACTOR / 2, image.get(1)));
}
return new ImageIcon(new BaseMultiResolutionImage(image.toArray(Image[]::new)));
return new ImageIcon(getMultiResolutionImageIcon(baseImage, baseScale));
}
public enum ResolutionVariant {