From e66225cdd1e542f823274c5321e11d2f20313764 Mon Sep 17 00:00:00 2001 From: vladp Date: Tue, 17 Mar 2026 12:32:48 +0700 Subject: [PATCH] dev comment all google search --- .../monitoring/MonitoringSearchService.java | 44 +++++++------- .../search/GlobalSearchAsyncProcessor.java | 57 ++++++++++--------- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/service/monitoring/MonitoringSearchService.java b/src/main/java/ru/soune/nocopy/service/monitoring/MonitoringSearchService.java index bf5217d..0b11018 100644 --- a/src/main/java/ru/soune/nocopy/service/monitoring/MonitoringSearchService.java +++ b/src/main/java/ru/soune/nocopy/service/monitoring/MonitoringSearchService.java @@ -56,32 +56,32 @@ public class MonitoringSearchService { try { tariffInfoService.writeOffTokens(monitoring.getUserId(), tariffMonitoring.getTokens()); -// String yandexResponse = searchImageService.searchReverseByPublicUrl( -// monitoring.getFile(), "yandex_reverse_image", "visual_matches"); + String yandexResponse = searchImageService.searchReverseByPublicUrl( + monitoring.getFile(), "yandex_reverse_image", "visual_matches"); -// List yandexImages = -// searchImageService.getAllImagesWithoutPagination(yandexResponse, "visual_matches"); -// -// for (YandexSearchResponse.ImageResult imageResult : yandexImages) { -// violationService.processViolation(imageResult, monitoring.getFile(), null); -// } + List yandexImages = + searchImageService.getAllImagesWithoutPagination(yandexResponse, "visual_matches"); - try { - String googleResponse = searchImageService.searchReverseByPublicUrl( - monitoring.getFile(), "google_lens", "exact_matches"); - - List googleImages = - searchImageService.getAllImagesWithoutPagination(googleResponse, "exact_matches"); - - - for (YandexSearchResponse.ImageResult imageResult : googleImages) { - violationService.processViolation(imageResult, monitoring.getFile(), null); - } - - } catch (TimeoutException | IOException e) { - log.warn("Google search failed"); + for (YandexSearchResponse.ImageResult imageResult : yandexImages) { + violationService.processViolation(imageResult, monitoring.getFile(), null); } +// try { +// String googleResponse = searchImageService.searchReverseByPublicUrl( +// monitoring.getFile(), "google_lens", "exact_matches"); +// +// List googleImages = +// searchImageService.getAllImagesWithoutPagination(googleResponse, "exact_matches"); +// +// +// for (YandexSearchResponse.ImageResult imageResult : googleImages) { +// violationService.processViolation(imageResult, monitoring.getFile(), null); +// } +// +// } catch (TimeoutException | IOException e) { +// log.warn("Google search failed"); +// } + monitoring.setLastRunStatus("SUCCESS"); } catch (TariffNotFoundException e) { User user = userRepository.findById(monitoring.getUserId()).orElseThrow(); diff --git a/src/main/java/ru/soune/nocopy/service/search/GlobalSearchAsyncProcessor.java b/src/main/java/ru/soune/nocopy/service/search/GlobalSearchAsyncProcessor.java index 89d6f8f..9f202c4 100644 --- a/src/main/java/ru/soune/nocopy/service/search/GlobalSearchAsyncProcessor.java +++ b/src/main/java/ru/soune/nocopy/service/search/GlobalSearchAsyncProcessor.java @@ -85,51 +85,52 @@ public class GlobalSearchAsyncProcessor { result = globalSearchResultRepository.save(result); - List googleImages = new ArrayList<>(); +// List googleImages = new ArrayList<>(); + List yandexImages = new ArrayList<>(); List allUniqueImages = new ArrayList<>(); boolean hasTimeout = false; - try { - String searchResponseGoogle = searchImageService.searchReverseByPublicUrl( - file, "google_lens", "exact_matches"); - - googleImages = searchImageService.getAllImagesWithoutPagination(searchResponseGoogle, - "exact_matches"); - - allUniqueImages.addAll(googleImages); - log.info("Google search OK for file {}", file.getId()); - - } catch (TimeoutException e) { - log.warn("Google search timeout for file {}", file.getId()); - hasTimeout = true; - } catch (IOException e) { - log.error("Google search failed for file {}", file.getId(), e); - } - // try { -// String searchResponseYandex = searchImageService.searchReverseByPublicUrl( -// file, "yandex_reverse_image", "visual_matches"); +// String searchResponseGoogle = searchImageService.searchReverseByPublicUrl( +// file, "google_lens", "exact_matches"); // -// List yandexImages = -// searchImageService.getAllImagesWithoutPagination(searchResponseYandex, "visual_matches"); - -// allUniqueImages.addAll(yandexImages); -// log.info("Yandex search OK for file {}", file.getId()); +// googleImages = searchImageService.getAllImagesWithoutPagination(searchResponseGoogle, +// "exact_matches"); +// +// allUniqueImages.addAll(googleImages); +// log.info("Google search OK for file {}", file.getId()); // // } catch (TimeoutException e) { -// log.warn("Yandex search timeout for file {}", file.getId()); +// log.warn("Google search timeout for file {}", file.getId()); // hasTimeout = true; // } catch (IOException e) { -// log.error("Yandex search failed for file {}", file.getId(), e); +// log.error("Google search failed for file {}", file.getId(), e); // } + try { + String searchResponseYandex = searchImageService.searchReverseByPublicUrl( + file, "yandex_reverse_image", "visual_matches"); + + yandexImages = + searchImageService.getAllImagesWithoutPagination(searchResponseYandex, "visual_matches"); + + allUniqueImages.addAll(yandexImages); + log.info("Yandex search OK for file {}", file.getId()); + + } catch (TimeoutException e) { + log.warn("Yandex search timeout for file {}", file.getId()); + hasTimeout = true; + } catch (IOException e) { + log.error("Yandex search failed for file {}", file.getId(), e); + } + // allUniqueImages = searchImageService.removeDuplicateUrls( // allUniqueImages.stream() // .filter(img -> img.getUrl() != null) // .collect(Collectors.toList()), // new ArrayList<>()); - allUniqueImages = googleImages; + allUniqueImages = yandexImages; for (YandexSearchResponse.ImageResult imageResult : allUniqueImages) { violationService.processViolation(imageResult, file, result);