This commit is contained in:
@@ -56,31 +56,31 @@ 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<YandexSearchResponse.ImageResult> yandexImages =
|
||||
// searchImageService.getAllImagesWithoutPagination(yandexResponse, "visual_matches");
|
||||
//
|
||||
// for (YandexSearchResponse.ImageResult imageResult : yandexImages) {
|
||||
// violationService.processViolation(imageResult, monitoring.getFile(), null);
|
||||
// }
|
||||
List<YandexSearchResponse.ImageResult> yandexImages =
|
||||
searchImageService.getAllImagesWithoutPagination(yandexResponse, "visual_matches");
|
||||
|
||||
try {
|
||||
String googleResponse = searchImageService.searchReverseByPublicUrl(
|
||||
monitoring.getFile(), "google_lens", "exact_matches");
|
||||
|
||||
List<YandexSearchResponse.ImageResult> googleImages =
|
||||
searchImageService.getAllImagesWithoutPagination(googleResponse, "exact_matches");
|
||||
|
||||
|
||||
for (YandexSearchResponse.ImageResult imageResult : googleImages) {
|
||||
for (YandexSearchResponse.ImageResult imageResult : yandexImages) {
|
||||
violationService.processViolation(imageResult, monitoring.getFile(), null);
|
||||
}
|
||||
|
||||
} catch (TimeoutException | IOException e) {
|
||||
log.warn("Google search failed");
|
||||
}
|
||||
// try {
|
||||
// String googleResponse = searchImageService.searchReverseByPublicUrl(
|
||||
// monitoring.getFile(), "google_lens", "exact_matches");
|
||||
//
|
||||
// List<YandexSearchResponse.ImageResult> 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) {
|
||||
|
||||
@@ -85,51 +85,52 @@ public class GlobalSearchAsyncProcessor {
|
||||
|
||||
result = globalSearchResultRepository.save(result);
|
||||
|
||||
List<YandexSearchResponse.ImageResult> googleImages = new ArrayList<>();
|
||||
// List<YandexSearchResponse.ImageResult> googleImages = new ArrayList<>();
|
||||
List<YandexSearchResponse.ImageResult> yandexImages = new ArrayList<>();
|
||||
List<YandexSearchResponse.ImageResult> 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<YandexSearchResponse.ImageResult> 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);
|
||||
|
||||
Reference in New Issue
Block a user