support png type favicon

greenlaw110 · greenlaw110 · commit e44899f0d332 · 2017-06-04T15:17:24.000+10:00
diff --git a/src/main/java/act/util/Banner.java b/src/main/java/act/util/Banner.java
@@ -60,7 +60,6 @@ public static String cachedBanner() {
     public static String banner() {
         String bannerText = null;
 
-
         String udfBanner = udfBanner();
         if (null != udfBanner) {
             bannerText = S.concat(udfBanner, "\n");
@@ -130,17 +129,29 @@ private static void addFavicon(S.Buffer buffer, String favicon, int maxWidth, in
     }
 
     private static String favicon() {
-        URL url = Banner.class.getResource("/asset/favicon.ico");
+        boolean isIcon = true;
+        URL url = Banner.class.getResource("/asset/favicon.png");
         if (null == url) {
-            url = Banner.class.getResource("/asset/img/favicon.ico");
+            url = Banner.class.getResource("/asset/img/favicon.png");
+            if (null == url) {
+                url = Banner.class.getResource("/asset/image/favicon.png");
+            }
+        }
+        if (null != url) {
+            isIcon = false;
+        } else {
+            url = Banner.class.getResource("/asset/favicon.ico");
             if (null == url) {
-                url = Banner.class.getResource("/asset/image/favicon.ico");
+                url = Banner.class.getResource("/asset/img/favicon.ico");
+                if (null == url) {
+                    url = Banner.class.getResource("/asset/image/favicon.ico");
+                }
             }
         }
         if (null == url) {
             return "";
         }
-        return Image2ascii.render(url, true);
+        return Image2ascii.render(url, true, isIcon);
     }
 
     private static String asciiArt(String s) {
diff --git a/src/main/java/ascii/Image2ascii.java b/src/main/java/ascii/Image2ascii.java
@@ -22,13 +22,15 @@
 
 import net.sf.image4j.codec.ico.ICODecoder;
 import org.osgl.$;
+import org.osgl.util.E;
 import org.osgl.util.IO;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.net.MalformedURLException;
 import java.net.URL;
 
 // Adapted from https://github.com/netwinder-dev/ASCIIConversion/blob/master/src/ASCIIConvert/ASCIIConversions.java
@@ -153,21 +155,32 @@ private static BufferedImage scale(BufferedImage original, boolean favicon) {
         return $.T3(max, (int)(height * factor), factor);
     }
 
-    public static String render(URL imageSource) {
-        return render(imageSource, false);
+    public static String render(File imageSource, boolean favicon) {
+        try {
+            URL url = imageSource.toURI().toURL();
+            boolean isIcon = imageSource.getName().endsWith(".ico");
+            return render(url, favicon, isIcon);
+        } catch (MalformedURLException e) {
+            // this is never gonna happen
+            throw E.unexpected(e);
+        }
+    }
+
+    public static String render(URL imageSource, boolean iconFile) {
+        return render(imageSource, false, iconFile);
     }
 
-    public static String render(URL imageSource, boolean favicon) {
+    public static String render(URL imageSource, boolean favicon, boolean iconFile) {
         try {
-            BufferedImage image = read(imageSource, favicon);
+            BufferedImage image = read(imageSource, iconFile);
             return new Image2ascii().convert(image, favicon);
         } catch (Exception e) {
             return "";
         }
     }
 
-    private static BufferedImage read(URL imageSource, boolean favicon) throws Exception {
-        if (favicon) {
+    private static BufferedImage read(URL imageSource, boolean isIcon) throws Exception {
+        if (isIcon) {
             java.util.List<BufferedImage> images = ICODecoder.read(imageSource.openStream());
             return images.get(0);
         } else {
@@ -179,7 +192,7 @@ public static void main(String[] args) throws Exception {
         Image2ascii convert = new Image2ascii();
         java.util.List<BufferedImage> images = ICODecoder.read(new File("/home/luog/favicon.ico"));
         String s = convert.convert(images.get(0), true);
-        if (images.size() > 1) {
+        if (images.size() > 0) {
             for (int i = 0; i < images.size(); ++i) {
                 ImageIO.write(images.get(i), "png", new File("/home/luog/f" + i + ".png"));
             }
