⚡ Improve image search logic

wiseCirno · Aug 24, 2024 · a988dd3 · a988dd3
1 parent 659b768
commit a988dd3
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/service/Search.py b/src/service/Search.py
@@ -49,13 +49,15 @@ async def get_media(self, url: str, cookies: Optional[str] = None):
 
     async def _search_with_type(self, url: str, type: str):
         async with Network(proxies = self._proxy) as client:
+            self.media = await self.get_media(url)
+
             if type == "ascii2d":
                 base_url = f'{self._cf_proxy}/https://ascii2d.net' if self._cf_proxy else 'https://ascii2d.net'
                 ascii2d = Ascii2D(base_url = base_url, client = client)
                 ascii2d_bovw = Ascii2D(base_url = base_url, client = client, bovw = True)
 
-                resp = await ascii2d.search(url = url)
-                bovw_resp = await ascii2d_bovw.search(url = url)
+                resp = await ascii2d.search(file = self.media)
+                bovw_resp = await ascii2d_bovw.search(file = self.media)
                 if not resp.raw and not bovw_resp.raw:
                     raise Exception(f"No ascii2d search results, search url: {resp.url}")
 
@@ -67,7 +69,7 @@ async def _search_with_type(self, url: str, type: str):
                 base_url_3d = f'{self._cf_proxy}/https://3d.iqdb.org' if self._cf_proxy else 'https://3d.iqdb.org'
                 iqdb = Iqdb(base_url = base_url, base_url_3d = base_url_3d, client = client)
 
-                resp = await iqdb.search(url = url)
+                resp = await iqdb.search(file = self.media)
                 if not resp.raw:
                     raise Exception(f"No iqdb search results, search url: {resp.url}")
 
@@ -77,7 +79,7 @@ async def _search_with_type(self, url: str, type: str):
                 base_url = f'{self._cf_proxy}/https://google.com' if self._cf_proxy else 'https://google.com'
                 google = Google(base_url = base_url, client = client)
 
-                resp = await google.search(url = url)
+                resp = await google.search(file = self.media)
                 if not resp.raw:
                     raise Exception(f"No google search results, search url: {resp.url}")