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 5eedfa5..bf5217d 100644 --- a/src/main/java/ru/soune/nocopy/service/monitoring/MonitoringSearchService.java +++ b/src/main/java/ru/soune/nocopy/service/monitoring/MonitoringSearchService.java @@ -56,15 +56,15 @@ 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"); +// +// for (YandexSearchResponse.ImageResult imageResult : yandexImages) { +// violationService.processViolation(imageResult, monitoring.getFile(), null); +// } try { String googleResponse = searchImageService.searchReverseByPublicUrl( 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 fb39b84..89d6f8f 100644 --- a/src/main/java/ru/soune/nocopy/service/search/GlobalSearchAsyncProcessor.java +++ b/src/main/java/ru/soune/nocopy/service/search/GlobalSearchAsyncProcessor.java @@ -85,15 +85,16 @@ public class GlobalSearchAsyncProcessor { result = globalSearchResultRepository.save(result); - List allUniqueImages = new ArrayList<>(); + List googleImages = new ArrayList<>(); + List allUniqueImages = new ArrayList<>(); boolean hasTimeout = false; try { String searchResponseGoogle = searchImageService.searchReverseByPublicUrl( file, "google_lens", "exact_matches"); - List googleImages = - searchImageService.getAllImagesWithoutPagination(searchResponseGoogle, "exact_matches"); + googleImages = searchImageService.getAllImagesWithoutPagination(searchResponseGoogle, + "exact_matches"); allUniqueImages.addAll(googleImages); log.info("Google search OK for file {}", file.getId()); @@ -105,28 +106,30 @@ public class GlobalSearchAsyncProcessor { log.error("Google search failed for file {}", file.getId(), e); } - try { - String searchResponseYandex = searchImageService.searchReverseByPublicUrl( - file, "yandex_reverse_image", "visual_matches"); +// try { +// String searchResponseYandex = searchImageService.searchReverseByPublicUrl( +// file, "yandex_reverse_image", "visual_matches"); +// +// List yandexImages = +// searchImageService.getAllImagesWithoutPagination(searchResponseYandex, "visual_matches"); - List 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.addAll(yandexImages); - log.info("Yandex search OK for file {}", file.getId()); +// allUniqueImages = searchImageService.removeDuplicateUrls( +// allUniqueImages.stream() +// .filter(img -> img.getUrl() != null) +// .collect(Collectors.toList()), +// new ArrayList<>()); - } 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; for (YandexSearchResponse.ImageResult imageResult : allUniqueImages) { violationService.processViolation(imageResult, file, result);