From dae7dacf3d6a7e588bf2a91241e031ed925f47d7 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Mon, 5 Dec 2022 11:43:52 +0800
Subject: [PATCH] Rework SimilarityScan

---
 app/build.gradle                              |   1 +
 .../ehviewer/ui/scene/GalleryDetailScene.java |  28 ++++++------------
 gradle/wrapper/gradle-wrapper.jar             | Bin 61574 -> 61574 bytes
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 00fbf2232..66ccc78b7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -70,6 +70,7 @@ android {
     packagingOptions {
         resources {
             excludes += "/META-INF/**"
+            excludes += "/okhttp3/**"
             excludes += "/kotlin/**"
             excludes += "**.txt"
             excludes += "**.bin"
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
index 623ad633b..2c5acb6d3 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -125,6 +125,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
 
+import coil.Coil;
 import okhttp3.HttpUrl;
 import rikka.core.res.ResourcesKt;
 
@@ -1093,28 +1094,17 @@ public class GalleryDetailScene extends CollapsingToolbarScene implements View.O
         if (-1L == gid) {
             return;
         }
-        File temp = AppConfig.createTempFile();
-        if (null == temp) {
-        }
 
-        /*
-        OutputStream os = null;
         try {
-            os = new FileOutputStream(temp);
-            if (beerBelly.pullFromDiskCache(EhCacheKeyFactory.getThumbKey(gid), os)) {
-                ListUrlBuilder lub = new ListUrlBuilder();
-                lub.setMode(ListUrlBuilder.MODE_IMAGE_SEARCH);
-                lub.setImagePath(temp.getPath());
-                lub.setUseSimilarityScan(true);
-                GalleryListScene.startScene(this, lub);
-            }
-        } catch (FileNotFoundException e) {
-            // Ignore
-        } finally {
-            IOUtils.closeQuietly(os);
+            var path = Coil.imageLoader(context).getDiskCache().get(EhCacheKeyFactory.getThumbKey(gid)).getData();
+            ListUrlBuilder lub = new ListUrlBuilder();
+            lub.setMode(ListUrlBuilder.MODE_IMAGE_SEARCH);
+            lub.setImagePath(path.toString());
+            lub.setUseSimilarityScan(true);
+            GalleryListScene.startScene(this, lub);
+        } catch (Throwable e) {
+            e.printStackTrace();
         }
-
-         */
     }
 
     @Override
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..e6345fd529e800a4ae318a89dc4ab795b56f91c5 100644
GIT binary patch
delta 937
zcmYL`T}Ts96vwwVHFB_Un{;i4(;{J78YqzohNVeb_JKi4Dr)KqR|%FFYZ3V%60F;k
zm0$!~(nv1!5Lpu`Xb<@nQo+95m;2VDmq6%$Y|+dA{_g*rd(J)g4tivR9$8BL37K5Y
zr3#HDOC?oX_Fa>1?v!$gL}I+&xnCyvpYcueH^}AEY^hr0N_)1!u%sI|?c>Q{vw|Vm
zuNc~bMXr1$hi`H-@mY0C3UmP5HB~?{nRzS~&bl@Xb$Xcil|3YbZ`S>wv%R|;a8}s!
zt+eac7p76NmkHYe9~|E3W8z&&gn};)DshnO{fxJ3vbb_r8h4eXir-~#sinow#C*A%
z5~nH>w2W1rqYBdjCX`h<)U&AOX$BlqkcnvHPjnLQwmhm?u*yVs=Nr23*RDk>hsWYJ
zLspX340#}Ph>60>6I5xrCxvPkhcVC9`V`=BnDOSmPap?qX+X<!B74N$8>RF#wGk$k
z2ENlt>+PNR1HKVq-1}e|)D%UG$M8sEW@MJC-g^?l#yI+TD;CB02O4JaxrRQbHBPlv
z{83yXa^Ck+wl&Vg%NaY}{pM^n4P~<{aU(H5*Fp`8mvZR`X`pV0j=rDqXO8@&wc^kw
zN$sQ=DXq?_2lYG8Ll>O&n=a#JuJUC3zH2Y&wd*2O<L-i*+{6xd19UQz@jA~T(7KlK
zG0$O;(?eNi9pf!4)u4%$ZfJ(L7dq%QK-azGH2R1?`r4s-e+Sg!Z-Gu#FrFSb4H~Ot
zyf07%nhson7S%9b8KiEe;901<jqymZ0#vZt34OSF2})CK5B-~Y%^>GzLWS_nAv*IV
z)C4UKUw{sWX<kRT2U;6xg<2ygp&JpJuqjHnnHgbxIeG-NBX$aE9A*4YtQ4deXM7<>
j5mmen+8VEgTH`c{Izhc`cH}0Gg68KKcO@uSx7P6oQgl$J

delta 937
zcmYL`T}Ts96vwwVHP&F^oOEr5(;{J78YqzohNVeb_JKi4Dr)KqR|%FFYZ3V%60F;k
zm0$!~(nv1!5Lpu`Xb<@nQo+95m;2VDmq6%$Y|+dA{_g*rd(J)g4tivR9$8BL37K5M
zrAmz@OD$Dc_Fa>1?o@J#L}I+&xnCyvpYcueH^}AEY^g%zN_!MAEZdBm_VHw}S;-LW
zR}O8#B3HeV!#BB^_^iGq1v-H3nkt}}%siF~XI&eHIz3GM${v!zH|u`T+1}j^I4kV=
zR@(LJ3)3js%Y^NK4-RkiG4ZY>LctdYRXE7?e#YB1SzNU%jk`)x#qYAW)Y9T-V!qr>
ziBlB`TE;5RQHALM6RN5l>RD9tG#!p9$V9a9CprmtTOQRcSY;x+^9|kiYu6%`!((xq
zAuCC1hCGlt#6;oc397W*lR~wN!<gr4eF|_m%y@I(Cy)cQG@#`<kv-z>jZ%7=+6WU%
z1K;VS_4ZEu0pEx)?tQQfYKkJpV|XMnGcrq6?>z}&V;p_F6^nBG0}ZqITtgqz8mHQ7
z{wS^#Iq!QZ+Zt!$<&2%~esi{(hO*gJxRIEjYoUh4OS$xeG*GugN8iu*Ge>^XT5)KT
zl;NZqDXq?_2lYG8Ll>O&n=a#JuJUC3zH2Y&wd*2O<L-i*+{6xd19UQz@jA~T(7KlK
zG0$O;(?eNi9pf!4)u4%$ZfLr<7dq%QK-azGH2R1?`r4s-e+Sg!Z-Gu#FupBt8Z=hP
zcwe9jG#$7CEvjL>GDzJ_!Lv|z8{?5+1*l-P6Z&xV5|pOe9{M-)nnBLbgbLxCLv-d#
zs0msez5pE#)4Yyw541MY3bjT~LN_8bVN;ZDGc&^Ya`XsjN9+{TILi2)SSd(3&iF!%
jBI<Y@v^8D}wZ>_Zj0E+v*^!$#3Ywo|+?AkQ-CD;V=!Q&M