From 95edcdf5276c03349329eb8c2867d9ac4f23f28b Mon Sep 17 00:00:00 2001 From: vladp Date: Tue, 17 Mar 2026 12:20:19 +0700 Subject: [PATCH] dev comment all yandex search --- .../handler/ImageFoundRequestHandler.java | 64 +++++++++---------- .../service/search/SearchImageService.java | 8 +-- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java b/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java index f87ff5c..2f42428 100644 --- a/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java @@ -50,43 +50,43 @@ public class ImageFoundRequestHandler implements RequestHandler { Map.of("fileId",fileId))); }); -// String searchResponseYandex; - String searchResponseGoogle; -// List allYandexImages = new ArrayList<>(); - List allGoogleImages = new ArrayList<>(); + String searchResponseYandex; +// String searchResponseGoogle; + List allYandexImages = new ArrayList<>(); +// List allGoogleImages = new ArrayList<>(); List allUniqueImages; boolean hasTimeout = false; +// +// try { +// searchResponseGoogle = searchImageService.searchReverseByPublicUrl(fileEntity, "google_lens", +// "exact_matches"); +// log.info("searchResponseGoogle OK,{}", searchResponseGoogle); +// allGoogleImages = searchImageService.getAllImagesWithoutPagination( +// searchResponseGoogle, "exact_matches"); +// +// } catch (TimeoutException e) { +// log.warn("Google search timeout for file {}", fileId); +// hasTimeout = true; +// } catch (IOException e) { +// log.error("Google search failed for file {}", fileId, e); +// } - try { - searchResponseGoogle = searchImageService.searchReverseByPublicUrl(fileEntity, "google_lens", - "exact_matches"); - log.info("searchResponseGoogle OK,{}", searchResponseGoogle); - allGoogleImages = searchImageService.getAllImagesWithoutPagination( - searchResponseGoogle, "exact_matches"); - - } catch (TimeoutException e) { - log.warn("Google search timeout for file {}", fileId); - hasTimeout = true; - } catch (IOException e) { - log.error("Google search failed for file {}", fileId, e); - } - -// try { -// searchResponseYandex = searchImageService.searchReverseByPublicUrl(fileEntity, "yandex_reverse_image", -// "visual_matches"); -// log.info("searchResponseYandex OK"); -// allYandexImages = searchImageService.getAllImagesWithoutPagination( -// searchResponseYandex, "visual_matches"); -// } catch (TimeoutException e) { -// log.warn("Yandex search timeout for file {}", fileId); -// hasTimeout = true; -// } catch (IOException e) { -// log.error("Yandex search failed for file {}", fileId, e); -// } + try { + searchResponseYandex = searchImageService.searchReverseByPublicUrl(fileEntity, "yandex_reverse_image", + "visual_matches"); + log.info("searchResponseYandex OK"); + allYandexImages = searchImageService.getAllImagesWithoutPagination( + searchResponseYandex, "visual_matches"); + } catch (TimeoutException e) { + log.warn("Yandex search timeout for file {}", fileId); + hasTimeout = true; + } catch (IOException e) { + log.error("Yandex search failed for file {}", fileId, e); + } // allUniqueImages = searchImageService.removeDuplicateUrls(allYandexImages, allGoogleImages); - allUniqueImages = allGoogleImages; -// allUniqueImages = allYandexImages; +// allUniqueImages = allGoogleImages; + allUniqueImages = allYandexImages; log.info("allUniqueImages OK: {} images", allUniqueImages.size()); tariffInfoService.writeOffTokens(fileEntity.getUserId(), TariffConstants.TOKEN_VALUE_FOR_SEARCH); diff --git a/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java b/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java index a6da0dd..cb203a0 100644 --- a/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java +++ b/src/main/java/ru/soune/nocopy/service/search/SearchImageService.java @@ -32,11 +32,11 @@ public class SearchImageService { private final OkHttpClient googleHttpClient; public SearchImageService() { - Proxy proxy = new Proxy(Proxy.Type.HTTP, - new InetSocketAddress("193.46.217.94", 3128)); +// Proxy proxy = new Proxy(Proxy.Type.HTTP, +// new InetSocketAddress("193.46.217.94", 3128)); this.yandexHttpClient = new OkHttpClient.Builder() - .proxy(proxy) +// .proxy(proxy) .connectTimeout(35, TimeUnit.SECONDS) .writeTimeout(35, TimeUnit.SECONDS) .readTimeout(35, TimeUnit.SECONDS) @@ -47,7 +47,7 @@ public class SearchImageService { .build(); this.googleHttpClient = new OkHttpClient.Builder() - .proxy(proxy) +// .proxy(proxy) .connectTimeout(35, TimeUnit.SECONDS) .writeTimeout(35, TimeUnit.SECONDS) .readTimeout(35, TimeUnit.SECONDS)