✔️修复一个关闭tab后再次查询相同内容无tab显示的bug，完善iconhash的计算方式

Author: flashine

pom.xml

@@ -32,7 +32,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>29.0-jre</version>
+            <version>30.1-jre</version>
         </dependency>
     </dependencies>
     <build>

src/main/java/org/fofaviewer/controls/CloseableTabPane.java

@@ -12,12 +12,10 @@
 
 public class CloseableTabPane extends BorderPane {
     private final TabPane tabPane;
-    private HashMap<String, Tab> tabMap;
     private HashMap<Tab, ArrayList<String>> dataMap;
 
     public CloseableTabPane() {
         this.tabPane = new TabPane();
-        this.tabMap = new HashMap<>();
         this.dataMap = new HashMap<>();
         StackPane sp = new StackPane();
         sp.getChildren().add(tabPane);
@@ -42,7 +40,6 @@ public void onChanged(Change<? extends Tab> c) {
             for (Tab tab:tabPane.getTabs()){
                 if(tab.selectedProperty().getValue()){
                     tabPane.getTabs().remove(tab);
-                    tabMap.remove(tab.getText());
                     dataMap.remove(tab);
                     break;
                 }
@@ -57,8 +54,6 @@ public void onChanged(Change<? extends Tab> c) {
                 if(tab.selectedProperty().getValue()){
                     tabPane.getTabs().clear();
                     tabPane.getTabs().add(tab);
-                    tabMap.clear();
-                    tabMap.put(tab.getText(), tab);
                     ArrayList<String> tmp = dataMap.get(tab);
                     dataMap.clear();
                     dataMap.put(tab, tmp);
@@ -70,7 +65,6 @@ public void onChanged(Change<? extends Tab> c) {
         MenuItem closeAll = new MenuItem("关闭所有");
         closeAll.setOnAction(e->{
             tabPane.getTabs().clear();
-            tabMap.clear();
             dataMap.clear();
         });
         menuButton.getItems().add(closeAll);
@@ -84,7 +78,6 @@ public void onChanged(Change<? extends Tab> c) {
     public void addTab(Tab tab, ArrayList<String> list){
         tab.setClosable(true);
         tabPane.getTabs().add(tab);
-        tabMap.put(tab.getText(),tab);
         if(list != null){
             dataMap.put(tab, list);
         }else{
@@ -100,11 +93,21 @@ public void addAll(ObservableList<Tab> tabs){
     }
 
     public boolean isExistTab(String name){
-        return this.tabMap.get(name) != null;
+        for(Tab tab : this.tabPane.getTabs()){
+            if(tab.getText().equals(name)){
+                return true;
+            }
+        }
+        return false;
     }
 
     public Tab getTab(String name){
-        return this.tabMap.get(name);
+        for(Tab tab : this.tabPane.getTabs()){
+            if(tab.getText().equals(name)){
+                return tab;
+            }
+        }
+        return null;
     }
 
     public ArrayList<String> getList(Tab tab){

src/main/java/org/fofaviewer/main/MainController.java

@@ -344,7 +344,10 @@ public void handle(ActionEvent event) {
                             res = helper.getImageFavicon(url + "/favicon.ico");
                         }
                         if(res != null){
-                            query(RequestHelper.encode(res.get("msg")));
+                            if(res.get("code").equals("error")){
+                                showAlert(Alert.AlertType.ERROR, null, res.get("msg"));return;
+                            }
+                            query(res.get("msg"));
                             return;
                         }
                         showAlert(Alert.AlertType.ERROR, null, "该网站未提供favicon");

src/main/java/org/fofaviewer/utils/RequestHelper.java

@@ -39,8 +39,6 @@ public class RequestHelper {
             "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:65.0) Gecko/20100101 Firefox/65.0",
             "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.41 Safari/537.36 Edg/88.0.705.22"
     };
-    private final String path = System.getProperty("user.dir") +
-            System.getProperty("file.separator") + "iconhash" + System.getProperty("file.separator");
 
     private RequestHelper() {
         this.logger = Logger.getLogger("RequestHelper");
@@ -124,17 +122,14 @@ public HashMap<String, String> getHTML(String url) {
     /**
      * 提取网站favicon 需要两步：
      * 1. 直接访问url根目录的favicon，若404则跳转至第2步
-     * 2. 访问网站，获取html页面，获取head头中的 link标签的ico 路径
+     * 2. 访问网站，获取html页面，获取head中的 link标签的ico 路径
      *
      * @param url
      * @return
      */
     public HashMap<String, String> getImageFavicon(String url) {
-        String filename = this.path + "favicon.ico";
-        File file = new File(filename);
         CloseableHttpResponse response = getResponse(url);
         HashMap<String, String> result = new HashMap<>();
-        int cache = 10240;
         if (response != null) {
             int code = response.getStatusLine().getStatusCode();
             result.put("code", String.valueOf(code));
@@ -144,16 +139,18 @@ public HashMap<String, String> getImageFavicon(String url) {
                         logger.log(Level.FINE, url + "无响应内容");
                         return null;
                     }
-                    FileOutputStream fileout = new FileOutputStream(file);
                     InputStream is = response.getEntity().getContent();
-                    byte[] buffer = new byte[cache];
-                    int ch = 0;
-                    while ((ch = is.read(buffer)) != -1) {
-                        fileout.write(buffer, 0, ch);
+                    byte[] buffer = new byte[1024];
+                    ByteArrayOutputStream bos=new ByteArrayOutputStream();
+                    int len = 0;
+                    while((len = is.read(buffer))!=-1){
+                        bos.write(buffer,0, len);
                     }
-                    is.close();
-                    fileout.flush();
-                    fileout.close();
+                    bos.flush();
+                    String encoded = new BASE64Encoder().encode(Objects.requireNonNull(bos.toByteArray()));
+                    String hash = getIconHash(encoded);
+                    result.put("msg", "icon_hash=\"" + hash + "\"");
+                    return result;
                 } catch (Exception e) {
                     result.put("code", "error");
                     result.put("msg", e.getMessage());
@@ -166,11 +163,6 @@ public HashMap<String, String> getImageFavicon(String url) {
                         logger.log(Level.WARNING, ex.getMessage(), ex);
                     }
                 }
-                String hash = getIconHash(filename);
-                if (hash != null) {
-                    result.put("msg", hash.replaceAll("\n", ""));
-                    return result;
-                }
             }
         }
         return null;
@@ -202,18 +194,13 @@ public String getLinkIcon(String url) {
     }
 
     /**
-     * 使用iconhash计算favicon hash
+     * 计算favicon hash
      *
      * @param f favicon的文件对象
      * @return favicon hash值
      */
     private String getIconHash(String f) {
-        String os = System.getProperty("os.name").toLowerCase(Locale.US);
-        String arch = System.getProperty("os.arch").toLowerCase(Locale.US);
-        StringBuilder filepath = new StringBuilder();
-        System.out.println(f);
-        String base64Str = ImageToBase64(f);
-        int murmu = Hashing.murmur3_32().hashString(base64Str.replaceAll("\r", "") + "\n", StandardCharsets.UTF_8).asInt();
+        int murmu = Hashing.murmur3_32().hashString(f.replaceAll("\r", "") + "\n", StandardCharsets.UTF_8).asInt();
         return String.valueOf(murmu);
     }
 
@@ -232,22 +219,22 @@ public String getCertSerialNum(String host) {
         return null;
     }
 
-    private static String ImageToBase64(String imgPath) {
-        byte[] data = null;
-        // 读取图片字节数组
-        try {
-            InputStream in = new FileInputStream(imgPath);
-            data = new byte[in.available()];
-            in.read(data);
-            in.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        // 对字节数组Base64编码
-        BASE64Encoder encoder = new BASE64Encoder();
-        // 返回Base64编码过的字节数组字符串
-        return encoder.encode(Objects.requireNonNull(data));
-    }
+//    private static String ImageToBase64(InputStream imgPath) {
+//        byte[] data = null;
+//        // 读取图片字节数组
+//        try {
+//            InputStream in = new FileInputStream(imgPath);
+//            data = new byte[in.available()];
+//            in.read(data);
+//            in.close();
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//        // 对字节数组Base64编码
+//        BASE64Encoder encoder = new BASE64Encoder();
+//        // 返回Base64编码过的字节数组字符串
+//        return encoder.encode(Objects.requireNonNull(data));
+//    }
 
     /**
      * base64编码字符串